From 0a26fc25b1089590450a6d5b272938af56c88cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=8F=B7=E6=95=AC?= <153802103@qq.com>
Date: Fri, 3 Jan 2025 09:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/ProtoBuf/test.cs             | 8 ++++++--
 xiaofang/Assets/Script/Scheduled_03/Panel.cs | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/xiaofang/Assets/ProtoBuf/test.cs b/xiaofang/Assets/ProtoBuf/test.cs
index 91fd08aa..3bb79484 100644
--- a/xiaofang/Assets/ProtoBuf/test.cs
+++ b/xiaofang/Assets/ProtoBuf/test.cs
@@ -908,8 +908,12 @@ string HandleButtoncallId=11;//
                 }
                 if (userJoinResponse.MessageType == 12)//玩家准备
                 {
-                    Debug.Log("服务器给准备好消息");
-                   GameObject.Find("HostCanvas").GetComponent<Starthost>().isSatisfy=true;
+                    if (userJoinResponse.IsAllReady)
+                    {
+                        Debug.Log("服务器给准备好消息");
+                        GameObject.Find("HostCanvas").GetComponent<Starthost>().isSatisfy = true;
+                    }
+                    
                 }
                     
                 break;
diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index 4ecab160..42db7fab 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -101,7 +101,7 @@ public class Panel : Base
     public SelectScenePanel selectScenePanel;
     public DatePanel datePanel;
     public WarningPopPanel warningPopPanel;
-    public RequirementPanel requirementPanel;
+    //public RequirementPanel requirementPanel;
 
     private bool isPersonSelected = false;  // 标志是否选择了人员
     private bool isDutySelected = false;    // 标志是否选择了职责
@@ -908,7 +908,7 @@ public class Panel : Base
     public void OnclickRequirementsBtn()
     {
         requirementsPrefab.gameObject.SetActive(true);
-        requirementPanel.LoadingSceneLable();
+        //requirementPanel.LoadingSceneLable();
     }
 }