diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/SchoolToggle.prefab b/xiaofang/Assets/Prefabs/itemPrefabs/SchoolToggle.prefab
index 587619d5..e2d60d86 100644
--- a/xiaofang/Assets/Prefabs/itemPrefabs/SchoolToggle.prefab
+++ b/xiaofang/Assets/Prefabs/itemPrefabs/SchoolToggle.prefab
@@ -143,6 +143,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   schoolId: 0
   schoolName: {fileID: 8240735975125479954}
+  maskImage: {fileID: 0}
+  isOpen: 0
 --- !u!1 &8240735974858230823
 GameObject:
   m_ObjectHideFlags: 0
@@ -312,7 +314,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8240735975124526756
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json b/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json
index f5d2eeef..49c7afc9 100644
--- a/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json	
+++ b/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json	
@@ -1,8 +1,8 @@
 [
   {
-    "ID": 2001,
+    "ID": "2001",
     "Note": "厨房起火",
-    "Name": 2001,
+    "Name": "2001",
     "Scene": "9003",
     "Position": "36,1,2",
     "Volume": "-1",
@@ -12,9 +12,9 @@
     "GeneralRole": "8000,8001,8002,8003,8004,8005,8006,8008,8009,8010"
   },
   {
-    "ID": 2002,
+    "ID": "2002",
     "Note": "学生宿舍起火",
-    "Name": 2002,
+    "Name": "2002",
     "Scene": "9002",
     "Position": "0,0,0",
     "Volume": "-1",
@@ -22,5 +22,29 @@
     "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"
+  },
+  {
+    "ID": "2003",
+    "Note": "test1",
+    "Name": "2003",
+    "Scene": "9003",
+    "Position": "1,1,1",
+    "Volume": "-1",
+    "Difficulty": "2|3",
+    "SpecialEvent": "-1,-1,-1,-1|1,50,10,20",
+    "Role": "8001,8002,8003,8004,8005|8001,8002,8003,8004,8005",
+    "GeneralRole": "8010"
+  },
+  {
+    "ID": "2004",
+    "Note": "test2",
+    "Name": "2004",
+    "Scene": "9003",
+    "Position": "2,2,2",
+    "Volume": "-1",
+    "Difficulty": "1|5|6",
+    "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": "8010"
   }
 ]
\ No newline at end of file
diff --git a/xiaofang/Assets/Resources/JsonAsset/PlayScript.json b/xiaofang/Assets/Resources/JsonAsset/PlayScript.json
index 96d9f9f2..20cff4a6 100644
--- a/xiaofang/Assets/Resources/JsonAsset/PlayScript.json
+++ b/xiaofang/Assets/Resources/JsonAsset/PlayScript.json
@@ -4,13 +4,13 @@
     "Note": "火灾",
     "Name": "5001",
     "Role": "8000|8001|8002|8003|8004|8005|8006|8008|8009|8010",
-    "DisasterLocation": "2001"
+    "DisasterLocation": "2001|2002|2003"
   },
   {
     "ID": "5002",
     "Note": "塌方",
     "Name": "5002",
     "Role": "8000|8001|8002|8003|8004|8005|8006|8008|8009|8010",
-    "DisasterLocation": "2004|2002"
+    "DisasterLocation": "2004"
   }
 ]
\ No newline at end of file
diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity
index 52d8fa45..5e6e8a12 100644
--- a/xiaofang/Assets/Scenes/Schedule_03.unity
+++ b/xiaofang/Assets/Scenes/Schedule_03.unity
@@ -2133,7 +2133,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &618256459
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8210,6 +8210,7 @@ MonoBehaviour:
   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}
 --- !u!4 &1417128758
 Transform:
   m_ObjectHideFlags: 0
@@ -14630,9 +14631,9 @@ RectTransform:
   m_Father: {fileID: 7468736063934366934}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 334.1322, y: -55}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 187, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064122132329
@@ -14913,9 +14914,9 @@ RectTransform:
   m_Father: {fileID: 7468736063934366934}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 753.3966, y: -55}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 187, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064198941274
@@ -15673,7 +15674,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 3.3229}
-  m_SizeDelta: {x: 1834, y: 1070}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064579811972
 GameObject:
@@ -15695,7 +15696,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &7468736064579811982
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16153,9 +16154,9 @@ RectTransform:
   m_Father: {fileID: 7468736063934366934}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 543.7644, y: -55}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 187, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064659112359
@@ -16359,9 +16360,9 @@ RectTransform:
   m_Father: {fileID: 7468736064579811971}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 917, y: -53.335}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1834, y: 106.67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064728012045
@@ -16521,9 +16522,9 @@ RectTransform:
   m_Father: {fileID: 7468736063934366934}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 124.5, y: -55}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 187, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064820222392
@@ -16934,9 +16935,9 @@ RectTransform:
   m_Father: {fileID: 7468736064579811971}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 917, y: -588.33496}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1834, y: 498.685}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736064937661071
diff --git a/xiaofang/Assets/Script/JSONReader/JSONReader.cs b/xiaofang/Assets/Script/JSONReader/JSONReader.cs
index 8b23ca0d..498ac08e 100644
--- a/xiaofang/Assets/Script/JSONReader/JSONReader.cs
+++ b/xiaofang/Assets/Script/JSONReader/JSONReader.cs
@@ -42,9 +42,9 @@ public class JSONReader : MonoBehaviour
 
 
         GetLanguageByID(20008);
-        foreach (var npc in sceneDictionary)
+        foreach (var npc in npcDictionary)
         {
-           // Debug.Log(npc.Value.ID);
+            //Debug.Log(npc.Value.ID);
            //Debug.Log(npc.Value.Name);
         }
         GetNpcDataByID(8001);
@@ -271,6 +271,16 @@ public class JSONReader : MonoBehaviour
         else return null;
     }
 
+    public NPCData GetRoleDateById(int id)
+    {
+        NPCData info = null;
+        if (npcDictionary.TryGetValue(id, out info))
+        {
+            return info;
+        }
+        else return null;
+    }
+
     //����UI�ı��ķ���
     public void SetUIText(Text text, int id)
     {
@@ -356,7 +366,7 @@ public class MatialData
 public class SceneData
 {
     public int ID;
-    public int Name;
+    public string Name;
     public int Type;
     public string IncidentType;
     public string ObjList;
@@ -374,6 +384,8 @@ public class IncidentSite
     public int Volume;
     public string Difficulty;
     public string SpecialEvent;
+    public string Role;
+    public string GeneralRole;
 }
 
 [System.Serializable]
diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index 84730b00..a2d83040 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -4,6 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.Events;
@@ -88,16 +89,11 @@ public class Panel : MonoBehaviour
 
     // Start is called before the first frame update
     void Start()
-        {
-            selectedInfo = new SelectedInfo();
-            DynamicLoadingPeople();
-            DynamicLoadingDuty();
-            DynamicLoadingScene();
-        for (int i = 1; i < panelToggle.Length; i++)
-        {
-            panelToggle[i].interactable = false;
-            panelToggle[i].gameObject.transform.GetComponent<Image>().sprite = toggleImage[0];
-        }
+    {
+        selectedInfo = new SelectedInfo();
+        DynamicLoadingPeople();
+        DynamicLoadingScene();
+        InstantiateToggle();
     }
 
     // Update is called once per frame
@@ -124,71 +120,84 @@ public class Panel : MonoBehaviour
         }
 
     //��̬����ְ��
-    public void DynamicLoadingDuty()
+    public void DynamicLoadingDuty(int id)
     {
-        foreach (var npcData in jsonReader1.npcDictionary)
+        if (selectScenePanel.difficultyToRoles.ContainsKey(id))
         {
-            string[] nameSections = npcData.Value.Name.Split('|');
-            foreach (var section in nameSections)
-            {
-                string[] sectionParts = section.Split(',');
+            List<string> rolesForSelectedDifficulty = selectScenePanel.difficultyToRoles[id];
 
-                //�ж��¼�Ȼ��ȷ������Щְ��
-                if (int.Parse(sectionParts[0]) == 2001)
+            // ������ɫ������ش���
+            foreach (var role in rolesForSelectedDifficulty)
+            {
+                int roleId = int.Parse(role);
+                NPCData npcData = jsonReader1.GetRoleDateById(roleId);
+                if (jsonReader1.npcDictionary.ContainsKey(roleId))
                 {
-                    int key = int.Parse(sectionParts[1]);
-                    if (jsonReader1.npcDictionary.ContainsKey(key))
+                    var npcInfo = jsonReader1.npcDictionary[roleId];
+                    // ����DutyItemʵ��
+                    GameObject item = GameObject.Instantiate(dutyPrefab, dutyCount);
+                    DutyItem dutyItem = item.GetComponent<DutyItem>();
+                    Button dutuybutton = item.transform.Find("TextBtn").GetComponent<Button>();
+                    dutuybutton.onClick.AddListener(() =>
                     {
-                        var npcInfo = jsonReader1.npcDictionary[key];
-                        // ����DutyItemʵ��
-                        GameObject item = GameObject.Instantiate(dutyPrefab, dutyCount);
-                        DutyItem dutyItem = item.GetComponent<DutyItem>();
-                        Button dutuybutton = item.transform.Find("TextBtn").GetComponent<Button>();
-                        dutuybutton.onClick.AddListener(() => OnDutyItemClicked(item, Color.red, selectedDuty));
-                        dutyItem.dutyNameText.text = npcData.Value.Note;
-                        dutyItem.leader = npcData.Value.GroupLeader;
-                        dutyItem.dutyId = npcData.Value.ID;
-                        peopleList.Add(item);
-                    }
+                        OnDutyItemClicked(item, Color.red, selectedDuty);
+                        if(dutyItem.dutyNameText.text=="������")
+                        {
+                            peopleList.Clear();
+                            foreach (Transform child in sceneCount)
+                            {
+                                Destroy(child.gameObject);
+                            }
+                            Debug.Log("����ָ��λ��");
+                        }
+                        else
+                        {
+                            SetScene(dutyItem.dutyId);
+                        }
+                    });
+                    dutyItem.dutyNameText.text = npcData.Note;
+                    dutyItem.leader = npcData.GroupLeader;
+                    dutyItem.dutyId = npcData.ID;
+                    peopleList.Add(item);
                 }
             }
-
         }
     }
 
     //��̬���س���
     public void DynamicLoadingScene()
+    {
+        foreach (var npcData in jsonReader1.locationDictionary)
         {
-            foreach (var npcData in jsonReader1.locationDictionary)
+            // ������ɫ�����ֶ�
+            string roleLimit = npcData.Value.RoleLimit;
+            int sceneLimit = npcData.Value.Scene;
+            if (!string.IsNullOrEmpty(roleLimit))
             {
-                // ������ɫ�����ֶ�
-                string roleLimit = npcData.Value.RoleLimit;
-
-                if (!string.IsNullOrEmpty(roleLimit))
+                // �Ȱ���|���ָ�
+                string[] roleLimitSections = roleLimit.Split('|');
+                // ����ÿ�����֣�����|���ָ���õ������飩
+                bool shouldInstantiate = true;  // �����ж��Ƿ���Ҫʵ����
+                foreach (string section in roleLimitSections)
                 {
-                    // �Ȱ���|���ָ�
-                    string[] roleLimitSections = roleLimit.Split('|');
-                    // ����ÿ�����֣�����|���ָ���õ������飩
-                    bool shouldInstantiate = true;  // �����ж��Ƿ���Ҫʵ����
-                    foreach (string section in roleLimitSections)
+                    string[] roleLimits = section.Split(',');
+                    // �жϵ�ǰ�����Ƿ���� "-1" �������Ƿ�����ʵ����
+                    if (section.Contains("-1"))
                     {
-                        string[] roleLimits = section.Split(',');
-                        // �жϵ�ǰ�����Ƿ���� "-1" �������Ƿ�����ʵ����
-                        if (section.Contains("-1"))
+                        if (roleLimits[0] == "-1")
                         {
-                            if (roleLimits[0] == "-1")
-                            {
-                                shouldInstantiate = false;  // ��ʵ������NPC
-                                break;  // ����ѭ����ֱ�Ӵ�����һ��NPC
-                            }
+                            shouldInstantiate = false;  // ��ʵ������NPC
+                            break;  // ����ѭ����ֱ�Ӵ�����һ��NPC
                         }
-                        else
+                    }
+                    else
+                    {
+                        if(selectScenePanel.scnenId== sceneLimit)
                         {
                             GameObject item = GameObject.Instantiate<GameObject>(scenePrefab, sceneCount);
                             SceneItem sceneItem = item.GetComponent<SceneItem>();
                             Button scenebutton = item.transform.Find("TextBtn").GetComponent<Button>();
                             scenebutton.onClick.AddListener(() => OnSceneItemClicked(item, Color.green, selectedScene));
-
                             // ����limitNum
                             sceneItem.dutyId = int.Parse(roleLimits[1]);
                             sceneItem.limitNum = int.Parse(roleLimits[2]);
@@ -197,14 +206,15 @@ public class Panel : MonoBehaviour
                             peopleList.Add(item);
                         }
                     }
-                    // ���������ʵ����������������ǰNPC��ʵ����
-                    if (!shouldInstantiate)
-                    {
-                        continue;
-                    }
+                }
+                // ���������ʵ����������������ǰNPC��ʵ����
+                if (!shouldInstantiate)
+                {
+                    continue;
                 }
             }
         }
+    }
     //=============================================================��ť�͵���¼�==================================================
         //������Ա������ť
     public void ClickPersonnelManagement()
@@ -226,6 +236,57 @@ public class Panel : MonoBehaviour
                 ManagerPanel.gameObject.SetActive(true);
             }
         }
+    //����ѡ���ְ����س���Ӧ����
+    public void SetScene(int id)
+    {
+        peopleList.Clear();
+        foreach(Transform child in sceneCount)
+        {
+            Destroy(child.gameObject);
+        }
+        // �������е� NPC ����
+        foreach (var npcData in jsonReader1.locationDictionary)
+        {
+            // �ж��Ƿ����ڵ�ǰѡ��ij���
+            if (npcData.Value.Scene == selectScenePanel.scnenId)
+            {
+                // ����|���ָ���ͬ�Ľ�ɫ���Ʋ���
+                string[] roleLimitSections = npcData.Value.RoleLimit.Split('|');
+                bool shouldInstantiate = true;
+                // ����ÿ����ɫ���Ʋ���
+                foreach (var section in roleLimitSections)
+                {
+                    // ����,���ָ����¹�λ��ID��ְҵID�����Ҫ������
+                    string[] roleLimits = section.Split(',');
+                    if (section.Contains("-1"))
+                    {
+                        if (roleLimits[0] == "-1")
+                        {
+                            shouldInstantiate = false;  // ��ʵ������NPC
+                            break;  // ����ѭ����ֱ�Ӵ�����һ��NPC
+                        }
+                    }
+                    else
+                    {
+                        int accidentLocationId = int.Parse(roleLimits[0]); // �¹�λ��ID
+                        int roleId = int.Parse(roleLimits[1]); // ְҵID
+                        int minRequired = int.Parse(roleLimits[2]); // ���Ҫ������
+                        if (accidentLocationId == selectScenePanel.idcidentId && roleId == id)
+                        {
+                            GameObject item = GameObject.Instantiate<GameObject>(scenePrefab, sceneCount);
+                            SceneItem sceneItem = item.GetComponent<SceneItem>();
+                            Button scenebutton = item.transform.Find("TextBtn").GetComponent<Button>();
+                            scenebutton.onClick.AddListener(() => OnSceneItemClicked(item, Color.green, selectedScene));
+                            sceneItem.dutyId = accidentLocationId;
+                            sceneItem.limitNum = minRequired;
+                            sceneItem.sceneName.text = npcData.Value.Note;
+                            peopleList.Add(item);
+                        }
+                    } 
+                }
+            }
+        }
+    }
     //�������ȷ�ϰ�ť
     public void ClickSureBtn()
         {
@@ -374,7 +435,17 @@ public class Panel : MonoBehaviour
             panelToggle[4].interactable = selectScenePanel.isSure;  // ���õ�����Toggle
         }
     }
+    //���������ʱ��Toggle��״̬
+    public void InstantiateToggle()
+    {
+        for (int i = 1; i < panelToggle.Length; i++)
+        {
+            panelToggle[i].interactable = false;
+            panelToggle[i].gameObject.transform.GetComponent<Image>().sprite = toggleImage[0];
+        }
+    }
 
+    //�ж�ȷ�ϰ�ť�Ƿ���Ե��
     private void UpdateConfirmButtonState()
         {
             // �����Ա��ְ��ͳ�������ѡ��������ȷ�ϰ�ť���������
diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
index 3df9768d..3d288290 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
@@ -5,6 +5,7 @@ using System.Xml.Serialization;
 using UnityEngine;
 using UnityEngine.UI;
 using static System.Collections.Specialized.BitVector32;
+using static UnityEditor.Progress;
 
 public class EvacuationPanel : MonoBehaviour
 {
@@ -65,6 +66,11 @@ public class EvacuationPanel : MonoBehaviour
         nPC.roleId = roleid;
         createTemplateInfo.Instance.auth_CreateTemplate.npcList = new List<NpcList>();
         createTemplateInfo.Instance.auth_CreateTemplate.npcList.Add(nPC);
+        //foreach(NpcList item in createTemplateInfo.Instance.auth_CreateTemplate.npcList)
+        //{
+        //    Debug.Log("npcType>>>>>>>>>>>>>>>>>" + item.userId);
+        //    Debug.Log("roleid>>>>>>>>>>>>>>>>>" + item.roleId);
+        //}
     }
 
     public void SetNpcType()
diff --git a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
index 01dd2221..00c49ac7 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
@@ -56,7 +56,9 @@ public class SelectScenePanel : MonoBehaviour
     public string idcidentName{ get; set; }
     public string difficulty { get; set; }
     public string isBuy { get; set; }
+    public int difficultyId { get; set; }
     public bool isSure { get; set; } = false;//�ж��Ƿ������ύ��ť
+    public Dictionary<int, List<string>> difficultyToRoles = new Dictionary<int, List<string>>();
     public JSONReader jsonReader;
     // Start is called before the first frame update
     void Start()
@@ -66,7 +68,7 @@ public class SelectScenePanel : MonoBehaviour
         eventChoiceLable.gameObject.SetActive(false);
         incidentLable.gameObject.SetActive(false);
         InstantiateScenePrefab();
-        InstantiateSchoolPrefab();
+        //InstantiateSchoolPrefab();
         SetEventToggleOpenorClose(incidentInfos);
         continueBtn.onClick.AddListener(OnClickContinueBtn);
         SetFirstChoise(scenetoggleList);
@@ -123,25 +125,59 @@ public class SelectScenePanel : MonoBehaviour
                 toggle.group = sceneGroup;
                 scenetoggleList.Add(toggle);  // ʹ�� Add() �������� Toggle Ԫ��
                 sceneItemList.Add(item);
+                
             }
+            toggle.onValueChanged.AddListener((isSelected) =>
+            {
+                if (isSelected) // ֻ�е�Toggle��ѡ��ʱ���ŵ���SelectEventBtn
+                {
+                    // ����¼��б�
+                    schoolInfoList.Clear();
+                    foreach (Transform child in schoolList)
+                    {
+                        Destroy(child.gameObject);
+                    }
+                    this.scnenId = item.sceneId; // ��ȡ Text ������ı�
+                    this.sceneName = item.sceneName.text;
+                    InstantiateSchoolPrefab(scnenId);
+                }
+            });
         }
     }
 
     //��̬����ѧУѡ��Ԥ����(������Ķ�����Ҫ�жϳ�����Id�����ض�Ӧ�ij���)
-    public void InstantiateSchoolPrefab()
+    public void InstantiateSchoolPrefab(int id)
     {
-        for (int i = 0; i < 6; i++)
+        foreach (var sceneDate in jsonReader.sceneDictionary)
         {
-            GameObject slot = GameObject.Instantiate<GameObject>(schoolPrefab, schoolList);
-            SchoolInfo item = slot.GetComponent<SchoolInfo>();
-            item.schoolName.text = "��ɽ��ѧ";
-            item.schoolId = i;
-            Toggle toggle = slot.GetComponent<Toggle>();
-            if (toggle != null)
+            if (sceneDate.Key == id)
             {
-                toggle.group = schoolGroup;
-                schooltoggleList.Add(toggle);
-                schoolInfoList.Add(item);
+                GameObject slot = GameObject.Instantiate<GameObject>(schoolPrefab, schoolList);
+                SchoolInfo item = slot.GetComponent<SchoolInfo>();
+                item.schoolName.text = sceneDate.Value.Name;
+                item.schoolId = sceneDate.Value.ID;
+                Toggle toggle = slot.GetComponent<Toggle>();
+
+                if (toggle != null)
+                {
+                    // �� Toggle ���ӵ� ToggleGroup ��
+                    toggle.group = incidentGroup;
+                    toggle.isOn = false;
+                    schooltoggleList.Add(toggle);
+                    schoolInfoList.Add(item);
+                }
+                else
+                {
+                    break;
+                }
+                toggle.onValueChanged.AddListener((isSelected) =>
+                {
+                    if (isSelected) // ֻ�е�Toggle��ѡ��ʱ���ŵ���SelectEventBtn
+                    {
+                        this.schoolId = item.schoolId; // ��ȡ Text ������ı�
+                        this.schoolName = item.schoolName.text;
+                    }
+                });
             }
         }
     }
@@ -153,13 +189,13 @@ public class SelectScenePanel : MonoBehaviour
         {
             if (eventData.Key == eventId)
             {
-                //Debug.Log("<<<<<<<<<<<<<<<<<eventId" + eventData.Key);
                 GameObject slot = GameObject.Instantiate<GameObject>(incidentPrefab, incidentList);
                 IncidentInfo item = slot.GetComponent<IncidentInfo>();
                 item.incidentText.text = eventData.Value.Note;
                 item.incidentID = eventData.Value.ID;
+                this.idcidentId = item.incidentID;
+                this.idcidentName = item.incidentText.text;
                 Toggle toggle = slot.GetComponent<Toggle>();
-
                 if (toggle != null)
                 {
                     // �� Toggle ���ӵ� ToggleGroup ��
@@ -167,10 +203,6 @@ public class SelectScenePanel : MonoBehaviour
                     toggle.isOn = false;
                     eventToggleList.Add(toggle);
                     incidentInfos.Add(item);
-                    if (incidentInfos.Count > 1)
-                    {
-                        //�����ť����
-                    }
                 }
                 else
                 {
@@ -178,30 +210,43 @@ public class SelectScenePanel : MonoBehaviour
                 }
                 toggle.onValueChanged.AddListener((isSelected) =>
                 {
-                    
                     if (isSelected)
                     {
                         this.idcidentName = item.incidentText.text;
                         this.idcidentId = item.incidentID;
                         datePanel.placeId = item.incidentID;
+
                         string[] difficulty = eventData.Value.Difficulty.Split('|');
+                        string[] roleGroups = eventData.Value.Role.Split('|');  // �ָ�Role�ֶΣ��õ������ɫ��
 
                         // ȷ��difficultyList��difficulty�ij���ƥ��
                         for (int i = 0; i < difficultyList.Count && i < difficulty.Length; i++)
                         {
                             Toggle item = difficultyList[i];  // ��ȡ��Ӧ��Toggle
                             DifficultyInfo difficultyInfo = item.gameObject.GetComponent<DifficultyInfo>();
-
                             if (difficultyInfo == null)
                             {
                                 difficultyInfo = item.gameObject.AddComponent<DifficultyInfo>();
                             }
-
                             // ��ÿ��Toggle���ò�ͬ��difficultyֵ
                             difficultyInfo.difficulty = int.Parse(difficulty[i]);
 
-                            // ��ӡ�����õ��Ѷ�ֵ����������
-                            Debug.Log($"Toggle {i} - Difficulty: {difficultyInfo.difficulty}");
+                            // ���ѶȺͶ�Ӧ�Ľ�ɫ�����ֵ�
+                            if (difficultyInfo.difficulty == int.Parse(difficulty[i]))
+                            {
+                                // ��ȡ�뵱ǰ�Ѷ���صĽ�ɫ�飨����������
+                                string[] correspondingRoles = roleGroups[i].Split(',');
+                                // ��ӡ���ߴ�����ɫ
+                                List<string> rolesList = new List<string>(correspondingRoles);  // ת��ΪList
+                                if (!difficultyToRoles.ContainsKey(difficultyInfo.difficulty))
+                                {
+                                    difficultyToRoles.Add(difficultyInfo.difficulty, rolesList);
+                                }
+                                else
+                                {
+                                    difficultyToRoles[difficultyInfo.difficulty] = rolesList;  // ����Ѵ��ڣ����½�ɫ�б�
+                                }
+                            }
                         }
                     }
                 });
@@ -212,6 +257,11 @@ public class SelectScenePanel : MonoBehaviour
     //���������ť���������ͼƬ������
     public void InstantiateEventPrefab(int id)
     {
+        incidentInfos.Clear();
+        foreach (Transform child in incidentList)
+        {
+            Destroy(child.gameObject);
+        }
         text20008.text = sceneName;
         // ͨ�� id ��ȡ��Ӧ�� sceneData
         if (jsonReader.sceneDictionary.TryGetValue(id, out var sceneData))
@@ -228,8 +278,6 @@ public class SelectScenePanel : MonoBehaviour
                 {
                     // ���� incidentId ��ȡ��Ӧ���¼�����
                     EventData eventData=jsonReader.GetEvenById(incidentId);
-                    Debug.Log("eventData.ID:" + eventData.ID);
-                    Debug.Log("eventData.DisasterLocation:" + eventData.DisasterLocation);
                     string[] incidentIds2 = eventData.DisasterLocation.Split('|');
                     GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
                     EventInfo item = slot.GetComponent<EventInfo>();
@@ -285,46 +333,6 @@ public class SelectScenePanel : MonoBehaviour
         }
     }
 
-    //ѧУѡ��
-    public void SelectSchoolBtn()
-    {
-        if (isSure)
-        {
-            SchoolInfo gameObject = GetComponentInChildren<SchoolInfo>();
-            foreach (SchoolInfo item in schoolInfoList)
-            {
-                if (item.gameObject.transform.GetComponent<Toggle>().isOn)
-                {
-                    this.schoolId = item.schoolId;
-                    this.schoolName = item.schoolName.text;
-                    title.text = item.schoolName.text;
-                }
-            }
-            Debug.Log("###############1:" + this.schoolId);
-            Debug.Log("###############2:" + this.schoolName);
-        }
-    }
-
-    //����ѡ��
-    public void SelectSceneBtn()
-    {
-        bool sceneSelected = false;  // ����Ƿ��г�����ѡ��
-        foreach (SceneItem item in sceneItemList)
-        {
-            // ��鵱ǰ�� Toggle �Ƿ�ѡ��
-            if (item.gameObject.transform.GetComponent<Toggle>().isOn)
-            {
-                // ��������
-                this.sceneName = item.sceneName.text; // ��ȡ Text ������ı�
-                this.scnenId = item.sceneId;
-                Debug.Log("------------this.scnenId:" + this.scnenId);
-                createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.sceneId.ToString();
-                sceneSelected = true;
-                break;  // �ҵ�ѡ�еij������˳�ѭ��
-            }
-        }
-    }
-
     //�¼����Ѷ�ѡ��
     public void SelectEvent()
     {
@@ -337,8 +345,6 @@ public class SelectScenePanel : MonoBehaviour
                 this.eventName = item.eventName.text;
             }
         }
-        Debug.Log("%%%%%%%%%%%%%1:" + this.eventId);
-        Debug.Log("%%%%%%%%%%%%%2:" + this.eventName);
     }
 
     //����¼�
@@ -386,6 +392,8 @@ public class SelectScenePanel : MonoBehaviour
         {
             if (item.isOn)
             {
+                DifficultyInfo difficultyInfo = item.GetComponent<DifficultyInfo>();
+                this.difficultyId = difficultyInfo.difficulty;
                 this.difficulty = item.transform.parent.GetComponentInChildren<Text>().text;
                 auth_CreateTemplate.mode = this.difficulty;//���ṹ�塰�Ѷȡ���ֵ
             }
@@ -395,8 +403,8 @@ public class SelectScenePanel : MonoBehaviour
     //������ť��������ϴ�����
     public void OnClickContinueBtn()
     {
-        SelectSchoolBtn();
-        SelectSceneBtn();
+        //SelectSchoolBtn();
+        //SelectSceneBtn();
         InstantiateEventPrefab(this.scnenId);
         SetFirstChoise(evnetsceneList);
         if (continueBtn.interactable)
@@ -415,12 +423,12 @@ public class SelectScenePanel : MonoBehaviour
     //�ύ��ť������ϴ����ݺ����ؽ���
     public void SubmitBtn()
     {
-        SelectEvent();
         SelsctDifficulty();
         SetDataPanelInfo();
         this.gameObject.SetActive(false);
         panel.gameObject.SetActive(true);
         DisableUIInteraction();
+        panel.DynamicLoadingDuty(this.difficultyId);
         isSure = true;
     }
 
@@ -456,24 +464,35 @@ public class SelectScenePanel : MonoBehaviour
     //ͨ���ж�Toggle��IsOn�Ƿ񱻴����жϼ�����ť�Ƿ��û�
     public void IsClick()
     {
-        bool anyToggleSelected = true;
-
+        bool anysceneSelected = false;
+        bool anyschoolSelected = false;
+        bool isOk = false;
         // ��鳡��ѡ��
         foreach (Toggle toggle in scenetoggleList)
         {
             if (toggle.isOn)
             {
-                anyToggleSelected = true;
+                anysceneSelected = true;
+                break;  // �����һ������ Toggle ��ѡ�У�ֹͣ���
+            }
+        }
+        foreach (Toggle toggle in schooltoggleList)
+        {
+            if (toggle.isOn)
+            {
+                anyschoolSelected = true;
                 break;  // �����һ������ Toggle ��ѡ�У�ֹͣ���
             }
         }
         // �����Ƿ��� Toggle ��ѡ�У����� ContinueBtn �Ƿ�ɽ���
-        if (continueBtn != null)
+        if (continueBtn != null&& anysceneSelected==true&& anyschoolSelected==true)
         {
-            continueBtn.interactable = anyToggleSelected;  // �����ѡ�е� Toggle��������ť�ɽ��������򲻿ɽ���
+            isOk = true;
+            continueBtn.interactable = isOk;  // �����ѡ�е� Toggle��������ť�ɽ��������򲻿ɽ���
         }
         else
         {
+            continueBtn.interactable = isOk;
             Debug.LogError("ContinueBtn ��ť���δ�ҵ���");
         }
     }
@@ -497,7 +516,6 @@ public class SelectScenePanel : MonoBehaviour
         //����¼�ѡ��
         foreach (Toggle toggle in eventToggleList)
         {
-            Debug.LogError("�¼�ѡ��:" + anyToggleSelected);
             if (toggle.isOn)
             {
                 anyeventSelected = true;
@@ -505,18 +523,15 @@ public class SelectScenePanel : MonoBehaviour
                 break;  // �����һ������ Toggle ��ѡ�У�ֹͣ���
             }
         }
-        Debug.Log(submitBtn != null && anyToggleSelected == true && anyeventSelected == true);
         // �����Ƿ��� Toggle ��ѡ�У����� ContinueBtn �Ƿ�ɽ���
         if (submitBtn != null && anyToggleSelected == true&& anyeventSelected==true)
         {
-            Debug.LogError("�ύ��ť���δ�ҵ���");
             isOk = true;
             submitBtn.interactable = isOk;  // �����ѡ�е� Toggle��������ť�ɽ��������򲻿ɽ���
         }
         else
         {
             submitBtn.interactable = isOk;
-            Debug.LogWarning("�ύ��ť���δ�ҵ���");
         }
     }
 
@@ -605,26 +620,35 @@ public class SelectScenePanel : MonoBehaviour
         // ���ó���ѡ���е�����Toggle��ť
         foreach (Toggle toggle in scenetoggleList)
         {
-            toggle.interactable = false;  // ����ToggleΪ���ɽ���
+            if (toggle != null)
+            {
+                toggle.interactable = false;
+            }
         }
         // ����ѧУѡ���е�����Toggle��ť
         foreach (Toggle toggle in schooltoggleList)
         {
-            toggle.interactable = false;
+            if (toggle != null)
+            {
+                toggle.interactable = false;
+            }
         }
-
         // �����¼�ѡ���е�����Toggle��ť
         foreach (Toggle toggle in eventToggleList)
         {
-            toggle.interactable = false;
+            if (toggle != null)
+            {
+                toggle.interactable = false;
+            }
         }
-
         // �����¼�����ѡ���е�����Toggle��ť
         foreach (Toggle toggle in evnetsceneList)
         {
-            toggle.interactable = false;
+            if (toggle != null)
+            {
+                toggle.interactable = false;
+            }
         }
-
         // ���ü�����ť
         continueBtn.interactable = false;