diff --git a/Assets/Temp/Scripts/Taskpanel.cs b/Assets/Temp/Scripts/Taskpanel.cs index 5875f881..987150bc 100644 --- a/Assets/Temp/Scripts/Taskpanel.cs +++ b/Assets/Temp/Scripts/Taskpanel.cs @@ -154,6 +154,8 @@ public class Taskpanel : MonoBehaviour string _msg = "leaveroom "; _ = SyncCreateRoom.SendMessageAsync(_msg); } + if (GameManager.Instance.isPlayer) + SceneManager.LoadScene("SampleScene"); } @@ -161,7 +163,6 @@ public class Taskpanel : MonoBehaviour { Debug.Log("Leaveroom"); _ = SyncCreateRoom.SendMessageAsync($"send2room offline,{GlobalFlag.currentUser.user_id}"); - SceneManager.LoadScene("SampleScene"); } } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 05d96a81..4d6c77a0 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -24,6 +24,7 @@ public class GameManager : MonoSingleton public DragController wxdDrag; public GameObject Teacher; public GameObject student; + public bool isPlayer = true; public System.Collections.Generic.List players = new System.Collections.Generic.List(); // Start is called before the first frame update private void Awake() @@ -46,7 +47,7 @@ public class GameManager : MonoSingleton spt.gameObject.SetActive(true); spt.gameObject.transform.position = spawnPos.position; spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles; - spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), true); + spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), isPlayer); AddPlayers(spt); ToolsBootstrap.Instance.SetCameraInfo(spt); //0 red 1 blue @@ -163,7 +164,7 @@ public class GameManager : MonoSingleton spt.gameObject.SetActive(true); spt.gameObject.transform.position = spawnPos.position; spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles; - spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), false); + spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), !isPlayer); AddPlayers(spt); } break; @@ -201,7 +202,7 @@ public class GameManager : MonoSingleton } break; case "offline": - + break; default: break; @@ -237,7 +238,7 @@ public class GameManager : MonoSingleton { SyncPlayerTransform spt = Instantiate(playerTransformPrefab); spt.gameObject.SetActive(true); - spt.SetPlayerInfo(ulong.Parse(userInfo[0]), userInfo[1], ulong.Parse(userInfo[2]), false); + spt.SetPlayerInfo(ulong.Parse(userInfo[0]), userInfo[1], ulong.Parse(userInfo[2]), !isPlayer); spt.transform.position = new Vector3(spawnPos.position.x + index * 0.5f, spawnPos.position.y, spawnPos.position.z + index * 0.5f); spt.transform.eulerAngles = spawnPos.eulerAngles; AddPlayers(spt);