yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

This commit is contained in:
账号名 2024-01-29 21:50:52 +08:00
parent 646dad2213 ec8e3dad6c
commit b1379f43f4
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -189,7 +189,7 @@ public class GameManager : MonoSingleton<GameManager>
spt.GetComponent<Camera>().cullingMask = TeacherLayer; spt.GetComponent<Camera>().cullingMask = TeacherLayer;
} }
//spt.GetComponent<Camera>().cullingMask &= ~(1 << 15); //spt.GetComponent<Camera>().cullingMask &= ~(1 << 15);
AdamSync.SyncCreateRoom.send2worldRequset += OnGetWorldInfo;
tenkokuModule.mainCamera = spt.transform; tenkokuModule.mainCamera = spt.transform;
AddPlayers(spt); AddPlayers(spt);
DeviceManager.Instance.OnInit(); DeviceManager.Instance.OnInit();
@ -206,7 +206,11 @@ public class GameManager : MonoSingleton<GameManager>
_ = SyncCreateRoom.SendMessageAsync(msg); _ = SyncCreateRoom.SendMessageAsync(msg);
} }
public void OnGetWorldInfo(string msg)
{
Debug.Log("OnGetWorldInfo====" + msg);
RemovePlayer(ulong.Parse(msg));
}
private void Update() private void Update()
{ {
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0" && Input.GetMouseButtonDown(0)) if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0" && Input.GetMouseButtonDown(0))
@ -382,8 +386,6 @@ public class GameManager : MonoSingleton<GameManager>
public async void CheckRoomState() public async void CheckRoomState()
{ {
RoomState roomState = await AsyncWebReq.Post<RoomState>(Url_UpdateRoomState + GlobalFlag.roomID + "&state=1", null); RoomState roomState = await AsyncWebReq.Post<RoomState>(Url_UpdateRoomState + GlobalFlag.roomID + "&state=1", null);
Debug.Log($"<color=red>GamemanagerRoomState={ roomState.message}</color>");
if (roomState.message == "success") if (roomState.message == "success")
{ {
GlobalFlag.isStartRehearsing = true; GlobalFlag.isStartRehearsing = true;
@ -572,6 +574,7 @@ public class GameManager : MonoSingleton<GameManager>
{ {
SyncCreateRoom.getroomusersRequset -= OnGetRoomUsers; SyncCreateRoom.getroomusersRequset -= OnGetRoomUsers;
SyncCreateRoom.send2roomRequset -= OnRoomInfo; SyncCreateRoom.send2roomRequset -= OnRoomInfo;
SyncCreateRoom.send2worldRequset -= OnGetWorldInfo;
//string _msg = "leaveroom "; //string _msg = "leaveroom ";
//_ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg); //_ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg);
} }

8
Assets/Zion/Scripts/Adam/UIBootstrap.cs
View File

@ -31,7 +31,7 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
traininginformations.Add(t); traininginformations.Add(t);
} }
AdamSync.SyncCreateRoom.leaveRoomRequset += OnLeaveRoomInfo; AdamSync.SyncCreateRoom.leaveRoomRequset += OnLeaveRoomInfo;
AdamSync.SyncCreateRoom.send2worldRequset += OnGetWorldInfo;
} }
@ -115,11 +115,7 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
return false; return false;
} }
public void OnGetWorldInfo(string msg)
{
Debug.Log("OnGetWorldInfo====" + msg);
GameManager.Instance.RemovePlayer(ulong.Parse(msg));
}
public void OnLeaveRoomInfo(string msg) public void OnLeaveRoomInfo(string msg)
{ {

1
Assets/Zion/Scripts/Adam/Utility/Sync/ContectServer.cs
View File

@ -56,7 +56,6 @@ namespace AdamSync
private void OnDisable() private void OnDisable()
{ {
Debug.Log("1212");
SyncCreateRoom.CloseClint(); SyncCreateRoom.CloseClint();
isLinkAgain = false; isLinkAgain = false;
} }