From 58716f26ebb79ded257c1054488f0f65e687c72b Mon Sep 17 00:00:00 2001 From: LMZ <1477077658@qq.com> Date: Thu, 12 Dec 2024 16:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=84=E5=AE=8C=E4=BA=86=E7=81=AB=E7=BA=BF?= =?UTF-8?q?=E6=8C=87=E4=BB=A4UI=E5=8F=8A=E9=80=BB=E8=BE=91=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E7=A1=AE=E5=AE=9A=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/PanelPrefabs/Command_End.prefab | 680 +++++++++++++----- .../Assets/Scenes/LL_Command_Action_1.unity | 410 +++++++---- .../Assets/Script/UI/ZZZZZZ/ZZUIManager.cs | 632 ++++++++++++---- xiaofang/Assets/UnityCommon | 2 +- 4 files changed, 1255 insertions(+), 469 deletions(-) diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab index d24c7cf8..a17bb02a 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab @@ -36,7 +36,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -4.6468, y: -0.00081444} + m_AnchoredPosition: {x: -4.6468506, y: -0.00081444} m_SizeDelta: {x: 241.56, y: 312.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &11656891 @@ -77,7 +77,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &52462709 +--- !u!1 &219625522 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -85,51 +85,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 52462710} - - component: {fileID: 52462712} - - component: {fileID: 52462711} + - component: {fileID: 219625525} + - component: {fileID: 219625524} + - component: {fileID: 219625523} m_Layer: 5 - m_Name: Situation_Tip_2 (1) + m_Name: TipText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &52462710 +--- !u!224 &219625525 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52462709} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 219625522} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000129, y: 1.0000129, z: 1.0000129} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 915210170} + m_Father: {fileID: 676728425} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.403, y: -0.00090218} + m_SizeDelta: {x: 499.393, y: 153.29} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &52462712 +--- !u!222 &219625524 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52462709} + m_GameObject: {fileID: 219625522} m_CullTransparentMesh: 1 ---- !u!114 &52462711 +--- !u!114 &219625523 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52462709} + m_GameObject: {fileID: 219625522} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -145,18 +145,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 + m_MinSize: 10 + m_MaxSize: 58 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "5-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563" + m_Text: "\u7528\u65F600\uFF1A00\u5B66\u751F\u758F\u6563\u5B8C\u6BD5" --- !u!1 &251473041 GameObject: m_ObjectHideFlags: 0 @@ -311,6 +311,44 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &676728424 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 676728425} + m_Layer: 5 + m_Name: TipPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &676728425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676728424} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1293464008} + - {fileID: 219625525} + m_Father: {fileID: 1986279549173157411} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2.805, y: 26.647} + m_SizeDelta: {x: 543.174, y: 153.293} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &800056561 GameObject: m_ObjectHideFlags: 0 @@ -582,7 +620,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 915210170} - - component: {fileID: 915210171} + - component: {fileID: 3221337158919056189} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -602,19 +640,19 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1157854003} - - {fileID: 52462710} - - {fileID: 1563706358} - - {fileID: 1767943530} + - {fileID: 8544101838369953969} + - {fileID: 8618474577547420637} + - {fileID: 5824380172705816005} + - {fileID: 6164110187781327644} m_Father: {fileID: 876206097} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.0006698734} - m_SizeDelta: {x: 0, y: 367.795} + m_AnchoredPosition: {x: 17, y: 21.473} + m_SizeDelta: {x: 0, y: 389.267} m_Pivot: {x: 0, y: 1} ---- !u!114 &915210171 +--- !u!114 &3221337158919056189 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -634,8 +672,8 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 644.8, y: 85.5} - m_Spacing: {x: 0, y: -20.13} + m_CellSize: {x: 220, y: 70} + m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 --- !u!1 &1052504419 @@ -798,7 +836,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7D27\u6025\u4EFB\u52A1" ---- !u!1 &1563706357 +--- !u!1 &1293464007 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -806,54 +844,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1563706358} - - component: {fileID: 1563706360} - - component: {fileID: 1563706359} + - component: {fileID: 1293464008} + - component: {fileID: 1293464010} + - component: {fileID: 1293464009} m_Layer: 5 - m_Name: Situation_Tip_3 (1) + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1563706358 +--- !u!224 &1293464008 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563706357} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1293464007} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000129, y: 1.0000129, z: 1.0000129} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 915210170} - m_RootOrder: 2 + m_Father: {fileID: 676728425} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.0010071, y: -0.00074291} + m_SizeDelta: {x: 543.17, y: 153.29} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1563706360 +--- !u!222 &1293464010 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563706357} + m_GameObject: {fileID: 1293464007} m_CullTransparentMesh: 1 ---- !u!114 &1563706359 +--- !u!114 &1293464009 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563706357} + m_GameObject: {fileID: 1293464007} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -864,20 +902,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "6-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563" + m_Sprite: {fileID: 21300000, guid: 110d9119c7dd0014c8fde3e2a70da417, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1605163135 GameObject: m_ObjectHideFlags: 0 @@ -955,86 +989,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1767943529 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1767943530} - - component: {fileID: 1767943532} - - component: {fileID: 1767943531} - m_Layer: 5 - m_Name: Situation_Tip_4 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1767943530 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767943529} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000129, y: 1.0000129, z: 1.0000129} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 915210170} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1767943532 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767943529} - m_CullTransparentMesh: 1 ---- !u!114 &1767943531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767943529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "3-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563" --- !u!1 &1850042308 GameObject: m_ObjectHideFlags: 0 @@ -1743,7 +1697,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1986279547491587101 RectTransform: m_ObjectHideFlags: 0 @@ -1758,7 +1712,7 @@ RectTransform: m_Children: - {fileID: 1986279548566008430} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2631,7 +2585,7 @@ RectTransform: - {fileID: 1986279547417310042} - {fileID: 1986279549172614797} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 18 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3150,7 +3104,7 @@ RectTransform: m_Children: - {fileID: 1986279548998433690} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4276,7 +4230,7 @@ RectTransform: m_Children: - {fileID: 1986279547569029156} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4713,7 +4667,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 2.7794037, y: -11.441208} + m_AnchoredPosition: {x: 2.779419, y: -11.441208} m_SizeDelta: {x: 226.7052, y: 39.7279} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1986279548228542622 @@ -5145,9 +5099,9 @@ RectTransform: m_Father: {fileID: 1986279548098693904} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1986279548304181854 @@ -5232,7 +5186,7 @@ RectTransform: - {fileID: 948396699256012633} - {fileID: 948396698140814702} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5508,9 +5462,9 @@ RectTransform: m_Father: {fileID: 1986279548025449545} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 237.4, y: 15.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 222, y: 272} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1986279548425159739 @@ -6351,7 +6305,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1986279549173157411} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -6550,7 +6504,7 @@ RectTransform: - {fileID: 1986279547906217107} - {fileID: 1986279548770340786} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 17 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6590,9 +6544,9 @@ RectTransform: m_Father: {fileID: 1986279548098693904} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -177.33334} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1986279548676266129 @@ -7081,7 +7035,7 @@ RectTransform: - {fileID: 1986279547836566313} - {fileID: 2379669734204792985} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -8166,9 +8120,9 @@ RectTransform: m_Father: {fileID: 1986279548025449545} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -137.4, y: 15.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 222, y: 272} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1986279549002270258 @@ -8523,12 +8477,12 @@ RectTransform: - {fileID: 1986279548228542620} - {fileID: 11656889} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 5 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -57, y: 214} - m_SizeDelta: {x: 250.8499, y: 312.1326} + m_AnchoredPosition: {x: -45, y: 136} + m_SizeDelta: {x: 250.84985, y: 312.1326} m_Pivot: {x: 1, y: 0.5} --- !u!222 &1986279549107877078 CanvasRenderer: @@ -8996,7 +8950,7 @@ RectTransform: m_Children: - {fileID: 1986279547479261576} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -9243,8 +9197,6 @@ RectTransform: - {fileID: 4309186515595606845} - {fileID: 1986279549438857642} - {fileID: 21171491440440172} - - {fileID: 1986279549238718676} - - {fileID: 1986279549107877076} - {fileID: 1986279549232645824} - {fileID: 5670965382466002809} - {fileID: 1986279548795827113} @@ -9258,6 +9210,9 @@ RectTransform: - {fileID: 1986279549403144391} - {fileID: 1986279548675747997} - {fileID: 1986279547715622014} + - {fileID: 676728425} + - {fileID: 1986279549238718676} + - {fileID: 1986279549107877076} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9353,8 +9308,10 @@ MonoBehaviour: Command02: {fileID: 2991637681471873777} content: {fileID: 1850042308} TextPrefab: {fileID: 5097649314138861747, guid: 9104ac59a949aa54d8fd2858bdf8abb6, type: 3} - content2: {fileID: 0} - TextPrefab2: {fileID: 0} + content2: {fileID: 915210169} + TextPrefab2: {fileID: 4003788853082971903, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + TipPanel: {fileID: 676728424} + TipTilte: {fileID: 1986279547866209846} Icn_Stairway_1: {fileID: 844262944} Icn_Stairway_2: {fileID: 316326346} Icn_Stairway_3: {fileID: 400698981} @@ -9388,6 +9345,9 @@ MonoBehaviour: Right_BoxButton: {fileID: 1986279549238718677} Close1: {fileID: 1986279548665939568} Close2: {fileID: 1986279548236674887} + icn_stairway_text_1: {fileID: 1986279548677716648} + icn_stairway_text_2: {fileID: 1986279547938014319} + icn_stairway_text_3: {fileID: 1986279548015271226} Tip_1: {fileID: 910353965} Tip_2: {fileID: 1052504421} Tip_3: {fileID: 1217528244} @@ -9423,12 +9383,26 @@ MonoBehaviour: WLYC: {fileID: 1986279548566008431} TileText: {fileID: 1986279548998433691} FireText: {fileID: 2761091764751671859} - bg: {fileID: 1986279548673143752} + TipText: {fileID: 219625523} + WartipText: {fileID: 1986279548813826758} + MessageText: {fileID: 1986279547682037534} + MessageText2: {fileID: 1986279548444664471} + fadeInDuration: 1 + fadeOutDuration: 1 + displayDuration: 2 + TipBg: {fileID: 1293464009} + HeadImage: {fileID: 1986279548676433021} + Bg: {fileID: 1986279549323494987} + Bg1: {fileID: 1986279548268462364} + panelA: {fileID: 1986279549107877076} + panelAMoveDistance: 0 moveDuration: 0.5 buttonRect: {fileID: 1986279549238718676} isHidden: 1 showPositionX: 0 hidePositionX: 0 + bg: {fileID: 1986279548673143752} + gridLayoutGroup: {fileID: 0} instert: {fileID: 0} --- !u!1 &1986279549197966134 GameObject: @@ -9542,7 +9516,7 @@ RectTransform: - {fileID: 1986279548552650202} - {fileID: 1986279548878941243} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -9583,11 +9557,11 @@ RectTransform: - {fileID: 1986279548673143759} - {fileID: 251473042} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 4 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 337, y: 227} + m_AnchoredPosition: {x: 339, y: 137} m_SizeDelta: {x: 398, y: 341} m_Pivot: {x: 1, y: 0.5} --- !u!222 &1986279549238718679 @@ -9705,9 +9679,9 @@ RectTransform: m_Father: {fileID: 1986279548098693904} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -304.6667} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1986279549241408533 @@ -10289,7 +10263,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1986279549323494985 RectTransform: m_ObjectHideFlags: 0 @@ -10333,7 +10307,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9716981, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -10629,7 +10603,7 @@ RectTransform: - {fileID: 948396698034575733} - {fileID: 948396698339676344} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 16 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -11077,7 +11051,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4309186515595606845 RectTransform: m_ObjectHideFlags: 0 @@ -11209,7 +11183,7 @@ RectTransform: - {fileID: 1986279547719244042} - {fileID: 4386558475453932289} m_Father: {fileID: 1986279549173157411} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12294,7 +12268,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 121218705949371349, guid: a95bf12ea7cc94f498bdc8967b2f90ac, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 121218705949371349, guid: a95bf12ea7cc94f498bdc8967b2f90ac, type: 3} propertyPath: m_AnchorMax.x @@ -12394,7 +12368,113 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 121218705949371349, guid: a95bf12ea7cc94f498bdc8967b2f90ac, type: 3} m_PrefabInstance: {fileID: 1986279548700035834} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4003788854072880589 +--- !u!1001 &4614685797598051619 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 915210170} + m_Modifications: + - target: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Text + value: "4-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563" + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971903, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Name + value: Situation_Tip_1 (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} +--- !u!224 &8618474577547420637 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + m_PrefabInstance: {fileID: 4614685797598051619} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4684570332724479567 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -12491,10 +12571,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} ---- !u!224 &1157854003 stripped +--- !u!224 &8544101838369953969 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} - m_PrefabInstance: {fileID: 4003788854072880589} + m_PrefabInstance: {fileID: 4684570332724479567} m_PrefabAsset: {fileID: 0} --- !u!1001 &5097649312431883682 PrefabInstance: @@ -12609,3 +12689,215 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5097649314138861744, guid: 9104ac59a949aa54d8fd2858bdf8abb6, type: 3} m_PrefabInstance: {fileID: 5097649312431883682} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7069245350669669858 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 915210170} + m_Modifications: + - target: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Text + value: "1-2\u73ED\u7EA7" + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971903, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Name + value: Situation_Tip_1 (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} +--- !u!224 &6164110187781327644 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + m_PrefabInstance: {fileID: 7069245350669669858} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7441083856479355707 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 915210170} + m_Modifications: + - target: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Text + value: "4-3\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563" + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4003788853082971903, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + propertyPath: m_Name + value: Situation_Tip_1 (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} +--- !u!224 &5824380172705816005 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} + m_PrefabInstance: {fileID: 7441083856479355707} + m_PrefabAsset: {fileID: 0} diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity index 52c8a47a..f2a2cb14 100644 --- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity +++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity @@ -122,6 +122,17 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &198436690 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1986279548891763003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &298877719 GameObject: m_ObjectHideFlags: 0 @@ -190,11 +201,28 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &915210169 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 915210169, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} +--- !u!114 &451300333 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8618474577547420634, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} m_PrefabInstance: {fileID: 1986279549016710772} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &852064453 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8544101838369953974, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1229671918 GameObject: m_ObjectHideFlags: 0 @@ -289,6 +317,50 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &1379236078 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6164110187781327643, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1388304172 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1986279547449863667, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1614637142 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3221337158919056189, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1897341921 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5824380172705816002, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + m_PrefabInstance: {fileID: 1986279549016710772} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2053376435 GameObject: m_ObjectHideFlags: 0 @@ -380,30 +452,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 52462710, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 52462710, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 52462710, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 52462710, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 52462710, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 52462710, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -428,70 +476,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 915210170, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 17 - objectReference: {fileID: 0} - - target: {fileID: 915210171, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_StartCorner - value: 0 - objectReference: {fileID: 0} - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: content2 + propertyPath: Area value: - objectReference: {fileID: 915210169} + objectReference: {fileID: 1388304172} - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: TextPrefab2 + propertyPath: NPCName value: - objectReference: {fileID: 4003788853082971903, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} - - target: {fileID: 1157854003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1157854003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1157854003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1157854003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1157854003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1157854003, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1563706358, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1563706358, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1563706358, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1563706358, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1563706358, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1563706358, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} + objectReference: {fileID: 198436690} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Situation_Tip_1 + value: + objectReference: {fileID: 852064453} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Situation_Tip_2 + value: + objectReference: {fileID: 451300333} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Situation_Tip_3 + value: + objectReference: {fileID: 1897341921} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: Situation_Tip_4 + value: + objectReference: {fileID: 1379236078} + - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: gridLayoutGroup + value: + objectReference: {fileID: 1614637142} - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -540,30 +552,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1767943530, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1767943530, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1767943530, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1767943530, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1767943530, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1767943530, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -684,49 +672,91 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1986279547491587100, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive + - target: {fileID: 1986279547699551740, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279547699551740, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1986279547699551740, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279547715622013, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 1986279547866209846, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive + - target: {fileID: 1986279548042122893, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 192.19 + objectReference: {fileID: 0} + - target: {fileID: 1986279548042122893, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.001045227 + objectReference: {fileID: 0} + - target: {fileID: 1986279548042122894, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Text + value: '0 + +' + objectReference: {fileID: 0} + - target: {fileID: 1986279548042122894, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_FontData.m_MaxSize + value: 92 + objectReference: {fileID: 0} + - target: {fileID: 1986279548042122894, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_FontData.m_MinSize value: 0 objectReference: {fileID: 0} + - target: {fileID: 1986279548042122894, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_FontData.m_FontSize + value: 42 + objectReference: {fileID: 0} - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 237.4 objectReference: {fileID: 0} - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 15.5 + objectReference: {fileID: 0} + - target: {fileID: 1986279548664679642, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_FontData.m_MaxSize + value: 62 + objectReference: {fileID: 0} + - target: {fileID: 1986279548664679642, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_FontData.m_MinSize + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1986279548664679642, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_FontData.m_FontSize + value: 46 objectReference: {fileID: 0} - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive @@ -734,19 +764,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -177.33334 objectReference: {fileID: 0} - target: {fileID: 1986279548795827112, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive @@ -754,19 +784,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -137.4 objectReference: {fileID: 0} - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 15.5 + objectReference: {fileID: 0} + - target: {fileID: 1986279549107877099, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.x @@ -856,40 +890,132 @@ PrefabInstance: propertyPath: m_Name value: Command_End objectReference: {fileID: 0} + - target: {fileID: 1986279549173157415, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1986279549232645831, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1986279549238718699, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1986279549241408532, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279549241408532, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1986279549241408532, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 1986279549241408532, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y + value: -304.6667 + objectReference: {fileID: 0} + - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1986279549438857641, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive + - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6389238419783627009, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive + - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6852673806710748770, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive + - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8231224075310808718, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive + - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327643, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_Text + value: "1-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563" + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs index 461ef023..092addf3 100644 --- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs +++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs @@ -1,8 +1,10 @@ using DG.Tweening; +using JetBrains.Annotations; using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; @@ -59,12 +61,19 @@ public class ZZUIManager : MonoBehaviour public GameObject content; //创建的东西 public GameObject TextPrefab; - //疏散情况 //创建的任务 public GameObject content2; //创建的东西 public GameObject TextPrefab2; + /// + /// 提示疏散时间面板 + /// + public GameObject TipPanel; + /// + /// 起火点的标题 + /// + public GameObject TipTilte; /// /// 三个楼梯 @@ -152,14 +161,19 @@ public class ZZUIManager : MonoBehaviour //两个叉叉 public Button Close1; public Button Close2; - + /// + /// 楼梯口 + /// [Header("文本")] + public Text icn_stairway_text_1; + public Text icn_stairway_text_2; + public Text icn_stairway_text_3; /// /// 右边框框紧急任务 /// public Text Tip_1; - public Text Tip_2; + public Text Tip_2; public Text Tip_3; public Text Tip_4; /// @@ -177,6 +191,8 @@ public class ZZUIManager : MonoBehaviour public Text Situation_Tip_2; public Text Situation_Tip_3; public Text Situation_Tip_4; + + /// /// 撤离方案ABC /// @@ -237,20 +253,82 @@ public class ZZUIManager : MonoBehaviour /// 标题文本 /// public Text TileText; - //起火点按钮文本 + /// + /// 起火点按钮文本 + /// public Text FireText; + /// + /// 提示疏散时间文本 + /// + public Text TipText; + /// + /// 危险提示按钮文本 + /// + public Text WartipText; + /// + /// 地图两个不知名的图标文本 + /// + public Text MessageText; + public Text MessageText2; + /// + /// 清点人数的时候 + /// + public Text Area; + public Text NPCName; + #region 淡入淡出效果 //计时器 private float timeElapsed = 0f; + public float fadeInDuration = 1f; // 淡出时间 + public float fadeOutDuration = 1f; // 淡出持续时间 + public float displayDuration = 2f; // 2秒后自己淡出 + + private bool isFadingIn = true; + private bool isFadingOut = false; + // 指示文本当前是否正在淡入或淡出 + private bool isFading = false; + // 运行中的淡入淡出协程引用 + private Coroutine fadeCoroutine; + //淡入淡出计时器 + private float elapsedTime = 0f; + #endregion + + #region 图标动效 + ////计数器 + //private float ContinueTime = 100000000000f; + ////记录 + //private float tempTime = 0f; + //感叹号 + [Header("图片")] + //提示疏散时间的背景图 + public Image TipBg; + public Image HeadImage; + public Image Bg; + //右边 + public Image Bg1; + //结束标志 + private bool isEnd; + #endregion + + + #region 弹出的效果（包含推开疏散情况） + public RectTransform panelA; + public float panelAMoveDistance; + public float moveDuration = 0.5f; // 动画持续时间 + public RectTransform buttonRect; // 你的按钮 RectTransform + public bool isHidden = true; + public float showPositionX; + public float hidePositionX; + #endregion //记录 int num = 0; public Image bg; - public float moveDuration = 0.5f; // 动画持续时间 - public RectTransform buttonRect; // 你的按钮 RectTransform - public bool isHidden=true; - public float showPositionX; - public float hidePositionX; + #region 疏散情况班级排序 + public GridLayoutGroup gridLayoutGroup; + private List textFields = new List(); + #endregion + public ZZUIManager instert; public void Awake() @@ -262,15 +340,24 @@ public class ZZUIManager : MonoBehaviour } private void Start() { - + initialized(); + + //动画位移位置数据 hidePositionX = 337f; showPositionX = 1.159973f; + panelAMoveDistance = 382f; + + //传呼机 + Intercom.onClick.AddListener(() => + { + + }); //右边框框弹出来 Right_BoxButton.onClick.AddListener(() => { OnClickHideButton(); }); - + #region 道具 Prop1.onClick.AddListener(() => { @@ -317,7 +404,7 @@ public class ZZUIManager : MonoBehaviour }); #endregion //关闭总指挥框 - if (Warn_Tip.activeSelf&&(Input.GetMouseButtonDown(0)|| Input.GetMouseButtonDown(1)|| Input.GetMouseButtonDown(2))) + if (Warn_Tip.activeSelf && (Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1) || Input.GetMouseButtonDown(2))) { Warn_Tip.SetActive(false); } @@ -340,7 +427,8 @@ public class ZZUIManager : MonoBehaviour }); //打开队形 - Flee.onClick.AddListener(() => { + Flee.onClick.AddListener(() => + { DiaLogBox2.SetActive(true); }); @@ -348,7 +436,8 @@ public class ZZUIManager : MonoBehaviour Close2.onClick.AddListener(() => { Close(); }); //下拉列表(人物选着) - dropdwn.onValueChanged.AddListener(delegate { + dropdwn.onValueChanged.AddListener(delegate + { DropdownValueChanged(dropdwn); }); //默认开一次这样开局就能默认第一个选项一次 @@ -386,7 +475,7 @@ public class ZZUIManager : MonoBehaviour //梯队队形确定 Dialogbox2Sure.onClick.AddListener(() => { - if(num==1) + if (num == 1) { @@ -394,7 +483,7 @@ public class ZZUIManager : MonoBehaviour num = 0; DiaLogBox2.SetActive(false); } - if(num==2) + if (num == 2) { @@ -402,15 +491,36 @@ public class ZZUIManager : MonoBehaviour DiaLogBox2.SetActive(false); } }); - FireButton.onClick.AddListener(() => { - + FireButton.onClick.AddListener(() => + { + FireText.color = new Color(0.75f, 0.75f, 0.75f); }); + //疏散顺序按钮 + Warn.onClick.AddListener(() => + { + WarnPanel(); + }); + #region 数字动效 + Number(NO_Student); + #endregion } private void Update() { + //测试面板 + //if (Input.GetKeyDown("j")) + //{ + // string str = "aaa"; + // FixWarnPanelText(str); + // WarnPanel(); + + //} + //if (Input.GetKeyDown("k")) + //{ + // FixWarnPanelText("aaaa"); + //} // 更新时间 timeElapsed += Time.deltaTime; @@ -420,8 +530,92 @@ public class ZZUIManager : MonoBehaviour // 格式化时间为 "00.00" 格式 TimeText.text = string.Format("{0:00}.{1:00}", minutes, seconds); + + } - //动画部分 + + public void Number(Text num) + { + StartCoroutine(Num(num)); + } + IEnumerator Num(Text num) + { + while(true) + { + num.fontSize = 42; + yield return new WaitForSeconds(0.5f); + num.fontSize = 35; + yield return new WaitForSeconds(0.1f); + num.fontSize = 30; + yield return new WaitForSeconds(0.3f); + } + } + + + /// + /// 创建疏散情况内容 + /// + /// 文本内容 + public void CreateSituation(string str) + { + GameObject newText = Instantiate(TextPrefab2); + newText.transform.SetParent(content2.transform, false); + Text text = newText.GetComponentInChildren(); + text.text = str; + // 按照班级排序 + initialized(); + } + #region 疏散情况按班级排序功能实现 + //数据初始化 + public void initialized() + { + foreach (Transform child in gridLayoutGroup.transform) + { + // 初始化时获取所有子文本框 + textFields.Clear(); + Text textComponent = child.GetComponent(); + if (textComponent != null) + { + textFields.Add(textComponent); + } + + // 按照班级排序 + SortByClass(); + } + } + + // 按照班级号排序 + public void SortByClass() + { + // 排序之前先解析班级数字 + textFields = textFields.OrderBy(t => ParseClassNumber(t.text)).ToList(); + + // 重新排列文本框的位置（GridLayoutGroup 会自动处理） + for (int i = 0; i < textFields.Count; i++) + { + textFields[i].transform.SetSiblingIndex(i); // 更新顺序 + } + } + // 解析班级号，例如 "4-1班" 变为 4-1 + int ParseClassNumber(string classText) + { + // 使用正则表达式提取类似 "4-1" 的班级号 + Match match = Regex.Match(classText, @"(\d+)-(\d+)"); + if (match.Success) + { + int part1 = int.Parse(match.Groups[1].Value); // 提取第一个数字 + int part2 = int.Parse(match.Groups[2].Value); // 提取第二个数字 + return part1 * 100 + part2; // 返回合成数值，用于排序 + } + + Debug.LogError($"无法解析班级号: {classText}"); + return 0; // 默认返回 0，表示无法解析 + } + + + #endregion + + //动画部分 public void OnClickHideButton() { // 如果按钮已隐藏，点击后显示 @@ -429,14 +623,18 @@ public class ZZUIManager : MonoBehaviour { // 恢复按钮到原位置 buttonRect.DOAnchorPosX(showPositionX, moveDuration).SetEase(Ease.InOutCubic); - bg.transform.Rotate(0, 0,180f); + // 让面板B滑动到显示位置，同时面板A向左移动 + panelA.DOAnchorPosX(-panelAMoveDistance, moveDuration).SetEase(Ease.InOutCubic); // 面板A同时移动 + bg.transform.Rotate(0, 0, 180f); isHidden = false; // 更新状态为未隐藏 } else { // 隐藏按钮 + // 让面板B滑动到隐藏位置，同时面板A恢复原位 buttonRect.DOAnchorPosX(hidePositionX, moveDuration).SetEase(Ease.InOutCubic); - bg.transform.Rotate(0, 0,180f); + panelA.DOAnchorPosX(-45f, moveDuration).SetEase(Ease.InOutCubic); // 面板A恢复原位 + bg.transform.Rotate(0, 0, 180f); isHidden = true; // 更新状态为隐藏 } } @@ -458,8 +656,8 @@ public class ZZUIManager : MonoBehaviour break; case 5: break; - case 6: - break; + case 6: + break; } } @@ -469,7 +667,7 @@ public class ZZUIManager : MonoBehaviour /// 1-操场 2-教室 3-厨房 4-楼道 public void MapTP(int a) { - switch(a) + switch (a) { case 1: @@ -514,108 +712,31 @@ public class ZZUIManager : MonoBehaviour // 执行 Option 3 相关的事件 Debug.Log("Option 3 selected"); break; - case 3: + case 3: break; - case 4: + case 4: break; case 5: break; } } /// - /// 修改右边框框内容 + /// 打开起火点面板 /// - /// 内容 - /// 从上到下 - public void FixWarn(string str,int a) + public void OpenFirePanel() { - switch (a) - { - case 1: - break; - case 2: - break; - case 3: - break; - case 4: - break; - } + TipTilte.SetActive(true); + MapTapPanel.SetActive(true); } /// - /// 修改网络延迟 + /// 关闭起火点面板 /// - /// 网络延迟的数字部分 - public void FixDelay(string str) + public void CloseFirePanel() { - WLYC.text = "网络延迟：" + str; - } - /// - /// 修改疏散班级情况 - /// - /// 班级撤离情况 - /// 更新第几条消息从上往下 - public void FixSituation(string str,int a) - { - switch (a) - { - case 1: - Situation_Tip_1.text = str; - break; - case 2: - Situation_Tip_2.text = str; - break; - case 3: - Situation_Tip_3.text = str; - break; - case 4: - Situation_Tip_4.text = str; - break; - } - } - /// - /// 修改成功撤离班级的信息 - /// - /// 撤离班级的名字 - /// 人数 - public void FixFledOk(string str,int a) - { - Right_MessageText.text = str; - int currentValue = int.Parse(Student_Number.text); - currentValue = a; - // 更新 InputField 的文本 - Student_Number.text = currentValue.ToString(); - } - /// - /// 修改未撤离班级 - /// - /// 未撤离的班级 - /// 未撤离的人数 - public void FixNo(string str,int a) - { - NO_Left_MessageText.text = str; - NO_Right_MessageText.text = str; - NO_Student.text =a.ToString(); - } - /// - /// 修改撤离方案的介绍 - /// - /// 内容 - /// A=1,B=2,C=3选项 - public void FixFled(string str,int a) - { - switch (a) - { - case 1: - RightText1.text = str; - break; - case 2: - RightText2.text = str; - break; - case 3: - RightText3.text = str; - break; - } + TipTilte.SetActive(false); + MapTapPanel.SetActive(false); } + /// /// 撤离方案选择 /// @@ -667,26 +788,51 @@ public class ZZUIManager : MonoBehaviour MapTapPanel.SetActive(true); } } - /// - /// 疏散提示 - /// + /// + /// 疏散提示 + /// public void WarnPanel() { - if(Command02.activeSelf) + if (Command02.activeSelf) { Command02.SetActive(false); + isEnd = false; + StopCoroutine(Flicker()); } else { Command02.SetActive(true); + isEnd = true; + StartCoroutine(Flicker()); } } /// + /// 动效的携程 + /// + /// + IEnumerator Flicker() + { + while (isEnd) + { + Bg1.color = new Color(1f, 1f, 1f); + Bg.color = new Color(1f, 0f, 0f); + yield return new WaitForSeconds(0.6f); + Bg.color = new Color(1f, 1f, 1f); + Bg1.color = new Color(1f, 0f, 0f); + yield return new WaitForSeconds(0.5f); + } + + } + public void FixWarnPanelText(string str) + { + WartipText.text = str; + } + /// /// 撤离方案选着 /// public void DialogboxPanel() { - if(DiaLogBox.activeSelf) + if (DiaLogBox.activeSelf) { DiaLogBox.SetActive(false); } @@ -709,28 +855,250 @@ public class ZZUIManager : MonoBehaviour DiaLogBox2.SetActive(true); } } - /// - /// 创建紧急通告 - /// - /// 文本内容 + /// + /// 创建紧急通告 + /// + /// 文本内容 public void CreateWarn(string str) { GameObject newText = Instantiate(TextPrefab); newText.transform.SetParent(content.transform, false); - Text text=newText.GetComponentInChildren(); - text.text = str; - } - /// - /// 创建疏散情况内容 - /// - /// 文本内容 - public void CreateSituation(string str) - { - GameObject newText = Instantiate(TextPrefab2); - newText.transform.SetParent(content2.transform, false); Text text = newText.GetComponentInChildren(); text.text = str; } + /// + /// 弹出提示框 + /// + public void PopTip() + { + TipPanel.SetActive(true); + TipText.text = "用时" + TimeText.text + "学生疏散完毕"; + //从透明开始 + TipText.color = new Color(TipText.color.r, TipText.color.g, TipText.color.b, 0f); + TipBg.color = new Color(TipText.color.r, TipText.color.g, TipText.color.b, 0f); + StartCoroutine(FadeInOutRoutine()); + } + /// + /// 提示面板淡入淡出的携程 + /// + /// + IEnumerator FadeInOutRoutine() + { + isFading = true; // 设置正在淡入淡出标志 + + // 淡入 + float elapsedTime = 0f; + while (elapsedTime < fadeInDuration) + { + elapsedTime += Time.deltaTime; + Color textColor = TipText.color; + textColor.a = elapsedTime / fadeInDuration; // 根据时间计算alpha值 + TipText.color = textColor; + TipBg.color = textColor; + + yield return null; // 等待下一帧 + } + + // 显示文本一段时间 + yield return new WaitForSeconds(displayDuration); + + // 淡出 + elapsedTime = 0f; + while (elapsedTime < fadeOutDuration) + { + elapsedTime += Time.deltaTime; + Color textColor = TipText.color; + textColor.a = 1f - (elapsedTime / fadeOutDuration); // 根据时间计算alpha值 + TipText.color = textColor; + TipBg.color = textColor; + yield return null; // 等待下一帧 + } + + isFading = false; // 重置正在淡入淡出标志 + fadeCoroutine = null; // 重置协程引用 + TipPanel.SetActive(false); + } + + + #region 修改文本 + /// + /// 修改楼梯口的三个文本信息 + /// + /// 1-第一个，2第二个，3第三个 + /// 楼梯口信息 + public void FixStairway(int a, string str) + { + switch (a) + { + case 1: + icn_stairway_text_1.text = str; + break; + case 2: + icn_stairway_text_2.text = str; + break; + case 3: + icn_stairway_text_3.text = str; + break; + } + } + /// + /// 修改总指挥头像，名字，内容 + /// + /// 头像图片 + /// 名字 + /// 内容 + public void FixWarn_Tip(Image headImage, string name, string Message) + { + HeadImage = headImage; + Head_Text.text = name; + WarnTip_Text.text = Message; + } + /// + /// 修改总指挥框框 无图像，名字，内容 + /// + /// 名字 + /// 内容 + public void FixWarn_Tip(string name, string Message) + { + Head_Text.text = name; + WarnTip_Text.text = Message; + } + /// + /// 修改地图上两个带图标的（骷髅头，电话） + /// + /// 1-骷髅头，2-电话 + /// 修改的文本内容 + public void FixMessage(int a, string Message) + { + switch (a) + { + case 1: + MessageText.text = Message; + break; + case 2: + MessageText2.text = Message; + break; + } + } + /// + /// 修改右边框框内容 + /// + /// 内容 + /// 从上到下 + public void FixWarn(int a, string str) + { + switch (a) + { + case 1: + Tip_1.text = str; + break; + case 2: + Tip_2.text = str; + break; + case 3: + Tip_3.text = str; + break; + case 4: + Tip_4.text = str; + break; + } + } + /// + /// 修改网络延迟 + /// + /// 网络延迟的数字部分 + public void FixDelay(string str) + { + WLYC.text = "网络延迟：" + str; + } + /// + /// 修改疏散班级情况 + /// + /// 班级撤离情况 + /// 更新第几条消息从上往下 + public void FixSituation(int a, string str) + { + switch (a) + { + case 1: + Situation_Tip_1.text = str; + break; + case 2: + Situation_Tip_2.text = str; + break; + case 3: + Situation_Tip_3.text = str; + break; + case 4: + Situation_Tip_4.text = str; + break; + } + } + /// + /// 修改成功撤离班级的信息 + /// + /// 撤离班级的名字 + /// 人数 + public void FixFledOk(int a, string str) + { + Right_MessageText.text = str; + int currentValue = int.Parse(Student_Number.text); + currentValue = a; + // 更新 InputField 的文本 + Student_Number.text = currentValue.ToString(); + } + /// + /// 修改未撤离成功 + /// + /// 人数 + /// 班级 + /// 共多少名学生 + public void FixNo(int a, string str,string str2) + { + NO_Left_MessageText.text = str; + NO_Right_MessageText.text = str2; + NO_Student.text = a.ToString(); + } + /// + /// 修改撤离方案的介绍 + /// + /// 内容 + /// A=1,B=2,C=3选项 + public void FixFled(int a, string str) + { + switch (a) + { + case 1: + RightText1.text = str; + break; + case 2: + RightText2.text = str; + break; + case 3: + RightText3.text = str; + break; + } + } + + /// + /// 清点人数时 修改管理区域 + /// + /// 区域名 + public void FixArea(string str) + { + Area.text = str; + } + /// + /// 清点人数时 修改NPC名 + /// + /// NPC名 + public void FixNPCName(string str) + { + NPCName.text = str; + } + + #endregion + private void Close() { DiaLogBox2?.SetActive(false); diff --git a/xiaofang/Assets/UnityCommon b/xiaofang/Assets/UnityCommon index 2e42b278..0385375c 160000 --- a/xiaofang/Assets/UnityCommon +++ b/xiaofang/Assets/UnityCommon @@ -1 +1 @@ -Subproject commit 2e42b278d4c6ac9e045925dcc6e04896a19cbfd8 +Subproject commit 0385375c1818fc57f42407a6c5301a26ded3a19a