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:
yulong 2023-11-22 17:21:33 +08:00
parent c2d0cb0182 861ecd1ba9
commit 1389cab1d9
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ public class GameManager : MonoSingleton<GameManager>
public DragController wxdDrag; public DragController wxdDrag;
public GameObject Teacher; public GameObject Teacher;
public GameObject student; public GameObject student;
public bool isPlayer = true;
public System.Collections.Generic.List<SyncPlayerTransform> players = new System.Collections.Generic.List<SyncPlayerTransform>(); public System.Collections.Generic.List<SyncPlayerTransform> players = new System.Collections.Generic.List<SyncPlayerTransform>();
// Start is called before the first frame update // Start is called before the first frame update
private void Awake() private void Awake()
@ -47,7 +46,7 @@ public class GameManager : MonoSingleton<GameManager>
spt.gameObject.SetActive(true); spt.gameObject.SetActive(true);
spt.gameObject.transform.position = spawnPos.position; spt.gameObject.transform.position = spawnPos.position;
spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles; spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles;
spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), isPlayer); spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), true);
AddPlayers(spt); AddPlayers(spt);
ToolsBootstrap.Instance.SetCameraInfo(spt); ToolsBootstrap.Instance.SetCameraInfo(spt);
//0 red 1 blue //0 red 1 blue
@ -164,7 +163,7 @@ public class GameManager : MonoSingleton<GameManager>
spt.gameObject.SetActive(true); spt.gameObject.SetActive(true);
spt.gameObject.transform.position = spawnPos.position; spt.gameObject.transform.position = spawnPos.position;
spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles; spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles;
spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), !isPlayer); spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), false);
AddPlayers(spt); AddPlayers(spt);
} }
break; break;
@ -238,7 +237,7 @@ public class GameManager : MonoSingleton<GameManager>
{ {
SyncPlayerTransform spt = Instantiate(playerTransformPrefab); SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
spt.gameObject.SetActive(true); spt.gameObject.SetActive(true);
spt.SetPlayerInfo(ulong.Parse(userInfo[0]), userInfo[1], ulong.Parse(userInfo[2]), !isPlayer); spt.SetPlayerInfo(ulong.Parse(userInfo[0]), userInfo[1], ulong.Parse(userInfo[2]), false);
spt.transform.position = new Vector3(spawnPos.position.x + index * 0.5f, spawnPos.position.y, spawnPos.position.z + index * 0.5f); 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; spt.transform.eulerAngles = spawnPos.eulerAngles;
AddPlayers(spt); AddPlayers(spt);

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

@ -27,8 +27,20 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms; AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
AdamSync.SyncCreateRoom.getroomusersRequset += OnGetRoomsUsers; AdamSync.SyncCreateRoom.getroomusersRequset += OnGetRoomsUsers;
AdamSync.SyncCreateRoom.send2roomRequset += OnGetRoomsInfo; AdamSync.SyncCreateRoom.send2roomRequset += OnGetRoomsInfo;
AdamSync.SyncCreateRoom.send2roomRequset += OnOtherPlayerOnline;
} }
public void OnOtherPlayerOnline(string msg)
{
string[] data = msg.Split(',');
Debug.Log(data[1]);
if (data[0] == "offline")
{
GameManager.Instance.RemovePlayer(ulong.Parse(data[1]));
string _msg = "leaveroom ";
_ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg);
}
}
public async void GetSceneData(string roomId) public async void GetSceneData(string roomId)
{ {