V3.1.5 修正PlayMode中TargetUI问题

修正TargetUI初始化StayMode Button可使用的问题
修正TargetUI可使用按钮逻辑问题
修正TargetUI与TargetController联动问题
修正Enemy击杀后不死亡问题
This commit is contained in:
2023-07-28 19:44:02 +09:00
parent 13e5c82862
commit 630cbc4f70
20 changed files with 31015 additions and 30874 deletions
+182 -109
View File
@@ -1,6 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: -1073
y: 58
width: 1080
height: 693
m_ShowMode: 0
m_Title: Scene
m_RootView: {fileID: 4}
m_MinSize: {x: 200, y: 221}
m_MaxSize: {x: 4000, y: 4021}
m_Maximized: 0
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +38,67 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 64
x: 62
y: 43
width: 1856
width: 1858
height: 1037
m_ShowMode: 4
m_Title: Scene
m_RootView: {fileID: 9}
m_Title: Console
m_RootView: {fileID: 12}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1080
height: 693
m_MinSize: {x: 200, y: 221}
m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 21}
m_Panes:
- {fileID: 21}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1080
height: 693
m_MinSize: {x: 200, y: 221}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 105
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -41,17 +115,17 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 717
width: 1083
width: 1082
height: 270
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 15}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 15}
- {fileID: 14}
- {fileID: 18}
- {fileID: 17}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &3
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -64,19 +138,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 12}
- {fileID: 2}
- {fileID: 15}
- {fileID: 5}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1083
width: 1082
height: 987
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 23
--- !u!114 &4
controlID: 119
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -92,17 +166,17 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 717
y: 470
width: 316
height: 270
height: 517
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 19}
m_ActualView: {fileID: 22}
m_Panes:
- {fileID: 19}
- {fileID: 22}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &5
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -115,19 +189,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 4}
- {fileID: 9}
- {fileID: 7}
m_Position:
serializedVersion: 2
x: 1083
x: 1082
y: 0
width: 316
height: 987
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 63
--- !u!114 &6
controlID: 52
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -145,15 +219,15 @@ MonoBehaviour:
x: 0
y: 0
width: 316
height: 717
height: 470
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 17}
- {fileID: 20}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &7
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -166,20 +240,20 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
- {fileID: 5}
- {fileID: 6}
- {fileID: 8}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1856
width: 1858
height: 987
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 17
--- !u!114 &8
controlID: 118
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -194,18 +268,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1399
x: 1398
y: 0
width: 457
width: 460
height: 987
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 16}
- {fileID: 19}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &9
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -218,14 +292,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 13}
- {fileID: 10}
- {fileID: 7}
- {fileID: 11}
- {fileID: 14}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1856
width: 1858
height: 1037
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -233,7 +307,7 @@ MonoBehaviour:
m_TopViewHeight: 30
m_UseBottomView: 1
m_BottomViewHeight: 20
--- !u!114 &10
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -250,12 +324,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1856
width: 1858
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName:
--- !u!114 &11
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -272,11 +346,11 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 1017
width: 1856
width: 1858
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
--- !u!114 &12
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -286,24 +360,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1083
width: 1082
height: 717
m_MinSize: {x: 201, y: 221}
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 18}
- {fileID: 13}
- {fileID: 16}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &13
m_LastSelected: 0
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -323,9 +396,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 64
x: 62
y: 73
width: 1082
width: 1081
height: 696
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -337,7 +410,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1082, y: 675}
m_TargetSize: {x: 1081, y: 675}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -352,8 +425,8 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -541
m_HBaseRangeMax: 541
m_HBaseRangeMin: -540.5
m_HBaseRangeMax: 540.5
m_VBaseRangeMin: -337.5
m_VBaseRangeMax: 337.5
m_HAllowExceedBaseRangeMin: 1
@@ -364,7 +437,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -373,29 +446,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1082
width: 1081
height: 675
m_Scale: {x: 1, y: 1}
m_Translation: {x: 541, y: 337.5}
m_Translation: {x: 540.5, y: 337.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -541
x: -540.5
y: -337.5
width: 1082
width: 1081
height: 675
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1082, y: 696}
m_LastWindowPixelSize: {x: 1081, y: 696}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &14
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -423,7 +496,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &15
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -443,9 +516,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 64
x: 62
y: 790
width: 1082
width: 1081
height: 249
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -464,7 +537,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Script/InGame
m_Globs: []
m_OriginalText:
m_ViewMode: 1
@@ -476,10 +549,10 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 05ca9a3b
m_LastClickedID: 1000000005
m_ExpandedIDs: 000000006a7600006c7600006e760000707600007276000000ca9a3b
scrollPos: {x: 0, y: 155}
m_SelectedIDs: 46670000
m_LastClickedID: 26438
m_ExpandedIDs: 0000000000670000026700000467000006670000086700004067000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -495,7 +568,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 2}
m_ClientGUIView: {fileID: 5}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -507,7 +580,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000006a7600006c7600006e7600007076000072760000
m_ExpandedIDs: 000000000067000002670000046700000667000008670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -532,9 +605,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_SelectedInstanceIDs: c25a0000
m_LastClickedInstanceID: 23234
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c62300008a5c000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -551,7 +624,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 2}
m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -559,11 +632,11 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_ScrollPosition: {x: 0, y: 59}
m_GridSize: 16
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 355
--- !u!114 &16
--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -583,9 +656,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1463
x: 1460
y: 73
width: 456
width: 459
height: 966
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -597,14 +670,14 @@ MonoBehaviour:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_LastInspectedObjectInstanceID: 23234
m_LastVerticalScrollValue: 667
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
--- !u!114 &17
--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -624,10 +697,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1147
x: 1144
y: 73
width: 314
height: 696
height: 449
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -635,9 +708,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 32fbffff
m_SelectedIDs: c25a0000
m_LastClickedID: 23234
m_ExpandedIDs: 32fbffff2a5b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -653,7 +726,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 6}
m_ClientGUIView: {fileID: 9}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -661,7 +734,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &18
--- !u!114 &21
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -681,10 +754,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 64
y: 73
width: 1082
height: 696
x: -1073
y: 58
width: 1080
height: 672
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -919,9 +992,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 35.909485, y: -489.08286, z: 447.1831}
m_Target: {x: 32.245174, y: 39.198368, z: 44.195084}
speed: 2
m_Value: {x: 35.909485, y: -489.08286, z: 447.1831}
m_Value: {x: 32.245174, y: 39.198368, z: 44.195084}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -968,13 +1041,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.32789153, y: 0.21797852, z: -0.078089386, w: 0.9158536}
m_Target: {x: 0.6133127, y: 0.005624831, z: -0.004448684, w: 0.78973943}
speed: 2
m_Value: {x: -0.32789153, y: -0.21797852, z: 0.078089386, w: -0.9158537}
m_Value: {x: 0.61334574, y: 0.0056251343, z: -0.0044489237, w: 0.789782}
m_Size:
m_Target: 574.0399
m_Target: 1.4054321
speed: 2
m_Value: 574.0399
m_Value: 1.4054321
m_Ortho:
m_Target: 0
speed: 2
@@ -999,7 +1072,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &19
--- !u!114 &22
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1019,10 +1092,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1147
y: 790
x: 1144
y: 543
width: 314
height: 249
height: 496
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default