From 91d58b2f4d00f04cbf53a55a7738b304e77e758c Mon Sep 17 00:00:00 2001 From: liuliang <597380732@qq.com> Date: Sat, 28 Dec 2024 15:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95,=E6=88=BF=E9=97=B4=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaofang/Assets/Res/gsj/scripts/Drill.cs | 1 + xiaofang/Assets/Res/gsj/scripts/RoomManager.cs | 5 ++++- xiaofang/Assets/Res/gsj/scripts/Status.cs | 2 +- xiaofang/Assets/Resources/gsjUI/GameObject.prefab | 2 ++ xiaofang/Assets/Scenes/Tmap 1.unity | 2 +- xiaofang/Assets/Script/loginScripts/LoginPanel.cs | 2 ++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xiaofang/Assets/Res/gsj/scripts/Drill.cs b/xiaofang/Assets/Res/gsj/scripts/Drill.cs index ca619b7c..e3d522bb 100644 --- a/xiaofang/Assets/Res/gsj/scripts/Drill.cs +++ b/xiaofang/Assets/Res/gsj/scripts/Drill.cs @@ -82,5 +82,6 @@ public class Drill : MonoBehaviour //SceneManager.LoadScene(2); Debug.Log("点击了演练计划按钮!"); // 这里可以添加具体逻辑 + SceneManager.LoadScene("scheduled_exercise"); } } diff --git a/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs b/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs index 26a65217..b6e883b2 100644 --- a/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs +++ b/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs @@ -19,7 +19,10 @@ public class RoomManager : MonoBehaviour gameRoomListInstance = FindObjectOfType(); contentParent =transform.Find("Mid/Scroll View/Viewport/Content").transform; gameRoomListInstance = FindObjectOfType(); - FetchRoomList(); + if(!ReadRoom.instance.isadministrator) + { + FetchRoomList(); + } } // 异步获取房间数据 diff --git a/xiaofang/Assets/Res/gsj/scripts/Status.cs b/xiaofang/Assets/Res/gsj/scripts/Status.cs index 19ee8aca..b3e650d0 100644 --- a/xiaofang/Assets/Res/gsj/scripts/Status.cs +++ b/xiaofang/Assets/Res/gsj/scripts/Status.cs @@ -147,7 +147,7 @@ public class Status : MonoBehaviour if (!eventAdded) { //点击生成评估报告 - //Assessmentreport.onClick.AddListener(OnClickAssessmentreport); + Assessmentreport.onClick.AddListener(OnClickAssessmentreport); Review.onClick.AddListener(OnClickReviewBtn); eventAdded = true; } diff --git a/xiaofang/Assets/Resources/gsjUI/GameObject.prefab b/xiaofang/Assets/Resources/gsjUI/GameObject.prefab index 71a3307b..e087053f 100644 --- a/xiaofang/Assets/Resources/gsjUI/GameObject.prefab +++ b/xiaofang/Assets/Resources/gsjUI/GameObject.prefab @@ -1666,7 +1666,9 @@ MonoBehaviour: isOngoing: 0 isScheduled: 0 drill: {fileID: 0} + text: {fileID: 0} timetext: {fileID: 6282968326833298297} + JSONReader: {fileID: 0} RoomId: status: TemplateId: diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index a6721a07..54faff8b 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -17474,7 +17474,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &984064306 Transform: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs index db5f9467..470041eb 100644 --- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs +++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs @@ -69,6 +69,8 @@ public class LoginPanel : Base //if (loginBody.userType == "company_user") if(loginBody.username == id.text && loginBody.password == pwd.text) { + Debug.LogError(11); + ReadRoom.instance.isadministrator=true; SceneManager.LoadScene(1); } else if(id.text == "13051628292" && pwd.text == "ZF16c788632")