From 1eeb4cd49b20d64176e065a175a4f0b8079799d2 Mon Sep 17 00:00:00 2001
From: LMZ <1477077658@qq.com>
Date: Sun, 15 Dec 2024 17:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B2=E5=A5=BD=E5=95=A6=E5=95=A6=E5=95=A6?=
 =?UTF-8?q?=E5=95=A6=E5=95=A6=E5=95=A6=E5=95=A6=E5=95=A6=EF=BC=88mini?=
 =?UTF-8?q?=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   | 555 ++++++++++++++++--
 .../Assets/Scenes/LL_Command_Action_1.unity   | 372 ++++--------
 .../Assets/Script/JSONReader/JSONReader.cs    | 112 +++-
 .../Assets/Script/UI/ZZZZZZ/ZZUIManager.cs    | 138 +++--
 xiaofang/Assets/UnityCommon                   |   2 +-
 5 files changed, 816 insertions(+), 363 deletions(-)

diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
index a17bb02a..8a673a36 100644
--- a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
+++ b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
@@ -311,6 +311,97 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &570685013
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 570685014}
+  - component: {fileID: 570685017}
+  - component: {fileID: 570685016}
+  - component: {fileID: 570685015}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &570685014
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 570685013}
+  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: 1100707197}
+  m_Father: {fileID: 1634927331}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 53.195, y: 0}
+  m_SizeDelta: {x: -87.639, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &570685017
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 570685013}
+  m_CullTransparentMesh: 1
+--- !u!114 &570685016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 570685013}
+  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: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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!114 &570685015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 570685013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &676728424
 GameObject:
   m_ObjectHideFlags: 0
@@ -989,6 +1080,83 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1634927330
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1634927331}
+  - component: {fileID: 1634927334}
+  - component: {fileID: 1634927332}
+  m_Layer: 5
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1634927331
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634927330}
+  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: 570685014}
+  m_Father: {fileID: 1986279547906217107}
+  m_RootOrder: 3
+  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.855, y: 0.0011978}
+  m_SizeDelta: {x: 1169.213, y: 426.93}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1634927334
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634927330}
+  m_CullTransparentMesh: 1
+--- !u!114 &1634927332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634927330}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 1100707197}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 2
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 570685014}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1850042308
 GameObject:
   m_ObjectHideFlags: 0
@@ -2450,7 +2618,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3254,7 +3422,9 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1986279549247958298}
+  - {fileID: 6187326699852508387}
   - {fileID: 1986279548098693904}
+  - {fileID: 1634927331}
   m_Father: {fileID: 1986279548675747997}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3601,8 +3771,8 @@ 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: 2.6850967, y: 0.5}
-  m_SizeDelta: {x: 93.3702, y: 51}
+  m_AnchoredPosition: {x: 0.001045227, y: 0.5}
+  m_SizeDelta: {x: 192.19, y: 51}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1986279548042122895
 CanvasRenderer:
@@ -3634,11 +3804,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_FontSize: 42
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 47
+    m_MinSize: 0
+    m_MaxSize: 92
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4135,7 +4305,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1986279548098693904
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4152,7 +4322,7 @@ RectTransform:
   - {fileID: 1986279548676266128}
   - {fileID: 1986279549241408532}
   m_Father: {fileID: 1986279547906217107}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4869,7 +5039,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 12, y: -1}
-  m_SizeDelta: {x: 447.8758, y: 119.2122}
+  m_SizeDelta: {x: 461.46, y: 119.212}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1986279548242059623
 CanvasRenderer:
@@ -4901,7 +5071,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 54
+    m_FontSize: 51
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -4912,7 +5082,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u64A4\u79BB\u6559\u5BA4\u7684\u65B9\u6848\u9009"
+  m_Text: "\u64A4\u79BB\u6559\u5BA4\u7684\u65B9\u6848\u9009\u62E9"
 --- !u!1 &1986279548263986742
 GameObject:
   m_ObjectHideFlags: 0
@@ -5099,9 +5269,9 @@ RectTransform:
   m_Father: {fileID: 1986279548098693904}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -50}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1986279548304181854
@@ -5462,9 +5632,9 @@ RectTransform:
   m_Father: {fileID: 1986279548025449545}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 237.4, y: 15.5}
   m_SizeDelta: {x: 222, y: 272}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1986279548425159739
@@ -6139,11 +6309,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 32
+    m_FontSize: 46
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 56
+    m_MinSize: 3
+    m_MaxSize: 62
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -6485,7 +6655,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1986279548675747997
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6544,9 +6714,9 @@ RectTransform:
   m_Father: {fileID: 1986279548098693904}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -177.33334}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1986279548676266129
@@ -8120,9 +8290,9 @@ RectTransform:
   m_Father: {fileID: 1986279548025449545}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: -137.4, y: 15.5}
   m_SizeDelta: {x: 222, y: 272}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1986279549002270258
@@ -8935,7 +9105,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1986279549150508379
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9330,9 +9500,6 @@ MonoBehaviour:
   Prop4: {fileID: 1986279547455856480}
   Prop5: {fileID: 1986279547737595684}
   Prop6: {fileID: 1986279547438651113}
-  DialogboxA: {fileID: 1986279548304181854}
-  DialogboxB: {fileID: 1986279548676266129}
-  DialogboxC: {fileID: 1986279549241408533}
   DialogboxSure: {fileID: 1986279548770340787}
   Dialogbox2A: {fileID: 1986279549002270256}
   Dialogbox2B: {fileID: 1986279548425159737}
@@ -9345,6 +9512,8 @@ MonoBehaviour:
   Right_BoxButton: {fileID: 1986279549238718677}
   Close1: {fileID: 1986279548665939568}
   Close2: {fileID: 1986279548236674887}
+  Close1Panel: {fileID: 1986279548236674885}
+  FreePanel: {fileID: 1986279549150508378}
   icn_stairway_text_1: {fileID: 1986279548677716648}
   icn_stairway_text_2: {fileID: 1986279547938014319}
   icn_stairway_text_3: {fileID: 1986279548015271226}
@@ -9354,16 +9523,12 @@ MonoBehaviour:
   Tip_4: {fileID: 1553443887}
   Head_Text: {fileID: 1986279549318208223}
   WarnTip_Text: {fileID: 1986279549027945289}
-  Situation_Tip_1: {fileID: 0}
-  Situation_Tip_2: {fileID: 0}
-  Situation_Tip_3: {fileID: 0}
-  Situation_Tip_4: {fileID: 0}
-  LeftText1: {fileID: 1986279547805966008}
-  LeftText2: {fileID: 1986279547592309254}
-  LeftText3: {fileID: 1986279548468079543}
+  Situation_Tip_1: {fileID: 8544101838369953974}
+  Situation_Tip_2: {fileID: 8618474577547420634}
+  Situation_Tip_3: {fileID: 5824380172705816002}
+  Situation_Tip_4: {fileID: 6164110187781327643}
+  LeftText1: {fileID: 0}
   RightText1: {fileID: 1986279547703201636}
-  RightText2: {fileID: 1986279547692988195}
-  RightText3: {fileID: 1986279549342845701}
   LeftLT_Text1: {fileID: 1986279548062755407}
   RightLT_Text1: {fileID: 1986279549083527464}
   LeftLT_Text2: {fileID: 1986279549557071729}
@@ -9387,6 +9552,8 @@ MonoBehaviour:
   WartipText: {fileID: 1986279548813826758}
   MessageText: {fileID: 1986279547682037534}
   MessageText2: {fileID: 1986279548444664471}
+  Area: {fileID: 1986279547449863667}
+  NPCName: {fileID: 1986279548891763003}
   fadeInDuration: 1
   fadeOutDuration: 1
   displayDuration: 2
@@ -9394,6 +9561,14 @@ MonoBehaviour:
   HeadImage: {fileID: 1986279548676433021}
   Bg: {fileID: 1986279549323494987}
   Bg1: {fileID: 1986279548268462364}
+  jsonReader: {fileID: 0}
+  content3: {fileID: 1100707196}
+  gridLayoutGroup2: {fileID: 1100707198}
+  itemPrefab: {fileID: 5642274089642939527, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+  toggleGroup: {fileID: 0}
+  itemPrefabTextLeft: {fileID: 6187326700225714706}
+  itemPrefabTextRight: {fileID: 6187326701567016294}
+  itemCount: 12
   panelA: {fileID: 1986279549107877076}
   panelAMoveDistance: 0
   moveDuration: 0.5
@@ -9402,7 +9577,7 @@ MonoBehaviour:
   showPositionX: 0
   hidePositionX: 0
   bg: {fileID: 1986279548673143752}
-  gridLayoutGroup: {fileID: 0}
+  gridLayoutGroup: {fileID: 3221337158919056189}
   instert: {fileID: 0}
 --- !u!1 &1986279549197966134
 GameObject:
@@ -9679,9 +9854,9 @@ RectTransform:
   m_Father: {fileID: 1986279548098693904}
   m_RootOrder: 2
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -304.6667}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1986279549241408533
@@ -12368,6 +12543,252 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 121218705949371349, guid: a95bf12ea7cc94f498bdc8967b2f90ac, type: 3}
   m_PrefabInstance: {fileID: 1986279548700035834}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1986279549346871397
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1986279547906217107}
+    m_Modifications:
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 73.67771
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -49.998333
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939527, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_Name
+      value: Choose_1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5642274089642939527, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+--- !u!224 &6187326699852508387 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5642274089642939526, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+  m_PrefabInstance: {fileID: 1986279549346871397}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &6187326700225714706 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5642274089521324663, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+  m_PrefabInstance: {fileID: 1986279549346871397}
+  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 &6187326701567016294 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5642274088178255107, guid: 9121e9998ce2e2c4fb34d50a3d9953d3, type: 3}
+  m_PrefabInstance: {fileID: 1986279549346871397}
+  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!1001 &3933018037357758903
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 570685014}
+    m_Modifications:
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 21.578
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1938.403
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3933018038406921419, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+      propertyPath: m_Name
+      value: Middle_Tip
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+--- !u!1 &1100707196 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3933018038406921419, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+  m_PrefabInstance: {fileID: 3933018037357758903}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1100707197 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3933018038406921418, guid: 7e6415f37b36c13419e8e39ba7a6164a, type: 3}
+  m_PrefabInstance: {fileID: 3933018037357758903}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1100707198 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3933018038406921417, 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: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4614685797598051619
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12469,6 +12890,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+--- !u!114 &8618474577547420634 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+  m_PrefabInstance: {fileID: 4614685797598051619}
+  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!224 &8618474577547420637 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
@@ -12576,6 +13008,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
   m_PrefabInstance: {fileID: 4684570332724479567}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8544101838369953974 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+  m_PrefabInstance: {fileID: 4684570332724479567}
+  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!1001 &5097649312431883682
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12698,7 +13141,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
       propertyPath: m_Text
-      value: "1-2\u73ED\u7EA7"
+      value: "1-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563"
       objectReference: {fileID: 0}
     - target: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
       propertyPath: m_Pivot.x
@@ -12790,6 +13233,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+--- !u!114 &6164110187781327643 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+  m_PrefabInstance: {fileID: 7069245350669669858}
+  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!224 &6164110187781327644 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
@@ -12896,6 +13350,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+--- !u!114 &5824380172705816002 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4003788853082971897, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
+  m_PrefabInstance: {fileID: 7441083856479355707}
+  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!224 &5824380172705816005 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4003788853082971902, guid: a0ad13d6a7cc08a488ec912e2ed7f47d, type: 3}
diff --git a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity
index 73d25a30..5e7b96bf 100644
--- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity
+++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity
@@ -122,17 +122,62 @@ 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}
+--- !u!1 &86517373
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 86517375}
+  - component: {fileID: 86517374}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &86517374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 86517373}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: 13fa0701c49727a4c84282a40243e52d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  npcJsonFile: {fileID: 4900000, guid: a854e20393334f04a8fc75e06404fe4f, type: 3}
+  locationJsonFile: {fileID: 4900000, guid: 4d6cd655327e27c4b88c2033169c8fed, type: 3}
+  eventJsonFile: {fileID: 4900000, guid: 2ef075e4830019a42b84d8d05d13d81c, type: 3}
+  matialJsonFile: {fileID: 4900000, guid: d98cb351d1a87dc4887a37106b9745d4, type: 3}
+  sceneJsonFile: {fileID: 4900000, guid: 06c09fd1c8b0a0a45951a1065189d922, type: 3}
+  incidentSiteJosnFile: {fileID: 4900000, guid: 1efa4372b10d4294199638c49173ff4c, type: 3}
+  NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3}
+  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}
+  SelectsJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}
+--- !u!4 &86517375
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 86517373}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 360.4609, y: 215.89246, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &298877719
 GameObject:
   m_ObjectHideFlags: 0
@@ -201,31 +246,15 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &451300333 stripped
+--- !u!114 &330485451 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8618474577547420634, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+  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: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &454864855 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1986279549150508378, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-  m_PrefabInstance: {fileID: 1986279549016710772}
-  m_PrefabAsset: {fileID: 0}
---- !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_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &1229671918
@@ -322,50 +351,6 @@ 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
@@ -450,11 +435,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2138670361 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1986279548236674885, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-  m_PrefabInstance: {fileID: 1986279549016710772}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1986279549016710772
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -486,42 +466,26 @@ PrefabInstance:
       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: Area
-      value: 
-      objectReference: {fileID: 1388304172}
+      propertyPath: itemCount
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: NPCName
+      propertyPath: jsonReader
       value: 
-      objectReference: {fileID: 198436690}
+      objectReference: {fileID: 86517374}
     - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: FreePanel
+      propertyPath: toggleGroup
       value: 
-      objectReference: {fileID: 454864855}
-    - target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: Close1Panel
-      value: 
-      objectReference: {fileID: 2138670361}
-    - 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}
+      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
@@ -690,138 +654,40 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - 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: 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
+    - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_AnchorMax.y
       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: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548304181853, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 237.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      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
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+    - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1986279548676266128, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+    - target: {fileID: 1986279548425159736, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -177.33334
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279548795827112, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -137.4
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1986279549002270263, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 15.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279549107877099, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279549150508378, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
@@ -912,34 +778,10 @@ 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}
+    - target: {fileID: 2991637681471873777, 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: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279549241408532, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1986279549241408532, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      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
@@ -964,32 +806,44 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6164110187781327643, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+    - 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: "1-2\u73ED\u5DF2\u7ECF\u5F00\u59CB\u758F\u6563"
+      value: "\u758F\u6563\u8DEF\u7EBF\u9009\u7740"
       objectReference: {fileID: 0}
-    - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
+    - target: {fileID: 6187326700225714706, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 43
       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
+    - target: {fileID: 6852673806710748770, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
diff --git a/xiaofang/Assets/Script/JSONReader/JSONReader.cs b/xiaofang/Assets/Script/JSONReader/JSONReader.cs
index f596c133..473ae54e 100644
--- a/xiaofang/Assets/Script/JSONReader/JSONReader.cs
+++ b/xiaofang/Assets/Script/JSONReader/JSONReader.cs
@@ -16,6 +16,8 @@ public class JSONReader : MonoBehaviour
     public TextAsset LanguageJsonFile;
     public TextAsset SelectJsonFile;
     public TextAsset TaskJsonFile;
+    public TextAsset GlobalJsonFile;
+    public TextAsset SelectsJsonFile;
     public Dictionary<int, NPCData> npcDictionary = new Dictionary<int, NPCData>();
     public Dictionary<int, LocationData> locationDictionary = new Dictionary<int, LocationData>();
     public Dictionary<int, EventData> eventDictionary = new Dictionary<int, EventData>();
@@ -26,6 +28,8 @@ public class JSONReader : MonoBehaviour
     public Dictionary<int, Language> LanguageDictionary = new Dictionary<int, Language>();
     public Dictionary<string, Select> SelectDictionary = new Dictionary<string, Select>();
     public Dictionary<string, Task_> TaskDictionary = new Dictionary<string, Task_>();
+    public Dictionary<int,GlobalJson> GlobalDictionary= new Dictionary<int, GlobalJson>();
+    public Dictionary<string,Select> SelectsDictionary= new Dictionary<string, Select>();
 
     void Awake()
     {
@@ -41,6 +45,8 @@ public class JSONReader : MonoBehaviour
         SelectDictionary = SelectJSON(SelectJsonFile.text);
         TaskDictionary = TaskJSON(TaskJsonFile.text);
 
+        GlobalDictionary=GlobelJSON(GlobalJsonFile.text);
+        SelectsDictionary = SelectsJSON(SelectsJsonFile.text);
 
         GetLanguageByID(20008);
         foreach (var npc in npcDictionary)
@@ -185,6 +191,31 @@ public class JSONReader : MonoBehaviour
         return locationDictionary;
     }
 
+    public Dictionary<int, GlobalJson> GlobelJSON(string json)
+    {
+        GlobalJson[] locationArray = JsonHelper.FromJson<GlobalJson>(json);
+        Dictionary<int, GlobalJson> locationDictionary = new Dictionary<int, GlobalJson>();
+
+        foreach (var location in locationArray)
+        {
+            locationDictionary[location.ID] = location;
+        }
+
+        return locationDictionary;
+    }
+    public Dictionary<string, Select> SelectsJSON(string json)
+    {
+        Select[] locationArray = JsonHelper.FromJson<Select>(json);
+        Dictionary<string, Select> locationDictionary = new Dictionary<string,Select>();
+
+        foreach (var location in locationArray)
+        {
+            locationDictionary[location.ID] = location;
+        }
+
+        return locationDictionary;
+    }
+
     //将所有的数据都拿出来方便调用
     // 根据给定的ID获取对应的NPC数据，并返回字典中所有数据
     public void GetNpcDataByID(int id)
@@ -307,6 +338,63 @@ public class JSONReader : MonoBehaviour
             return null;
         }
     }
+
+    /// <summary>
+    /// 判断指挥官选择了哪一个选项
+    /// </summary>
+    /// <param name="a">a=1选择了第一个，a=2,a=3</param>
+    /// <param name="id">ID不出情况一般固定90016</param>
+    /// <returns></returns>
+    public string GetGlobal(int a,int id)
+    {
+        
+        GlobalJson temp=null ;  
+        switch(a)
+        {
+            case 1:
+                if (GlobalDictionary.TryGetValue(id, out temp))
+                    return temp.VectorInt1;
+                else
+                    return null;
+            case 2:
+                if (GlobalDictionary.TryGetValue(id, out temp))
+                    return temp.VectorInt2;
+                else
+                    return null;
+            case 3:
+                if (GlobalDictionary.TryGetValue(id, out temp))
+                    return temp.VectorInt3;
+                else
+                    return null;
+            default:
+                 return "颠仔没有这种东西";
+
+        }
+        //GlobalJson info = null;
+        //if (GlobalDictionary.TryGetValue(id,out info))
+        //{
+        //    return info.Int1.ToString();
+        //}
+        //else
+        //{
+        //    Debug.Log($"No Language found with ID: {id}");
+        //    return null;
+        //}
+    }
+    
+    public string GetEvacuate(string id)
+    {
+        Select info = null;
+        if (SelectsDictionary.TryGetValue(id.ToString(), out info))
+        {
+            return info.Note;
+        }
+        else
+        {
+            Debug.Log($"No Select found with ID: {id}");
+            return null;
+        }
+    }
 }
 
 // 帮助类，用于解析 JSON 数组
@@ -484,4 +572,26 @@ public class Task_
     public string IsShow;
     public string Exclusive;
     public string Reward;
-}
\ No newline at end of file
+}
+[System.Serializable]
+public class GlobalJson
+{
+    public int ID;
+    public string Note;
+    public int Scene;
+    public int PlayScript;
+    public int Int1;
+    public int Int2;
+    public int Int3;
+    public float Float1;
+    public float Float2;
+    public float Float3;
+    public string VectorInt1;
+    public string VectorInt2;
+    public string VectorInt3;
+    public string VectorInt4;
+    public string VectorInt5;
+    public string String1;
+    public string String2;
+    public string String3;
+}
diff --git a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs
index 3efba79c..2436a42b 100644
--- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs
+++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 using UnityEngine;
@@ -122,12 +123,6 @@ public class ZZUIManager : MonoBehaviour
     public Button Prop5;
     public Button Prop6;
     /// <summary>
-    ///  撤离教室方案ABC
-    /// </summary>
-    public Toggle DialogboxA;
-    public Toggle DialogboxB;
-    public Toggle DialogboxC;
-    /// <summary>
     /// 撤离方案确定
     /// </summary>
     public Button DialogboxSure;
@@ -199,14 +194,11 @@ public class ZZUIManager : MonoBehaviour
     ///  撤离方案ABC
     /// </summary>
     public Text LeftText1;
-    public Text LeftText2;
-    public Text LeftText3;
+
     /// <summary>
     /// 撤离方案介绍
     /// </summary>
     public Text RightText1;
-    public Text RightText2;
-    public Text RightText3;
     /// <summary>
     ///   楼梯梯队介绍
     /// </summary>
@@ -310,8 +302,20 @@ public class ZZUIManager : MonoBehaviour
     public Image Bg1;
     //结束标志
     private bool isEnd;
+
+    public JSONReader jsonReader;
     #endregion
 
+    #region 实现撤离方案的随机
+    public GameObject content3; // Scroll View 的 Content 物体
+    public GridLayoutGroup gridLayoutGroup2; // Grid Layout Group 组件
+    public GameObject itemPrefab; // 子物体的预制件
+    public ToggleGroup toggleGroup;//父对象的组件
+    public Text itemPrefabTextLeft;//标题
+    public Text itemPrefabTextRight;//内容
+    public int itemCount=3; // 要创建的物体数量
+
+    #endregion
 
     #region 弹出的效果（包含推开疏散情况）
     public RectTransform panelA;
@@ -342,8 +346,15 @@ public class ZZUIManager : MonoBehaviour
     }
     private void Start()
     {
-        Frist();
-        initialized();
+
+        //测试
+        // Frist();
+        //FixWarn(1,jsonReader.SetUIText(50102));
+        //string str = jsonReader.SetUIText(50102);
+        //Debug.Log(jsonReader.SetUIText(50102));
+        //Debug.Log(str);
+        InitializeFlee();
+
 
         //动画位移位置数据
         hidePositionX = 337f;
@@ -458,10 +469,6 @@ public class ZZUIManager : MonoBehaviour
         {
             Sumbit2Button();
         });
-        //撤离方案选择
-        DialogboxA.onValueChanged.AddListener(delegate { OnToggleChanged(DialogboxA); });
-        DialogboxB.onValueChanged.AddListener(delegate { OnToggleChanged(DialogboxB); });
-        DialogboxC.onValueChanged.AddListener(delegate { OnToggleChanged(DialogboxC); });
         //撤离方案确定
         DialogboxSure.onClick.AddListener(() =>
         {
@@ -749,29 +756,55 @@ public class ZZUIManager : MonoBehaviour
         TipTilte.SetActive(false);
         MapTapPanel.SetActive(false);
     }
-
-    /// <summary>
-    /// 撤离方案选择
-    /// </summary>
-    /// <param name="change">A-1 B-2 C-3</param>
-    public void OnToggleChanged(Toggle changedToggle)
+   /// <summary>
+   /// 初始化撤离方案（随机显示）
+   /// </summary>
+    public void InitializeFlee()
     {
-        if (changedToggle.isOn)
+        int a, b, c,count;
+        string str;
+        List<GameObject> createdItems = new List<GameObject>();
+
+        // 动态创建指定数量的子物体并保存它们
+        for (int i = 0; i < itemCount; i++)
         {
-            if (changedToggle == DialogboxA)
-            {
-                Debug.Log("Toggle 1 is selected");
-            }
-            else if (changedToggle == DialogboxB)
-            {
-                Debug.Log("Toggle 2 is selected");
-            }
-            else if (changedToggle == DialogboxC)
-            {
-                Debug.Log("Toggle 3 is selected");
-            }
+            GameObject newItem = Instantiate(itemPrefab, content3.transform);
+            Text left = newItem.transform.Find("Choose_Bg/Choose_BgLeft/Left").GetComponent<Text>();
+            Text Right = newItem.transform.Find("Choose_Bg/Choose_BgLeft/Right").GetComponent<Text>();
+            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.group = toggleGroup;
+
+            // 绑定点击事件
+            int index = i; // 保证每个 Toggle 有不同的 index
+            toggle.onValueChanged.AddListener((bool isOn) => OnToggleClicked(isOn, index));
+            // left.text=js
+            createdItems.Add(newItem); // 将新创建的物体添加到列表中
         }
+
+        // 打乱顺序（使用 Fisher-Yates 算法）
+        System.Random rand = new System.Random();
+        int n = createdItems.Count;
+        for (int i = n - 1; i > 0; i--)
+        {
+            int j = rand.Next(i + 1);
+            GameObject temp = createdItems[i];
+            createdItems[i] = createdItems[j];
+            createdItems[j] = temp;
+        }
+
+        // 按照打乱后的顺序重新排列物体
+        foreach (GameObject item in createdItems)
+        {
+            item.transform.SetSiblingIndex(createdItems.IndexOf(item)); // 设置物体的兄弟索引
+        }
+        // 强制刷新布局
+        LayoutRebuilder.ForceRebuildLayoutImmediate(content3.GetComponent<RectTransform>());
     }
+
     /// <summary>
     /// 已经安全撤离的班级 上报总指 按钮事件
     /// </summary>
@@ -1072,27 +1105,6 @@ public class ZZUIManager : MonoBehaviour
         NO_Right_MessageText.text = str2;
         NO_Student.text = a.ToString();
     }
-    /// <summary>
-    /// 修改撤离方案的介绍
-    /// </summary>
-    /// <param name="str">内容</param>
-    /// <param name="a">A=1,B=2,C=3选项</param>
-    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;
-        }
-    }
-
     /// <summary>
     /// 清点人数时 修改管理区域
     /// </summary>
@@ -1109,7 +1121,19 @@ public class ZZUIManager : MonoBehaviour
     {
         NPCName.text = str;
     }
-
+    /// <summary>
+    /// 撤离教师的方案选择
+    /// </summary>
+    /// <param name="isOn"></param>
+    /// <param name="index"></param>
+     private void OnToggleClicked(bool isOn,int index)
+    {
+        if (isOn)
+        {
+            // 执行开启的操作
+            Debug.Log("Toggle " + index + " is On");
+        }
+    }
     #endregion
 
     private void Close()
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