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] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=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      | 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