From 89f66a8b916cb8f9979b81f2b775957b3ccd607d Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Thu, 2 Jan 2025 10:15:52 +0800
Subject: [PATCH 1/4] =?UTF-8?q?scene=E8=A1=A8json=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Resources/JsonAsset/Scene.json     |   2 +
 xiaofang/Assets/Scenes/Schedule_03.unity      | 151 +++++++++++++-----
 xiaofang/Assets/Script/Scheduled_03/Panel.cs  |  96 +++--------
 .../Script/UI/PanelUI/SelectScenePanel.cs     |  16 +-
 4 files changed, 150 insertions(+), 115 deletions(-)

diff --git a/xiaofang/Assets/Resources/JsonAsset/Scene.json b/xiaofang/Assets/Resources/JsonAsset/Scene.json
index 82c42d8b..dd14a66c 100644
--- a/xiaofang/Assets/Resources/JsonAsset/Scene.json
+++ b/xiaofang/Assets/Resources/JsonAsset/Scene.json
@@ -7,6 +7,7 @@
     "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003",
     "AreaList": "1012|1013|1014|1015|1017|1018|1019|1020|1021|1022|1023|1024|1025|1026|1027|1028|1029|1030|1076|1031|1032|1033|1034|1036|1037|1038|1039|1040|1041|1077|1078|1079|1080|1081|1082|1083|1084|1085|1086",
     "Storeroom": "1011",
+    "TriageArea": "1099",
     "ConfigText": "10039|10040|10039"
   },
   {
@@ -17,6 +18,7 @@
     "ObjList": "7001,7002,7003|7001,7003|7001,7002,7003",
     "AreaList": "1012|1013|1014|1015|1017|1018|1019|1020|1021|1022|1023|1024|1025|1026|1027|1028|1029|1030|1076|1031|1032|1033|1034|1036|1037|1038|1039|1040|1041|1077|1078|1079|1080|1081|1082|1083|1084|1085|1086",
     "Storeroom": "1011",
+    "TriageArea": "1099",
     "ConfigText": "20034|20035|20036"
   }
 ]
\ No newline at end of file
diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity
index 979b7131..87e73c72 100644
--- a/xiaofang/Assets/Scenes/Schedule_03.unity
+++ b/xiaofang/Assets/Scenes/Schedule_03.unity
@@ -646,6 +646,82 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 6740850324693622956, guid: a15ee694d5f79864d816998fae77116d, type: 3}
   m_PrefabInstance: {fileID: 704068456}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &323893669
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 323893670}
+  - component: {fileID: 323893672}
+  - component: {fileID: 323893671}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &323893670
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 323893669}
+  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: 1120226610}
+  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.5936, y: 0.2968}
+  m_SizeDelta: {x: 85, y: 85}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &323893671
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 323893669}
+  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: 7eec63c0b14d7a24a9869a90b839245c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &323893672
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 323893669}
+  m_CullTransparentMesh: 1
 --- !u!1 &324885455
 GameObject:
   m_ObjectHideFlags: 0
@@ -7005,14 +7081,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 323893670}
   m_Father: {fileID: 617308872}
   m_RootOrder: 1
   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: 857.8053, y: 382.9524}
-  m_SizeDelta: {x: 104.3894, y: 116.0952}
+  m_AnchoredPosition: {x: 856.3214, y: 382.9524}
+  m_SizeDelta: {x: 115, y: 115}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1120226611
 MonoBehaviour:
@@ -7090,7 +7167,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 0e2355f01ff55d14aa4dc0fa4fdae0cb, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b02008df96cdf83469777ece50f69030, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7397,18 +7474,6 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 7468736064579811972}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
       - m_Target: {fileID: 805990075}
         m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
         m_MethodName: SetActive
@@ -7433,6 +7498,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 618256462}
+        m_TargetAssemblyTypeName: Panel, Assembly-CSharp
+        m_MethodName: SetTransfrom
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
   m_IsOn: 0
 --- !u!114 &1194981514
 MonoBehaviour:
@@ -13510,7 +13587,7 @@ RectTransform:
   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: -343.34674}
+  m_AnchoredPosition: {x: 917, y: -816.70026}
   m_SizeDelta: {x: 1834, y: 473.3535}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &5475342653747154700
@@ -15853,9 +15930,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
@@ -16136,9 +16213,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
@@ -17380,9 +17457,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
@@ -17748,9 +17825,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
@@ -18161,9 +18238,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: -1328.051}
+  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
@@ -18181,7 +18258,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!222 &7468736065013593257
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -19417,9 +19494,9 @@ RectTransform:
   m_Father: {fileID: 7468736064579811971}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 917, y: -829.36597}
   m_SizeDelta: {x: 1834, y: 498.685}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7468736065836200803
@@ -19437,7 +19514,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &8920314133631286993
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index b096f5fe..4280a7aa 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -121,27 +121,27 @@ public class Panel : Base
         //动态加载人员
     public async void DynamicLoadingPeople()
     {
-        //for (int i = 0; i < 10; i++)
-        //{
-        //    GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
-        //    PeopleItem peopleItem = item.GetComponent<PeopleItem>();
-        //    peopleItem.nameText.text = "角色1";
-        //    peopleItem.peopleId = "0";
-        //    Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
-        //    peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
-        //    peopleList.Add(item);// 将每个实例化的角色添加到列表中
-        //}
-        PlayerListResponse playerListResponse = await userInfo.GetPlayerList();
-        foreach (PlayerListData player in playerListResponse.data)
+        for (int i = 0; i < 10; i++)
         {
             GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
             PeopleItem peopleItem = item.GetComponent<PeopleItem>();
-            peopleItem.nameText.text = player.NickName;
-            peopleItem.peopleId = player.UserId;
+            peopleItem.nameText.text = "角色1";
+            peopleItem.peopleId = "0";
             Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
             peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
             peopleList.Add(item);// 将每个实例化的角色添加到列表中
         }
+        //PlayerListResponse playerListResponse = await userInfo.GetPlayerList();
+        //foreach (PlayerListData player in playerListResponse.data)
+        //{
+        //    GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
+        //    PeopleItem peopleItem = item.GetComponent<PeopleItem>();
+        //    peopleItem.nameText.text = player.NickName;
+        //    peopleItem.peopleId = player.UserId;
+        //    Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
+        //    peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
+        //    peopleList.Add(item);// 将每个实例化的角色添加到列表中
+        //}
     }
 
     //动态加载职责
@@ -404,67 +404,8 @@ public class Panel : Base
         }
         return count;
     }
+
     //处理点击确认按钮
-    //public void ClickSureBtn()
-    //{
-    //        // 只有在选择了人员、职责和场景的情况下，才会执行后续操作
-    //    if (isPersonSelected && isDutySelected && isSceneSelected)
-    //    {
-    //        // 保存选中的人员信息到场景数据字典中
-    //        string sceneName = selectedInfo.scene;
-    //        // 如果场景字典中没有这个场景，先创建一个空列表
-    //        if (!sceneDataDictionary.ContainsKey(sceneName))
-    //        {
-    //            sceneDataDictionary[sceneName] = new List<SelectedInfo>();
-    //        }
-    //        // 需要判断是否达到了职责的人员上限
-    //        bool isLimitReached = false;
-    //        // 获取当前场景中的所有人员信息
-    //        List<SelectedInfo> currentSceneInfo = sceneDataDictionary[sceneName];
-    //        // 如果选中了“主持人”、“各组长”或“总指挥”，则限制数量为1
-    //        if (selectedInfo.duty == "主持人" || selectedInfo.duty == "组长" || selectedInfo.duty == "总指挥")
-    //        {
-    //            int count = currentSceneInfo.Count(info => info.duty == selectedInfo.duty); // 统计当前职责人数
-
-    //            if (count >= 1) // 如果已经有1个此职责的人选
-    //            {
-    //                isLimitReached = true; // 标记限制已达
-    //            }
-    //        }
-    //        // 如果没有达到上限，则可以添加人员信息
-    //        if (!isLimitReached)
-    //        {
-    //            // 通过创建一个新的 SelectedInfo 实例来避免引用同一个对象
-    //            SelectedInfo newSelectedInfo = new SelectedInfo
-    //            {
-    //                name = selectedInfo.name,
-    //                duty = selectedInfo.duty,
-    //                scene = selectedInfo.scene,
-    //                dutyId = selectedInfo.dutyId,
-    //                sceneId = selectedInfo.sceneId,
-    //                peopleId=selectedInfo.peopleId
-    //            };
-
-    //            // 将当前选中的人员信息添加到对应场景的人员列表中
-    //            currentSceneInfo.Add(newSelectedInfo);
-
-    //            // 禁用确认按钮并清空选择标志
-    //            sureBtn.interactable = false;
-    //            ChangeImage(sureBtn.interactable);
-    //            isPersonSelected = false;
-    //            isDutySelected = false;
-    //            isSceneSelected = false;
-    //            UploadData(peopleId = selectedInfo.peopleId, selectedInfo.dutyId.ToString(), selectedInfo.sceneId.ToString());
-    //            // 改变已添加人员的显示颜色
-    //            UpdatePeopleListVisual();
-    //        }
-    //    }
-    //    else
-    //    {
-    //        Debug.LogError("请确保选择了人员、职责和场景！");
-    //    }
-    //    datePanel.NumberText.text = "共" + (sceneDataDictionary.Keys.Count * sceneDataDictionary.Values.Count).ToString() + "人参与";
-    //}
     public void ClickSureBtn()
     {
         // 只有在选择了人员、职责和场景的情况下，才会执行后续操作
@@ -860,6 +801,13 @@ public class Panel : Base
     public void SetTransfrom()
     {
         transform.gameObject.SetActive(false);
+        selectScenePanel.gameObject.SetActive(true);
+    }
+
+    //判断是否满足最低配置要求
+    public void WhetherToMeet()
+    {
+        
     }
 }
 
diff --git a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
index f215df1b..b7343880 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
@@ -446,8 +446,11 @@ public class SelectScenePanel : Base
         Debug.LogError("datePanel.disasterLocation" + datePanel.disasterLocation);
         SelsctDifficulty();
         SetDataPanelInfo();
-        this.gameObject.SetActive(false);
-        panel.gameObject.SetActive(true);
+        SetPanel();
+        //transform.gameObject.SetActive(false);
+        //Debug.Log("111111111111111111111111111111");
+        //panel.gameObject.SetActive(true);
+        //Debug.Log("2222222222222222222222222222222");
         selectToggle.DefaultToggle();
         DisableUIInteraction();
         panel.DynamicLoadingPeople();
@@ -692,7 +695,12 @@ public class SelectScenePanel : Base
     //界面设置
     public void SetPanel()
     {
-        gameObject.SetActive(true);
-        panel.gameObject.SetActive(false);
+        if(!transform.gameObject.activeInHierarchy)
+        {
+            Debug.LogError("++++++++++++++++++++++++++++++");
+        }
+        transform.gameObject.SetActive(false);
+        panel.gameObject.SetActive(true);
+        Debug.Log("111111111111111111111111111111");
     }
 }
\ No newline at end of file

From f47ad2fe2ec0cf0ec89916317b77980bda63ad8e Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Thu, 2 Jan 2025 10:21:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Script/JSONReader/JSONReader.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xiaofang/Assets/Script/JSONReader/JSONReader.cs b/xiaofang/Assets/Script/JSONReader/JSONReader.cs
index 1f5248a5..fe3f965e 100644
--- a/xiaofang/Assets/Script/JSONReader/JSONReader.cs
+++ b/xiaofang/Assets/Script/JSONReader/JSONReader.cs
@@ -571,6 +571,8 @@ public class SceneData
     public string ObjList;
     public string AreaList;
     public int Storeroom;
+    public string TriageArea;
+    public string ConfigText;
 }
 [System.Serializable]
 public class IncidentSite

From ba4fa596c418ba1e141f57619f5ee68a7b42c460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8F=B7=E6=95=AC?= <153802103@qq.com>
Date: Thu, 2 Jan 2025 10:52:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Res/gsj/scripts/Drill.cs      | 29 ++++++++++++++-----
 xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs   |  4 +++
 .../Assets/Res/gsj/scripts/RoomManager.cs     |  2 +-
 xiaofang/Assets/Scenes/Tmap 1.unity           |  4 +--
 xiaofang/Assets/Scenes/loginscene.unity       |  5 ++--
 xiaofang/Assets/Scenes/yhj.unity              | 14 +++++++++
 6 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/xiaofang/Assets/Res/gsj/scripts/Drill.cs b/xiaofang/Assets/Res/gsj/scripts/Drill.cs
index e3d522bb..4fff5210 100644
--- a/xiaofang/Assets/Res/gsj/scripts/Drill.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Drill.cs
@@ -18,12 +18,13 @@ public class Drill : MonoBehaviour
 
     // 记录上一次的 isadministrator 状态，用于减少重复执行逻辑
     private bool lastIsAdministratorState;
-
-
+    public getPlayerList userInfo;
+    private string nickname;
 
 
     void Start()
     {
+        
         ScheduledBtn = transform.Find("down/ScheduledBtn").GetComponent<Button>();
         ScheduledBtn.gameObject.SetActive(false); // 初始隐藏按钮
 
@@ -31,14 +32,26 @@ public class Drill : MonoBehaviour
         noRoomText.gameObject.SetActive(false); // 初始隐藏文本
 
         content = transform.Find("Mid/Scroll View/Viewport/Content");
-        if(GlobalData.ServerData.data.isCreater=="Y")
-        {
-            username.text = $"[{GlobalData.ServerData.data.userId}]（管理员）"; 
-        }
-        else username.text = $"[{GlobalData.ServerData.data.userId}]"; 
-        companyName.text = "所属机构：[" + GlobalData.ServerData.data.companyName +"]";
+        GetObjectList(GlobalData.ServerData.data.userId);
+        companyName.text = "所属机构：" + GlobalData.ServerData.data.companyName +"";
     }
+    public async void  GetObjectList(string id)
+    {
+        PlayerListResponse playerListResponse = await userInfo.GetPlayerList();
+        foreach (var VARIABLE in playerListResponse.data)
+        {
 
+            if (id == VARIABLE.UserId)
+            {
+                nickname = VARIABLE.NickName;
+                if (GlobalData.ServerData.data.isCreater == "Y")
+                {
+                    username.text = $"{nickname}（管理员）";
+                }
+                else username.text = $"{nickname}";
+            }
+        }
+    }
     void Update()
     {
 
diff --git a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
index f6d35daa..68cab788 100644
--- a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
@@ -23,6 +23,7 @@ public class ReadRoom : MonoBehaviour
     public loginData playerdetail;
     public test test;
     public string ID;
+    
     // Start is called before the first frame update
     void Start()
     {
@@ -40,6 +41,9 @@ public class ReadRoom : MonoBehaviour
         // 取消订阅事件
         Starthost.OnBoolStart -= HandleRoomControl;
     }
+
+   
+
     public async void adHead()
     {
         var response = await gameRoomListInstance.getGameRoomList();
diff --git a/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs b/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs
index a210d388..116464e1 100644
--- a/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs
@@ -89,7 +89,7 @@ public class RoomManager : MonoBehaviour
             }
             // 添加 RoomDataHolder 脚本并存储数据
             Status dataHolder = roomItem.GetComponent<Status>();
-            dataHolder.text.text = $"{js.SetUIText(room.SceneId)}  {js.SetUIText(room.SubjectId)}";
+            dataHolder.text.text = $"{js.SetUIText(js.GetSceneById(int.Parse(room.SceneId)).Name)}  {js.SetUIText(room.SubjectId)}";
             Debug.Log(js.SetUIText(room.SceneId));
             Debug.Log(dataHolder.text.text);
             dataHolder.SetRoomData(room.RoomId, room.SceneId, room.SubjectId, room.TemplateId, room.Status, room.ReserveDate);
diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity
index 67266ca4..02c4083a 100644
--- a/xiaofang/Assets/Scenes/Tmap 1.unity	
+++ b/xiaofang/Assets/Scenes/Tmap 1.unity	
@@ -27549,8 +27549,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44720823678ca7c42a08f4409ab025ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverIP: ws://192.168.3.110
-  serverPort: 8445
+  serverIP: ws://222.212.9.114
+  serverPort: 45487
   type: 
 --- !u!114 &1526740606
 MonoBehaviour:
diff --git a/xiaofang/Assets/Scenes/loginscene.unity b/xiaofang/Assets/Scenes/loginscene.unity
index 3cd06bf8..2a49839d 100644
--- a/xiaofang/Assets/Scenes/loginscene.unity
+++ b/xiaofang/Assets/Scenes/loginscene.unity
@@ -870,6 +870,7 @@ MonoBehaviour:
   RoleId: 0
   roomid: 
   test: {fileID: 7695717545649794846}
+  ID: 
 --- !u!114 &252707977
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4894,8 +4895,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44720823678ca7c42a08f4409ab025ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverIP: ws://192.168.3.110
-  serverPort: 8445
+  serverIP: ws://222.212.9.114
+  serverPort: 45487
   type: 
 --- !u!114 &7695717545649794846
 MonoBehaviour:
diff --git a/xiaofang/Assets/Scenes/yhj.unity b/xiaofang/Assets/Scenes/yhj.unity
index 65cc6a91..d6f23b58 100644
--- a/xiaofang/Assets/Scenes/yhj.unity
+++ b/xiaofang/Assets/Scenes/yhj.unity
@@ -1026,6 +1026,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   username: {fileID: 1776157176}
   companyName: {fileID: 2086101897}
+  userInfo: {fileID: 3977981761658744022}
 --- !u!1 &423928793
 GameObject:
   m_ObjectHideFlags: 0
@@ -7051,6 +7052,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3977981761658744020}
   - component: {fileID: 3977981761658744021}
+  - component: {fileID: 3977981761658744022}
   m_Layer: 0
   m_Name: JSON
   m_TagString: Untagged
@@ -7097,6 +7099,18 @@ MonoBehaviour:
   TaskJsonFile: {fileID: 4900000, guid: 4dec25769ed4ed3469693b1c881248af, type: 3}
   GlobalJsonFile: {fileID: 4900000, guid: 27ecc4e37cb448e45a2611c086cdfb90, type: 3}
   SelectsJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}
+--- !u!114 &3977981761658744022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3977981761658744018}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4571963e0ee11474b9f600297378bc02, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4424113164951678449
 GameObject:
   m_ObjectHideFlags: 0

From d85ea3295263f0a46dbb2e08130c537fe1a0e5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8F=B7=E6=95=AC?= <153802103@qq.com>
Date: Thu, 2 Jan 2025 11:45:55 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Res/gsj/scripts/Drill.cs    | 2 +-
 xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs | 2 +-
 xiaofang/Assets/Script/login/MyGlobal.cs    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xiaofang/Assets/Res/gsj/scripts/Drill.cs b/xiaofang/Assets/Res/gsj/scripts/Drill.cs
index 4fff5210..cba182ae 100644
--- a/xiaofang/Assets/Res/gsj/scripts/Drill.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Drill.cs
@@ -46,7 +46,7 @@ public class Drill : MonoBehaviour
                 nickname = VARIABLE.NickName;
                 if (GlobalData.ServerData.data.isCreater == "Y")
                 {
-                    username.text = $"{nickname}（管理员）";
+                    username.text = $"{GlobalData.ServerData.data.nickName}（管理员）";
                 }
                 else username.text = $"{nickname}";
             }
diff --git a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
index 68cab788..0cfb6525 100644
--- a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
@@ -210,7 +210,7 @@ public class ReadRoom : MonoBehaviour
             DateTime currentDate = DateTime.Now;
 
             //将当前日期格式化为 "yyyy/MM/dd" 形式
-            string formattedDate = currentDate.ToString("yyyy/MM/dd");
+            string formattedDate = currentDate.ToString("yyyy/M/d");
 
             // 调用方法，动态生成房间元素
             foreach (var room in roomDataList)
diff --git a/xiaofang/Assets/Script/login/MyGlobal.cs b/xiaofang/Assets/Script/login/MyGlobal.cs
index 0507bf13..f0b87367 100644
--- a/xiaofang/Assets/Script/login/MyGlobal.cs
+++ b/xiaofang/Assets/Script/login/MyGlobal.cs
@@ -64,6 +64,7 @@ public class loginData
     public string companyId;           // 公司ID，标识所属公司的唯一ID。
     public string companyName;         // 公司名称，标识用户所属公司或组织的名称。
     public string isCreater;           // 是否为模板创建者，"Y"表示是模板创建者，"N"表示不是。影响用户跳转的页面逻辑。
+    public string nickName;
     public string access_token;        // Access Token，用于认证用户身份，通常在OAuth 2.0中用于授权用户访问资源。
     public string refresh_token;       // Refresh Token，通常用于刷新Access Token，延长用户会话的有效期。
     public int expire_in;              // Access Token的过期时间（单位：秒）。表示token有效期时长。