diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 53eb74ea..cde79a83 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -189,7 +189,7 @@ public class GameManager : MonoSingleton spt.GetComponent().cullingMask = TeacherLayer; } //spt.GetComponent().cullingMask &= ~(1 << 15); - + AdamSync.SyncCreateRoom.send2worldRequset += OnGetWorldInfo; tenkokuModule.mainCamera = spt.transform; AddPlayers(spt); DeviceManager.Instance.OnInit(); @@ -206,7 +206,11 @@ public class GameManager : MonoSingleton _ = SyncCreateRoom.SendMessageAsync(msg); } - + public void OnGetWorldInfo(string msg) + { + Debug.Log("OnGetWorldInfo====" + msg); + RemovePlayer(ulong.Parse(msg)); + } private void Update() { if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0" && Input.GetMouseButtonDown(0)) @@ -382,8 +386,6 @@ public class GameManager : MonoSingleton public async void CheckRoomState() { RoomState roomState = await AsyncWebReq.Post(Url_UpdateRoomState + GlobalFlag.roomID + "&state=1", null); - - Debug.Log($"GamemanagerRoomState={ roomState.message}"); if (roomState.message == "success") { GlobalFlag.isStartRehearsing = true; @@ -572,6 +574,7 @@ public class GameManager : MonoSingleton { SyncCreateRoom.getroomusersRequset -= OnGetRoomUsers; SyncCreateRoom.send2roomRequset -= OnRoomInfo; + SyncCreateRoom.send2worldRequset -= OnGetWorldInfo; //string _msg = "leaveroom "; //_ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg); } diff --git a/Assets/Zion/Scripts/Adam/UIBootstrap.cs b/Assets/Zion/Scripts/Adam/UIBootstrap.cs index a253c5f8..57a50dbe 100644 --- a/Assets/Zion/Scripts/Adam/UIBootstrap.cs +++ b/Assets/Zion/Scripts/Adam/UIBootstrap.cs @@ -31,7 +31,7 @@ public class UIBootstrap : MonoSingleton traininginformations.Add(t); } AdamSync.SyncCreateRoom.leaveRoomRequset += OnLeaveRoomInfo; - AdamSync.SyncCreateRoom.send2worldRequset += OnGetWorldInfo; + } @@ -115,11 +115,7 @@ public class UIBootstrap : MonoSingleton return false; } - public void OnGetWorldInfo(string msg) - { - Debug.Log("OnGetWorldInfo====" + msg); - GameManager.Instance.RemovePlayer(ulong.Parse(msg)); - } + public void OnLeaveRoomInfo(string msg) {