修改

xiaofang/Assets/Prefabs/itemPrefabs/templateItem.prefab

@@ -0,0 +1,254 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1706551731320121365
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1706551731320121366}
+  - component: {fileID: 1706551731320121368}
+  - component: {fileID: 1706551731320121367}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1706551731320121366
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731320121365}
+  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: 1706551731940790776}
+  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: 1.1260986, y: 0.18600464}
+  m_SizeDelta: {x: 50.3051, y: 16.89}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1706551731320121368
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731320121365}
+  m_CullTransparentMesh: 1
+--- !u!114 &1706551731320121367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731320121365}
+  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: d2f86d28676ed3045a754ca39457cfe5, 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 &1706551731936480262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1706551731936480263}
+  - component: {fileID: 1706551731936480265}
+  - component: {fileID: 1706551731936480264}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1706551731936480263
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731936480262}
+  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: 1706551731940790776}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -139.71454, y: 0}
+  m_SizeDelta: {x: -369.4734, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1706551731936480265
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731936480262}
+  m_CullTransparentMesh: 1
+--- !u!114 &1706551731936480264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731936480262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6A21\u677F\u540D\u79F01"
+--- !u!1 &1706551731940790775
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1706551731940790776}
+  - component: {fileID: 1706551731940790778}
+  - component: {fileID: 1706551731940790779}
+  m_Layer: 5
+  m_Name: templateItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1706551731940790776
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731940790775}
+  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: 1706551731320121366}
+  - {fileID: 1706551731936480263}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1706551731940790778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731940790775}
+  m_CullTransparentMesh: 1
+--- !u!114 &1706551731940790779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1706551731940790775}
+  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: 0}
+    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: 0}
+  toggleTransition: 1
+  graphic: {fileID: 1706551731320121367}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 1

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

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

xiaofang/Assets/Scenes/Schedule_03.unity

@@ -2211,7 +2211,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 618256458}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 05b11d619e5d88a439384d80484d6952, type: 3}
   m_Name: 
@@ -2249,6 +2249,7 @@ MonoBehaviour:
   scene: 
   dutyId: 0
   peopleList: []
+  userInfo: {fileID: 1201261371}
   managerPanel1: {fileID: 617308873}
   jsonReader1: {fileID: 1417128757}
   selectScenePanel: {fileID: 7468736064579811982}
@@ -6840,6 +6841,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1194981511}
   m_CullTransparentMesh: 1
+--- !u!1 &1201261370
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1201261372}
+  - component: {fileID: 1201261371}
+  m_Layer: 0
+  m_Name: UserInfo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1201261371
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1201261370}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4571963e0ee11474b9f600297378bc02, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1201261372
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1201261370}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 123.62924, y: 398.93616, z: -7.945088}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1234276884
 GameObject:
   m_ObjectHideFlags: 0

xiaofang/Assets/Scenes/Schedule_a_walkthrough.unity

@@ -559,6 +559,26 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 331050545}
     m_Modifications:
+    - target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5298631526888954802, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5475342654612131044, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7468736063766935915, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -683,6 +703,22 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7468736065055436938, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7468736065685524838, guid: 90919b88a71f0054bb1cf84429cb3a1e, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0

xiaofang/Assets/Scenes/loginscene.unity

@@ -823,6 +823,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   token: 
+  Global: {fileID: 0}
   clientId: e5cd7e4891bf95d1d19206ce24a7b32e
 --- !u!114 &252707975
 MonoBehaviour:

xiaofang/Assets/Script/DirllInterface/getPlayerList.cs

@@ -8,10 +8,10 @@ using UnityEngine;
 //获取房间玩家列表
 public class getPlayerList : MonoBehaviour
 {
-    private void Start()
+    //private void Start()
-    {
+    //{
-        GetPlayerList();
+    //    GetPlayerList();
-    }
+    //}
     // 创建请求头，使用最新的 token
     public Dictionary<string, string> CreateHeaders()
     {
@@ -38,6 +38,7 @@ public class getPlayerList : MonoBehaviour
 //=====================================================================================================================
 public class PlayerListResponse : Response
 {
+
     public List<PlayerListData> data { get; set; }
 }
 

xiaofang/Assets/Script/DirllInterface/getPlayerList.cs.meta

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

xiaofang/Assets/Script/DirllInterface/getTemplateList.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Unity.VisualScripting.Antlr3.Runtime;
 using UnityEditor.PackageManager;
 using UnityEngine;
@@ -11,28 +12,21 @@ public class getTemplateList : MonoBehaviour
     // 创建请求头，使用最新的 token
     public Dictionary<string, string> CreateHeaders()
     {
-
-
-        if (string.IsNullOrEmpty(MyGlobal.global.loginResponse.data.access_token))
-        {
-            Debug.LogWarning("尝试创建请求头时，token 未设置。");
-            return new Dictionary<string, string>();
-        }
-
         return new Dictionary<string, string>
         {
-            { "Authorization","Bearer "+MyGlobal.global.loginResponse.data.access_token },
+            { "Authorization","Bearer "+GlobalData.ServerData.data.access_token },
             {"clientId", "e5cd7e4891bf95d1d19206ce24a7b32e" }
         };
     }
     //获取模板列表
-    public async void TemplaRst()
+    public async Task<TemplateListData> TemplaRst()
     {
         string response = await web.SendRequest(web.URL + "/game/gameTemplate/list", "GET", "", CreateHeaders());
         Debug.Log("获取模板列表" + response);
         //解析服务器返回的数据
         TemplateListData templateListData = JsonConvert.DeserializeObject<TemplateListData>(response);
         Debug.Log("================" + templateListData.msg);
+        return templateListData;
     }
 }
 //=======================================================================================================

xiaofang/Assets/Script/Scheduled_03/Panel.cs

@@ -80,10 +80,13 @@ public class Panel : MonoBehaviour
     private GameObject selectedScene = null;//当前选中场景
     public SelectedInfo selectedInfo;
     public Dictionary<string, List<SelectedInfo>> sceneDataDictionary = new Dictionary<string, List<SelectedInfo>>();//不同的场景存取不同的人员数据
+    public List<PlayerListData> userInfoList = new List<PlayerListData>();
+    public getPlayerList userInfo;
     public ManagerPanel managerPanel1;
     public JSONReader jsonReader1;
     public SelectScenePanel selectScenePanel;
     public DatePanel datePanel;
+    
     private bool isPersonSelected = false;  // 标志是否选择了人员
     private bool isDutySelected = false;    // 标志是否选择了职责
     private bool isSceneSelected = false;   // 标志是否选择了场景
@@ -92,8 +95,6 @@ public class Panel : MonoBehaviour
     void Start()
     {
         selectedInfo = new SelectedInfo();
-        DynamicLoadingPeople();
-        DynamicLoadingScene();
         InstantiateToggle();
     }
 
@@ -107,16 +108,18 @@ public class Panel : MonoBehaviour
     }
     //==================================================================动态加载=======================================================
         //动态加载人员
-    public void DynamicLoadingPeople()
+    public async void DynamicLoadingPeople()
     {
-            for (int i = 0; i < 20; i++)
+        PlayerListResponse playerListResponse=await userInfo.GetPlayerList();
+        foreach(PlayerListData player in playerListResponse.data)
         {
+            Debug.Log("Player Name: " + player.UserName);
             GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
             PeopleItem peopleItem = item.GetComponent<PeopleItem>();
+            peopleItem.nameText.text = player.NickName;
             Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
             peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
             peopleList.Add(item);// 将每个实例化的角色添加到列表中
-
         }
     }
 
@@ -322,6 +325,9 @@ public class Panel : MonoBehaviour
     //处理点击确认按钮
     public void ClickSureBtn()
     {
+        Debug.LogError(">>>>>>>>>>>>>"+ isPersonSelected);
+        Debug.LogError(">>>>>>>>>>>>>"+ isDutySelected);
+        Debug.LogError(">>>>>>>>>>>>>"+ isSceneSelected);
             // 只有在选择了人员、职责和场景的情况下，才会执行后续操作
         if (isPersonSelected && isDutySelected && isSceneSelected)
         {
@@ -423,7 +429,7 @@ public class Panel : MonoBehaviour
                     if (buttonText != null && buttonText.tag == Tags.people) // 获取标签为人员的信息                             
                     {
                         name = buttonText.text;
-                        Debug.Log(name);
+                        Debug.LogError(name);
                         selectedInfo.name = name;
                         isPersonSelected = true;  // 选择了人员
                     }

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

@@ -257,6 +257,10 @@ public class SelectScenePanel : MonoBehaviour
     //点击继续按钮后更换场景图片及名称
     public void InstantiateEventPrefab(int id)
     {
+        if(isSure)
+        {
+            return;
+        }
         // 清空事件列表
         incidentInfos.Clear();
         foreach (Transform child in incidentList)
@@ -265,7 +269,7 @@ public class SelectScenePanel : MonoBehaviour
         }
 
         // 更新场景名称
-        text20008.text = sceneName;
+        text20008.text = schoolName;
 
         // 通过 id 获取对应的 sceneData
         if (jsonReader.sceneDictionary.TryGetValue(id, out var sceneData))
@@ -282,8 +286,6 @@ public class SelectScenePanel : MonoBehaviour
                     // 根据 incidentId 获取对应的事件数据
                     EventData eventData = jsonReader.GetEvenById(incidentId);
                     string[] incidentIds2 = eventData.DisasterLocation.Split('|');
-
-                    // 动态加载 slot
                     GameObject slot = GameObject.Instantiate<GameObject>(eventPrefab, eventList);
                     EventInfo item = slot.GetComponent<EventInfo>();
                     item.eventId = eventData.ID;
@@ -346,7 +348,6 @@ public class SelectScenePanel : MonoBehaviour
         }
     }
 
-
     //事件及难度选择
     public void SelectEvent()
     {
@@ -364,10 +365,15 @@ public class SelectScenePanel : MonoBehaviour
     //随机事件
     public void OnRandomEventClick()
     {
-        // 随机选择一个事件
+        if(isSure)
-        if (eventInfoList.Count > 1)
         {
-            int randomIndex = Random.Range(0, eventInfoList.Count);
+            return;
+        }
+        // 随机选择一个事件
+        if (incidentInfos.Count > 1)
+        {
+            randomEventBtn.gameObject.SetActive(true);
+            int randomIndex = Random.Range(0, incidentInfos.Count);
             // 取消所有Toggle的选中状态
             foreach (Toggle toggle in eventToggleList)
             {
@@ -382,9 +388,9 @@ public class SelectScenePanel : MonoBehaviour
             if (eventToggleList[randomIndex] != null && eventToggleList[randomIndex].GetComponent<IncidentInfo>().isOpen != false)
             {
                 eventToggleList[randomIndex].isOn = true;
-                this.eventName = eventInfoList[randomIndex].eventName.text; // 设置随机选择的事件名称
+                this.idcidentName = incidentInfos[randomIndex].incidentText.text; // 设置随机选择的事件名称
-                this.eventId = eventInfoList[randomIndex].eventId; // 更新事件 ID
+                this.difficultyId = incidentInfos[randomIndex].incidentID; // 更新事件 ID
-                Debug.Log("已选择随机事件: " + this.eventName);
+                Debug.Log("已选择随机事件: " + this.idcidentName);
             }
             else
             {
@@ -417,8 +423,6 @@ public class SelectScenePanel : MonoBehaviour
     //继续按钮，点击后上传数据
     public void OnClickContinueBtn()
     {
-        //SelectSchoolBtn();
-        //SelectSceneBtn();
         InstantiateEventPrefab(this.scnenId);
         SetFirstChoise(evnetsceneList);
         if (continueBtn.interactable)
@@ -442,6 +446,8 @@ public class SelectScenePanel : MonoBehaviour
         this.gameObject.SetActive(false);
         panel.gameObject.SetActive(true);
         DisableUIInteraction();
+        panel.DynamicLoadingPeople();
+        panel.DynamicLoadingScene();
         panel.DynamicLoadingDuty(this.difficultyId);
         isSure = true;
     }
@@ -449,7 +455,8 @@ public class SelectScenePanel : MonoBehaviour
     //关闭按钮
     public void OnClickCloseBtn()
     {
-        // 清空事件列表
+        if(!isSure)
+        {// 清空事件列表
             eventInfoList.Clear();
 
             // 销毁所有已实例化的事件预制体
@@ -457,11 +464,10 @@ public class SelectScenePanel : MonoBehaviour
             {
                 Destroy(child.gameObject);
             }
-
-        // 如果需要，也可以清空其他相关信息
             evnetsceneList.Clear();
             eventId = -1;
             eventName = string.Empty;
+         }
         if (schoolChoiceLable.gameObject.active == false)
         {
             sceneLable.gameObject.SetActive(true);
@@ -470,8 +476,16 @@ public class SelectScenePanel : MonoBehaviour
             incidentLable.gameObject.SetActive(false);
         }
         else
+        {
+            if(isSure)
             {
                 transform.gameObject.SetActive(false);
+                panel.gameObject.SetActive(true);
+            }
+            else
+            {
+                transform.gameObject.SetActive(false);
+            }
         }
     }
 
@@ -668,4 +682,11 @@ public class SelectScenePanel : MonoBehaviour
         // 禁用提交按钮
         submitBtn.interactable = false;
     }
+
+    //界面设置
+    public void SetPanel()
+    {
+        gameObject.SetActive(true);
+        panel.gameObject.SetActive(false);
+    }
 }

xiaofang/Assets/Script/UI/TemplateInfo.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class TemplateInfo : MonoBehaviour
+{
+    public Text templateText;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

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

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

xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs

@@ -9,7 +9,9 @@ public class LoadScene : MonoBehaviour
 {
     public Button nextBtn;
     public Button yesBtn;
-
+    public GameObject templatePrefab;
+    public Transform temlateContent;
+    public getTemplateList getTemplaste;
     // Start is called before the first frame update
     void Start()
     {
@@ -17,21 +19,19 @@ public class LoadScene : MonoBehaviour
         yesBtn.onClick.AddListener(OnClickYesBtn);
     }
 
-    private void OnClickYesBtn()
+    private async void OnClickYesBtn()
     {
-        //这里写应用场景的代码逻辑
+        TemplateListData templateListData = await getTemplaste.TemplaRst();
-
+        foreach (var info in templateListData.data)
-        
+        {
+            Debug.Log("+++++++++++>>>>>>>>>>>>>>>>"+info);
+            GameObject template=GameObject.Instantiate(templatePrefab, temlateContent);
+            TemplateInfo templateInfo = template.GetComponent<TemplateInfo>();
+        }
     }
 
     public void OnClickNextBtn()
     {
-        SceneManager.LoadScene("Schedule_a_walkthrough");
+        SceneManager.LoadScene(2);
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
     }
 }