diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab index 8a673a36..96274424 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab @@ -993,7 +993,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 110d9119c7dd0014c8fde3e2a70da417, type: 3} + m_Sprite: {fileID: 21300000, guid: f38af4ec5b0f5bb438566eda1e69c392, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3307,7 +3307,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dfd3976c69b997443b185d5cc96ef76f, type: 3} + m_Sprite: {fileID: 21300000, guid: f38af4ec5b0f5bb438566eda1e69c392, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4435,7 +4435,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fe210d5f58accb24dadebc01f56dffd6, type: 3} + m_Sprite: {fileID: 21300000, guid: f38af4ec5b0f5bb438566eda1e69c392, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5632,9 +5632,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 @@ -6300,7 +6300,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.93819284, g: 1, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6655,7 +6655,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1986279548675747997 RectTransform: m_ObjectHideFlags: 0 @@ -8290,9 +8290,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 @@ -8631,7 +8631,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1986279549107877076 RectTransform: m_ObjectHideFlags: 0 @@ -9554,6 +9554,8 @@ MonoBehaviour: MessageText2: {fileID: 1986279548444664471} Area: {fileID: 1986279547449863667} NPCName: {fileID: 1986279548891763003} + Image1: {fileID: 0} + Image2: {fileID: 0} fadeInDuration: 1 fadeOutDuration: 1 displayDuration: 2 @@ -9565,10 +9567,10 @@ MonoBehaviour: content3: {fileID: 1100707196} gridLayoutGroup2: {fileID: 1100707198} itemPrefab: {fileID: 5642274089642939527, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3} - toggleGroup: {fileID: 0} + toggleGroup: {fileID: 1100707199} itemPrefabTextLeft: {fileID: 6187326700225714706} itemPrefabTextRight: {fileID: 6187326701567016294} - itemCount: 12 + itemCount: 4 panelA: {fileID: 1986279549107877076} panelAMoveDistance: 0 moveDuration: 0.5 @@ -10482,7 +10484,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9716981, g: 0, b: 0, a: 1} + 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 @@ -11226,7 +11228,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4309186515595606845 RectTransform: m_ObjectHideFlags: 0 @@ -12712,7 +12714,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3} propertyPath: m_SizeDelta.y - value: 1938.403 + value: 623.365 objectReference: {fileID: 0} - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3} propertyPath: m_LocalPosition.x @@ -12789,6 +12791,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1100707199 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3933018038406921416, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3} + m_PrefabInstance: {fileID: 3933018037357758903} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100707196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4614685797598051619 PrefabInstance: m_ObjectHideFlags: 0 @@ -12818,7 +12831,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.x @@ -12826,15 +12839,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalPosition.x @@ -12866,11 +12879,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -105 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12931,7 +12944,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.x @@ -12939,15 +12952,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalPosition.x @@ -12979,11 +12992,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13161,7 +13174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.x @@ -13169,15 +13182,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalPosition.x @@ -13209,11 +13222,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -245 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13278,7 +13291,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.x @@ -13286,15 +13299,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalPosition.x @@ -13326,11 +13339,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -175 objectReference: {fileID: 0} - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity index 3bfe6572..9c8b4552 100644 --- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity +++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity @@ -161,7 +161,7 @@ MonoBehaviour: LanguageJsonFile: {fileID: 4900000, guid: 62a41129c4663ee41a06274114d28feb, type: 3} SelectJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3} TaskJsonFile: {fileID: 4900000, guid: 4dec25769ed4ed3469693b1c881248af, type: 3} - GlobalJsonFile: {fileID: 4900000, guid: bf2e45c406f6ef149804c6e3158da17c, type: 3} + GlobalJsonFile: {fileID: 4900000, guid: 27ecc4e37cb448e45a2611c086cdfb90, type: 3} SelectsJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3} --- !u!4 &86517375 Transform: @@ -178,6 +178,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &240169305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 240169308} + - component: {fileID: 240169307} + - component: {fileID: 240169306} + m_Layer: 0 + m_Name: GameObject (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &240169306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240169305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 45104c6091103e14d9b116cfa493c4c8, 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!222 &240169307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240169305} + m_CullTransparentMesh: 1 +--- !u!224 &240169308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240169305} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.05723057} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + 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: 492.0705, y: 204.81587} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &298877719 GameObject: m_ObjectHideFlags: 0 @@ -246,17 +322,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &330485451 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1100707199, 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: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1229671918 GameObject: m_ObjectHideFlags: 0 @@ -351,6 +416,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &2021236887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021236890} + - component: {fileID: 2021236889} + - component: {fileID: 2021236888} + m_Layer: 0 + m_Name: GameObject (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2021236888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021236887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 76645fdfb41111d40a2d5e5f30140ed2, 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!222 &2021236889 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021236887} + m_CullTransparentMesh: 1 +--- !u!224 &2021236890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021236887} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.08606074} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + 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} + m_AnchoredPosition: {x: 496.36884, y: 205.19366} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2053376435 GameObject: m_ObjectHideFlags: 0 @@ -442,258 +583,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 261402557, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 676728424, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: itemCount - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: jsonReader - value: - objectReference: {fileID: 86517374} - - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: toggleGroup - value: - objectReference: {fileID: 330485451} - - target: {fileID: 1100707197, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 623.365 - objectReference: {fileID: 0} - - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1605163136, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741092114, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741092114, 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 - objectReference: {fileID: 0} - - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1854268889, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279547715622013, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_Pivot.x value: 0 @@ -782,125 +671,5 @@ PrefabInstance: propertyPath: m_Name value: Command_End objectReference: {fileID: 0} - - target: {fileID: 1986279549238718699, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2991637681471873777, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - 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: 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: 6187326699852508386, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6187326700225714706, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_Text - value: "\u758F\u6563\u8DEF\u7EBF\u9009\u7740" - objectReference: {fileID: 0} - - target: {fileID: 6187326700225714706, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_FontData.m_FontSize - value: 43 - objectReference: {fileID: 0} - - target: {fileID: 6852673806710748770, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} - propertyPath: m_IsActive - 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: [] m_SourcePrefab: {fileID: 100100000, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs index 2436a42b..2c247460 100644 --- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs +++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs @@ -270,6 +270,9 @@ public class ZZUIManager : MonoBehaviour public Text Area; public Text NPCName; + public Sprite Image1; + public Sprite Image2; + #region 淡入淡出效果 //计时器 private float timeElapsed = 0f; @@ -313,7 +316,7 @@ public class ZZUIManager : MonoBehaviour public ToggleGroup toggleGroup;//父对象的组件 public Text itemPrefabTextLeft;//标题 public Text itemPrefabTextRight;//内容 - public int itemCount=3; // 要创建的物体数量 + public int itemCount = 3; // 要创建的物体数量 #endregion @@ -353,6 +356,8 @@ public class ZZUIManager : MonoBehaviour //string str = jsonReader.SetUIText(50102); //Debug.Log(jsonReader.SetUIText(50102)); //Debug.Log(str); + + InitializeFlee(); @@ -521,17 +526,17 @@ public class ZZUIManager : MonoBehaviour private void Update() { //测试面板 - //if (Input.GetKeyDown("j")) - //{ - // string str = "aaa"; - // FixWarnPanelText(str); - // WarnPanel(); + if (Input.GetKeyDown("j")) + { + string str = "aaa"; + FixWarnPanelText(str); + WarnPanel(); - //} - //if (Input.GetKeyDown("k")) - //{ - // FixWarnPanelText("aaaa"); - //} + } + if (Input.GetKeyDown("k")) + { + FixWarnPanelText("aaaa"); + } // 更新时间 timeElapsed += Time.deltaTime; @@ -542,7 +547,7 @@ public class ZZUIManager : MonoBehaviour // 格式化时间为 "00.00" 格式 TimeText.text = string.Format("{0:00}.{1:00}", minutes, seconds); - + } public void Number(Text num) @@ -551,7 +556,7 @@ public class ZZUIManager : MonoBehaviour } IEnumerator Num(Text num) { - while(true) + while (true) { num.fontSize = 42; yield return new WaitForSeconds(0.5f); @@ -587,7 +592,7 @@ public class ZZUIManager : MonoBehaviour } #region 疏散情况按班级排序功能实现 //数据初始化 - public void initialized() + public void initialized() { foreach (Transform child in gridLayoutGroup.transform) { @@ -604,38 +609,38 @@ public class ZZUIManager : MonoBehaviour } } - // 按照班级号排序 - public void SortByClass() - { - // 排序之前先解析班级数字 - textFields = textFields.OrderBy(t => ParseClassNumber(t.text)).ToList(); + // 按照班级号排序 + 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) + // 重新排列文本框的位置（GridLayoutGroup 会自动处理） + for (int i = 0; i < textFields.Count; i++) { - // 使用正则表达式提取类似 "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，表示无法解析 + 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() { // 如果按钮已隐藏，点击后显示 @@ -756,12 +761,11 @@ public class ZZUIManager : MonoBehaviour TipTilte.SetActive(false); MapTapPanel.SetActive(false); } - /// - /// 初始化撤离方案（随机显示） - /// + /// + /// 初始化撤离方案（随机显示） + /// public void InitializeFlee() { - int a, b, c,count; string str; List createdItems = new List(); @@ -771,11 +775,11 @@ public class ZZUIManager : MonoBehaviour GameObject newItem = Instantiate(itemPrefab, content3.transform); Text left = newItem.transform.Find("Choose_Bg/Choose_BgLeft/Left").GetComponent(); Text Right = newItem.transform.Find("Choose_Bg/Choose_BgLeft/Right").GetComponent(); - left.text =jsonReader.SetUIText(20000); - str= jsonReader.GetGlobal(1, 90016); - string[] str1=str.Split('|'); + left.text = jsonReader.SetUIText(20000); + str = jsonReader.GetGlobal(1, 90016); + string[] str1 = str.Split('|'); Right.text = jsonReader.GetEvacuate(str1[i]); - Toggle toggle=newItem.gameObject.GetComponent(); + Toggle toggle = newItem.gameObject.GetComponent(); toggle.group = toggleGroup; // 绑定点击事件 @@ -860,12 +864,14 @@ public class ZZUIManager : MonoBehaviour { while (isEnd) { - Bg1.color = new Color(1f, 1f, 1f); - Bg.color = new Color(1f, 0f, 0f); + //Bg1.color= new Color(1f, 1f, 1f); + Bg1.sprite = Image1; + //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); + Bg1.sprite = Image2; 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); } } @@ -1099,7 +1105,7 @@ public class ZZUIManager : MonoBehaviour /// 人数 /// 班级 /// 共多少名学生 - public void FixNo(int a, string str,string str2) + public void FixNo(int a, string str, string str2) { NO_Left_MessageText.text = str; NO_Right_MessageText.text = str2; @@ -1121,12 +1127,13 @@ public class ZZUIManager : MonoBehaviour { NPCName.text = str; } + #endregion /// /// 撤离教师的方案选择 /// /// /// - private void OnToggleClicked(bool isOn,int index) + private void OnToggleClicked(bool isOn, int index) { if (isOn) { @@ -1134,8 +1141,6 @@ public class ZZUIManager : MonoBehaviour Debug.Log("Toggle " + index + " is On"); } } - #endregion - private void Close() { DiaLogBox2?.SetActive(false);