From 81ae31f18c89d527d967e7e70c34bc6d2a2b2b91 Mon Sep 17 00:00:00 2001
From: "chiyu.lin" <chiyu.lin@bltcnetwork.com.tw>
Date: Wed, 19 Nov 2025 12:30:07 +0800
Subject: [PATCH] fix Q17

---
 .../ClientWorkMessageResultView2SceneController.cs       | 9 +++++++--
 Assets/Scripts/Server/NetworkMessageHandler.cs           | 8 ++++++++
 Assets/Scripts/Server/ServerGamePanel.cs                 | 2 ++
 Assets/Scripts/Server/ServerWorkSceneController.cs       | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/Client/ClientWorkMessageResultView2SceneController.cs b/Assets/Scripts/Client/ClientWorkMessageResultView2SceneController.cs
index 288a57c..82f02f2 100644
--- a/Assets/Scripts/Client/ClientWorkMessageResultView2SceneController.cs
+++ b/Assets/Scripts/Client/ClientWorkMessageResultView2SceneController.cs
@@ -103,7 +103,7 @@ public class ClientWorkMessageResultView2SceneController : MonoBehaviour
         {
             ClientMessageHandler.Instance.SendMessageToServer("workProcess", "continue");
         }
-        
+        StartCoroutine(LoadGameScene());
     }
 
     private void step3NextButton_onClicked()
@@ -167,7 +167,12 @@ public class ClientWorkMessageResultView2SceneController : MonoBehaviour
     {
         yield return new WaitForSeconds(0f);
         SceneManager.LoadScene("ClientWorkMessageResultExitScene");
-
+    }
+    
+    public IEnumerator LoadGameScene()
+    {
+        yield return new WaitForSeconds(0f);
+        SceneManager.LoadScene("ClientGameScene");
     }
 
     // Update is called once per frame
diff --git a/Assets/Scripts/Server/NetworkMessageHandler.cs b/Assets/Scripts/Server/NetworkMessageHandler.cs
index 03bafe2..06fb77f 100644
--- a/Assets/Scripts/Server/NetworkMessageHandler.cs
+++ b/Assets/Scripts/Server/NetworkMessageHandler.cs
@@ -143,6 +143,14 @@ public class NetworkMessageHandler : MonoBehaviour
                     {
                         ServerGamePanel.Instance.gameOpen();
                     }
+                    else
+                    {
+                        //因為時間同步的問題，這2個遊戲強制Server進入遊戲畫面
+                        if (msg.payload == "typing" || msg.payload == "sticks")
+                        {
+                            ServerWorkSceneController.Instance.processStep(13);
+                        }
+                    }
                 }
                 break;
             case "getWords":
diff --git a/Assets/Scripts/Server/ServerGamePanel.cs b/Assets/Scripts/Server/ServerGamePanel.cs
index 9cbaaa0..8efc4ed 100644
--- a/Assets/Scripts/Server/ServerGamePanel.cs
+++ b/Assets/Scripts/Server/ServerGamePanel.cs
@@ -38,6 +38,8 @@ public class ServerGamePanel : MonoBehaviour
                 ServerWorkSceneController.Instance.processStep(16);
                 break;
         }
+        
+        nameOfTheGameWillBeOpened = "";
     }
 
 
diff --git a/Assets/Scripts/Server/ServerWorkSceneController.cs b/Assets/Scripts/Server/ServerWorkSceneController.cs
index 2f4bffc..3794917 100644
--- a/Assets/Scripts/Server/ServerWorkSceneController.cs
+++ b/Assets/Scripts/Server/ServerWorkSceneController.cs
@@ -200,7 +200,7 @@ public class ServerWorkSceneController : MonoBehaviour
             gamePanel.SetActive(step == 13 ? true : false);
             if (step == 13)
             {
-                ServerGamePanel.nameOfTheGameWillBeOpened = "";
+                //ServerGamePanel.nameOfTheGameWillBeOpened = "";
             }
         }
         if (gameTalkingPanel)