Bug修改

xiaofang/Assets/Prefabs/PanelPrefabs/ScriptPanel.prefab

@@ -1,5 +1,296 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &899943072307819569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7458715547781580025}
+  - component: {fileID: 3983246223959307571}
+  - component: {fileID: 6485402200366596805}
+  - component: {fileID: 2847224094726147540}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7458715547781580025
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 899943072307819569}
+  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: 5475342654612131044}
+  m_Father: {fileID: 5298631526888954802}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0.000030518}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3983246223959307571
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 899943072307819569}
+  m_CullTransparentMesh: 1
+--- !u!114 &6485402200366596805
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 899943072307819569}
+  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 &2847224094726147540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 899943072307819569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &3969360847307398837
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5298631526888954802}
+  - component: {fileID: 7238010443471061611}
+  - component: {fileID: 6775190339170350222}
+  - component: {fileID: 8920314133839789369}
+  m_Layer: 5
+  m_Name: Scroll View (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5298631526888954802
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3969360847307398837}
+  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: 7458715547781580025}
+  m_Father: {fileID: 7468736063766935915}
+  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_SizeDelta: {x: 1834, y: 473.3535}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7238010443471061611
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3969360847307398837}
+  m_CullTransparentMesh: 1
+--- !u!114 &6775190339170350222
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3969360847307398837}
+  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: 0}
+  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: 10907, 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 &8920314133839789369
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3969360847307398837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 5475342654612131044}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 7458715547781580025}
+  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 &5115718782844385360
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5475342654612131044}
+  - component: {fileID: 5514494594673652581}
+  - component: {fileID: 5663709664570259637}
+  - component: {fileID: 6666582945127476144}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5475342654612131044
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5115718782844385360}
+  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: []
+  m_Father: {fileID: 7458715547781580025}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 479}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &5514494594673652581
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5115718782844385360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &5663709664570259637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5115718782844385360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 42
+    m_Right: 0
+    m_Top: 5
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 12.66
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6666582945127476144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5115718782844385360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AllowSwitchOff: 1
 --- !u!1 &7468736063737577050
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,6 +486,7 @@ RectTransform:
   m_Children:
   - {fileID: 7468736063881909988}
   - {fileID: 7468736064250338014}
+  - {fileID: 5298631526888954802}
   - {fileID: 7468736065055436938}
   - {fileID: 7468736065685524838}
   m_Father: {fileID: 0}
@@ -307,9 +599,12 @@ MonoBehaviour:
   scoolSelectBtn: {fileID: 0}
   schoolChoiceLable: {fileID: 7468736065055436939}
   eventChoiceLable: {fileID: 7468736065685524839}
-  mainPanel: {fileID: 0}
+  randomEventBtn: {fileID: 0}
+  text20008: {fileID: 0}
+  title: {fileID: 0}
   schoolInfoList: []
   eventInfoList: []
+  incidentInfos: []
   sceneItemList: []
   difficultyList:
   - {fileID: 7468736065668749934}
@@ -317,13 +612,7 @@ MonoBehaviour:
   - {fileID: 7468736063812420173}
   - {fileID: 7468736064407837104}
   continueBtn: {fileID: 7468736065465452899}
-  toggleList:
+  scenetoggleList: []
-  - {fileID: 7468736065691790200}
-  - {fileID: 7468736064179597247}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
   schooltoggleList:
   - {fileID: 7468736065691790200}
   - {fileID: 7468736064179597247}
@@ -340,15 +629,18 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  evnetsceneList: []
   toggleGroup: {fileID: 0}
   datePanel: {fileID: 0}
   schoolId: 0
   schoolName: 
+  scnenId: 0
   sceneName: 
   eventId: 0
   eventName: 
   difficulty: 
   isBuy: 
+  isSure: 0
   jsonReader: {fileID: 0}
 --- !u!1 &7468736063783585410
 GameObject:
@@ -1309,8 +1601,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   eventId: 101
   eventName: {fileID: 0}
-  maskImage: {fileID: 0}
+  eventimage: {fileID: 0}
-  isOpen: 0
 --- !u!1 &7468736064054086211
 GameObject:
   m_ObjectHideFlags: 0
@@ -1534,8 +1825,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   eventId: 102
   eventName: {fileID: 0}
-  maskImage: {fileID: 0}
+  eventimage: {fileID: 0}
-  isOpen: 0
 --- !u!1 &7468736064179597219
 GameObject:
   m_ObjectHideFlags: 0
@@ -1574,10 +1864,10 @@ RectTransform:
   m_Father: {fileID: 7468736063886807695}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 564.5, y: -62}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 322, y: 98}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7468736064179597247
 MonoBehaviour:
@@ -3540,7 +3830,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7468736065055436938
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3557,11 +3847,11 @@ RectTransform:
   - {fileID: 7468736063886807695}
   - {fileID: 7468736065465452902}
   m_Father: {fileID: 7468736063766935915}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 917, y: -829.36597}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1834, y: 498.685}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736065072894800
@@ -4885,7 +5175,7 @@ RectTransform:
   - {fileID: 7468736064424568482}
   - {fileID: 7468736064367576371}
   m_Father: {fileID: 7468736063766935915}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4930,10 +5220,10 @@ RectTransform:
   m_Father: {fileID: 7468736063886807695}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 206, y: -62}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 322, y: 98}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7468736065691790200
 MonoBehaviour:

xiaofang/Assets/Prefabs/itemPrefabs/eventItem.prefab

@@ -0,0 +1,478 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4948242153488973737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4948242153488973718}
+  - component: {fileID: 4948242153488973716}
+  - component: {fileID: 4948242153488973719}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4948242153488973718
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242153488973737}
+  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: []
+  m_Father: {fileID: 4948242154612453632}
+  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}
+  m_AnchoredPosition: {x: 0.0001, y: -21.1981}
+  m_SizeDelta: {x: 360, y: 360}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4948242153488973716
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242153488973737}
+  m_CullTransparentMesh: 1
+--- !u!114 &4948242153488973719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242153488973737}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4948242153928383527
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4948242153928383524}
+  - component: {fileID: 4948242153928383522}
+  - component: {fileID: 4948242153928383525}
+  m_Layer: 5
+  m_Name: hightlight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4948242153928383524
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242153928383527}
+  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: []
+  m_Father: {fileID: 4948242154612453632}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 408, y: 480}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4948242153928383522
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242153928383527}
+  m_CullTransparentMesh: 1
+--- !u!114 &4948242153928383525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242153928383527}
+  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: 2ee846e59d3b47f46b2b2dc7a0c49d4c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4948242154612453635
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4948242154612453632}
+  - component: {fileID: 4948242154612453646}
+  - component: {fileID: 4948242154612453633}
+  - component: {fileID: 4948242154612453647}
+  - component: {fileID: 4948242154612453644}
+  - component: {fileID: -7201554112406576405}
+  m_Layer: 5
+  m_Name: eventItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4948242154612453632
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154612453635}
+  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: 4948242153928383524}
+  - {fileID: 4948242154808829861}
+  - {fileID: 4948242153488973718}
+  - {fileID: 4518707766370914995}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 382, y: 458}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4948242154612453646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154612453635}
+  m_CullTransparentMesh: 1
+--- !u!114 &4948242154612453633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154612453635}
+  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: 507b62acbf0032142a50bb994ee8805f, 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!114 &4948242154612453647
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154612453635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 0
+  m_MinHeight: 0
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &4948242154612453644
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154612453635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 21300000, guid: 2ee846e59d3b47f46b2b2dc7a0c49d4c, type: 3}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4948242154612453633}
+  toggleTransition: 1
+  graphic: {fileID: 4948242153928383525}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 1
+--- !u!114 &-7201554112406576405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154612453635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e8b72074fc60764b8554d7067527809, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  eventId: 0
+  eventName: {fileID: 4948242154808829858}
+  eventImage: {fileID: 4948242153488973719}
+  maskImage: {fileID: 7234877009697728443}
+  IsOpen: 1
+--- !u!1 &4948242154808829860
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4948242154808829861}
+  - component: {fileID: 4948242154808829859}
+  - component: {fileID: 4948242154808829858}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4948242154808829861
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154808829860}
+  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: []
+  m_Father: {fileID: 4948242154612453632}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -33.27974, y: -51.6}
+  m_SizeDelta: {x: 204.8405, y: 36.146698}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4948242154808829859
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154808829860}
+  m_CullTransparentMesh: 1
+--- !u!114 &4948242154808829858
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4948242154808829860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5B66\u6821"
+--- !u!1 &8069007510932288809
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4518707766370914995}
+  - component: {fileID: 281822503849376763}
+  - component: {fileID: 7234877009697728443}
+  m_Layer: 5
+  m_Name: mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4518707766370914995
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8069007510932288809}
+  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: []
+  m_Father: {fileID: 4948242154612453632}
+  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: 0.000039101, y: 0.000005722}
+  m_SizeDelta: {x: 382, y: 458}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &281822503849376763
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8069007510932288809}
+  m_CullTransparentMesh: 1
+--- !u!114 &7234877009697728443
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8069007510932288809}
+  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: 0.39215687, g: 0.39215687, b: 0.39215687, a: 0.7058824}
+  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: 0}
+  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

xiaofang/Assets/Prefabs/itemPrefabs/eventItem.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 72700d12db148394c82f1f612cd6c557
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/itemPrefabs/incidentToggle.prefab

@@ -12,9 +12,9 @@ GameObject:
   - component: {fileID: 4451807875245846794}
   - component: {fileID: 4451807875245846797}
   - component: {fileID: 4451807875245846796}
-  - component: {fileID: 4451807875245846795}
+  - component: {fileID: 1945369720914667263}
   m_Layer: 5
-  m_Name: EventToggle
+  m_Name: incidentToggle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -129,7 +129,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &4451807875245846795
+--- !u!114 &1945369720914667263
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,13 +138,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 4451807875245846798}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7e8b72074fc60764b8554d7067527809, type: 3}
+  m_Script: {fileID: 11500000, guid: 3e76f7e7095c6f54682ecff57e151c6d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  eventId: 103
+  incidentText: {fileID: 4451807875369626340}
-  eventName: {fileID: 4451807875369626340}
+  incidentID: 301
   maskImage: {fileID: 4451807876351416333}
-  isOpen: 0
+  isOpen: 1
 --- !u!1 &4451807875369626342
 GameObject:
   m_ObjectHideFlags: 0

xiaofang/Assets/Resources/JsonAsset/IncidentSite .json

@@ -1,12 +1,26 @@
 [
-    {
+  {
-        "ID": 2001,
+    "ID": "2001",
-        "Note": "厨房起火",
+    "Note": "厨房起火",
-        "Name": 2001,
+    "Name": "2001",
-        "Scene": 9003,
+    "Scene": "9003",
-        "Position": "36,1,2",
+    "Position": "36,1,2",
-        "Volume": -1,
+    "Volume": "-1",
-        "Difficulty": "1|2|6",
+    "Difficulty": "1|2|6",
-        "SpecialEvent": "-1,-1,-1,-1|1,50,10,20|1,50,20,20"
+    "SpecialEvent": "-1,-1,-1,-1|1,50,10,20|1,50,20,20",
-    }
+    "Role": "8000,8001,8002,8003,8004,8005,8006,8008,8009|8000,8001,8002,8003,8004,8005,8006,8008,8009|8000,8001,8002,8003,8004,8005,8006,8008,8009,8010",
+    "GeneralRole": "8000,8001,8002,8003,8004,8005,8006,8008,8009,8010"
+  },
+  {
+    "ID": "2002",
+    "Note": "学生宿舍起火",
+    "Name": "2002",
+    "Scene": "9002",
+    "Position": "0,0,0",
+    "Volume": "-1",
+    "Difficulty": "1|2|3",
+    "SpecialEvent": "-1,-1,-1,-1|1,50,10,20|1,50,20,20",
+    "Role": "8000,8001,8002,8003,8004,8005,8007,8011|8000,8001,8002,8003,8004,8005,8007,8011|8000,8001,8002,8003,8004,8005,8007,8011",
+    "GeneralRole": "8000,8001,8002,8003,8004,8005,8007,8010,8011"
+  }
 ]

xiaofang/Assets/Script/JSONReader/JSONReader.cs

@@ -121,6 +121,7 @@ public class JSONReader : MonoBehaviour
 
         return locationDictionary;
     }
+    
     public Dictionary<int, NPC> NPCParseJSON(string json)
     {
         NPC[] locationArray = JsonHelper.FromJson<NPC>(json);

xiaofang/Assets/Script/UI/EventInfo.cs

@@ -7,8 +7,10 @@ public class EventInfo : MonoBehaviour
 {
     public int eventId;
     public Text eventName;
+    public Image eventImage;
     public Image maskImage;
-    public bool isOpen=true;
+    public bool IsOpen=true;
+    
     void Start()
     {
         

xiaofang/Assets/Script/UI/IncidentInfo.cs

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class IncidentInfo : MonoBehaviour
+{
+    public Text incidentText;
+    public int incidentID;
+    public Image maskImage;
+    public bool isOpen = true;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

xiaofang/Assets/Script/UI/IncidentInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e76f7e7095c6f54682ecff57e151c6d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs

@@ -5,6 +5,7 @@ using TMPro;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
+using static Unity.VisualScripting.FlowStateWidget;
 
 public class SelectScenePanel : MonoBehaviour
 {
@@ -15,17 +16,23 @@ public class SelectScenePanel : MonoBehaviour
     public Transform schoolList;//学校预制体列表
     public GameObject eventPrefab;//事件按钮预制体
     public Transform eventList;//学校预制体列表
+    public GameObject incidentPrefab;//事件按钮预制体
+    public Transform incidentList;//学校预制体列表
     public ToggleGroup schoolGroup;//学校ToggleGroup
     public ToggleGroup sceneGroup;//场景ToggleGroup
     public ToggleGroup eventGroup;//事件ToggleGroup
+    public ToggleGroup incidentGroup;//事件场景ToggleGroup
     public GameObject scoolSelectBtn;//学校选择按钮
-    public GameObject schoolChoiceLable;//学校选择界面
+    public GameObject sceneLable;//场景选择
+    public GameObject schoolChoiceLable;//场景名选择界面
     public GameObject eventChoiceLable;//事件选择界面
+    public GameObject incidentLable;//事件场景界面
     public Button randomEventBtn;//随机事件按钮
     [Header("请选择演练的场景")] public Text text20008;
     public Text title;//界面标题
     public List<SchoolInfo> schoolInfoList = new List<SchoolInfo>();//学校信息
     public List<EventInfo> eventInfoList = new List<EventInfo>();//事件信息
+    public List<IncidentInfo> incidentInfos = new List<IncidentInfo>();//事件图标信息
     public List<SceneItem> sceneItemList = new List<SceneItem>();//场景信息
     public List<Toggle> difficultyList = new List<Toggle>();//游戏难度
     public Button continueBtn;
@@ -50,13 +57,14 @@ public class SelectScenePanel : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        
+        sceneLable.gameObject.SetActive(true);
         schoolChoiceLable.gameObject.SetActive(true);
         eventChoiceLable.gameObject.SetActive(false);
+        incidentLable.gameObject.SetActive(false);
         InstantiateScenePrefab();
         InstantiateSchoolPrefab();
         InstantiateIncidentPrefab(2001);
-        SetEventToggleOpenorClose(eventInfoList);
+        SetEventToggleOpenorClose(incidentInfos);
         continueBtn.onClick.AddListener(OnClickContinueBtn);
         SetFirstChoise(scenetoggleList);
         SetToggleOpenorClose(sceneItemList);//未购买无法选择
@@ -72,9 +80,9 @@ public class SelectScenePanel : MonoBehaviour
     //动态加载场景选择预制体
     public void InstantiateScenePrefab()
     {
-        int index = 0;
         foreach (var sceneData in jsonReader.sceneDictionary)
         {
+            Debug.Log("iiiiiiiiiiiiiii");
             GameObject slot = GameObject.Instantiate<GameObject>(scenePrefab, sceneList);
             SceneItem item = slot.GetComponent<SceneItem>();
             switch (sceneData.Value.Type)
@@ -116,7 +124,6 @@ public class SelectScenePanel : MonoBehaviour
         }
     }
 
-
     //动态加载学校选择预制体(这里面的东西需要判断场景的Id来加载对应的场景)
     public void InstantiateSchoolPrefab()
     {
@@ -131,38 +138,65 @@ public class SelectScenePanel : MonoBehaviour
             if (toggle != null)
             {
                 toggle.group = schoolGroup;
-                schooltoggleList[i] = toggle;
+                schooltoggleList.Add(toggle);
                 schoolInfoList.Add(item);
             }
         }
     }
 
+    //动态加载事件图标预制体(当选完了场景类型之后再调用)
+    public void InstantiateEventPrefab()
+    {
+        foreach (var sceneData in jsonReader.eventDictionary)
+        {
+            GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
+            EventInfo item = slot.GetComponent<EventInfo>();
+            item.eventId = sceneData.Value.ID;
+            item.eventName.text = sceneData.Value.Note;
+            if (item.IsOpen)
+            {
+                item.maskImage.gameObject.SetActive(false);
+            }
+            else
+            {
+                item.maskImage.gameObject.SetActive(true);
+            }
+            Toggle toggle = slot.GetComponent<Toggle>();
+            if (toggle != null)
+            {
+                toggle.group = eventGroup;
+                evnetsceneList.Add(toggle);  // 使用 Add() 方法添加 Toggle 元素
+                eventInfoList.Add(item);
+            }
+        }
+    }
+
     //动态加载事件选择预制体
     public void InstantiateIncidentPrefab(int eventId)
     {
-        foreach (var eventData in jsonReader.incidentSiteDictionary)
+        //foreach (var eventData in jsonReader.incidentSiteDictionary)
-        {
+        //{
-            if(eventData.Key==eventId)
+        //    if(eventData.Key==eventId)
-            {
+        //    {
-                GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
+        //        GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
-                EventInfo item = slot.GetComponent<EventInfo>();
+        //        IncidentInfo item = slot.GetComponent<IncidentInfo>();
-                item.eventName.text = eventData.Value.Note;
+        //        item.incidentText.text = eventData.Value.Note;
-                item.eventId = eventData.Value.ID;
+        //        item.incidentID = eventData.Value.ID;
-                Toggle toggle = slot.GetComponent<Toggle>();
+        //        Toggle toggle = slot.GetComponent<Toggle>();
 
-                if (toggle != null)
+        //        if (toggle != null)
-                {
+        //        {
-                // 将 Toggle 添加到 ToggleGroup 中
+        //        // 将 Toggle 添加到 ToggleGroup 中
-                toggle.group = eventGroup;
+        //        toggle.group = eventGroup;
-                toggle.isOn = false;
+        //        toggle.isOn = false;
-                eventInfoList.Add(item);
+        //        incidentInfos.Add(item);
-                }
+        //        }
-            }
+        //    }
-            else
+        //    else
-            {
+        //    {
-                break;
+        //        break;
-            }
+        //    }
-        }
+        //}
     }
 
     //点击继续按钮后更换场景图片及名称
@@ -185,10 +219,10 @@ public class SelectScenePanel : MonoBehaviour
                     if (jsonReader.eventDictionary.TryGetValue(incidentId, out var eventData))
                     {
                         // 你可以继续处理相关逻辑，比如创建 UI 或设置属性等
-                        GameObject slot = GameObject.Instantiate<GameObject>(scenePrefab, sceneList);
+                        GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
-                        SceneItem item = slot.GetComponent<SceneItem>();
+                        EventInfo item = slot.GetComponent<EventInfo>();
-                        item.sceneId = eventData.ID;
+                        item.eventId = eventData.ID;
-                        item.sceneName.text = eventData.Note;
+                        item.eventName.text = eventData.Note;
 
                         if (item.IsOpen)
                         {
@@ -203,8 +237,7 @@ public class SelectScenePanel : MonoBehaviour
                         if (toggle != null)
                         {
                             toggle.group = sceneGroup;
-                            //toggleList.Add(toggle);
+                            eventInfoList.Add(item);
-                            sceneItemList.Add(item);
                         }
                     }
                     else
@@ -247,26 +280,23 @@ public class SelectScenePanel : MonoBehaviour
     //场景选择
     public void SelectSceneBtn()
     {
-        if(isSure)
+        bool sceneSelected = false;  // 检查是否有场景被选择
-        {}
+        foreach (SceneItem item in sceneItemList)
-            bool sceneSelected = false;  // 检查是否有场景被选择
+        {
-            foreach (SceneItem item in sceneItemList)
+            // 检查当前的 Toggle 是否被选中
+            if (item.gameObject.transform.GetComponent<Toggle>().isOn)
             {
-                // 检查当前的 Toggle 是否被选中
+                // 设置场景名称
-                if (item.gameObject.transform.GetComponent<Toggle>().isOn)
+                this.sceneName = item.sceneName.text; // 获取 Text 组件的文本
-                {
+                this.scnenId = item.sceneId;
-                    // 设置场景名称
-                    this.sceneName = item.sceneName.text; // 获取 Text 组件的文本
-                    this.scnenId = item.sceneId;
-                    createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.sceneId.ToString();
-                    sceneSelected = true;
-                    break;  // 找到选中的场景后退出循环
-                }
-            }
-            Debug.Log("---------------" + this.scnenId);
-            Debug.Log("###############3:" + this.schoolId);
 
-        //IsClick();
+                createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.sceneId.ToString();
+                sceneSelected = true;
+                break;  // 找到选中的场景后退出循环
+            }
+        }
+        Debug.Log("---------------" + this.scnenId);
+        Debug.Log("###############3:" + this.schoolId);
     }
 
     //事件选择
@@ -324,7 +354,7 @@ public class SelectScenePanel : MonoBehaviour
             }
             Debug.Log("=++++++++++++++++++++++=" + eventToggleList[randomIndex].GetComponent<EventInfo>());
             // 选中随机事件
-            if (eventToggleList[randomIndex] != null && eventToggleList[randomIndex].GetComponent<EventInfo>().isOpen != false)
+            if (eventToggleList[randomIndex] != null && eventToggleList[randomIndex].GetComponent<IncidentInfo>().isOpen != false)
             {
                 eventToggleList[randomIndex].isOn = true;
                 this.eventName = eventInfoList[randomIndex].eventName.text; // 设置随机选择的事件名称
@@ -360,19 +390,16 @@ public class SelectScenePanel : MonoBehaviour
     //继续按钮，点击后上传数据
     public void OnClickContinueBtn()
     {
-        // 调用 IsClick 检查是否选中学校和场景
-        foreach (Transform child in sceneList)
-        {
-            child.gameObject.SetActive(false);
-        }
         SelectSchoolBtn();
         SelectSceneBtn();
         InstantiateEventPrefab(this.scnenId);
         SetFirstChoise(scenetoggleList);
         if (continueBtn.interactable)
         {
+            sceneLable.gameObject.SetActive(false);
             schoolChoiceLable.gameObject.SetActive(false);
             eventChoiceLable.gameObject.SetActive(true);
+            incidentLable.gameObject.SetActive(true);
         }
         else
         {
@@ -399,8 +426,10 @@ public class SelectScenePanel : MonoBehaviour
             {
                 child.gameObject.SetActive(false);
             }
-            eventChoiceLable.gameObject.SetActive(false);
+            sceneLable.gameObject.SetActive(true);
             schoolChoiceLable.gameObject.SetActive(true);
+            eventChoiceLable.gameObject.SetActive(false);
+            incidentLable.gameObject.SetActive(false);
             InstantiateScenePrefab();
         }
         else
@@ -464,8 +493,6 @@ public class SelectScenePanel : MonoBehaviour
                 item.GetComponent<Toggle>().interactable = true;
             }
         }
-
-
     }
 
     //学校Toggle
@@ -491,9 +518,9 @@ public class SelectScenePanel : MonoBehaviour
     }
 
     //事件Toggle
-    public void SetEventToggleOpenorClose(List<EventInfo> sceneItems)
+    public void SetEventToggleOpenorClose(List<IncidentInfo> sceneItems)
     {
-        foreach (EventInfo item in sceneItems)
+        foreach (IncidentInfo item in sceneItems)
         {
             if (item.isOpen == false)
             {