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

3

This commit is contained in:
YangHua 2023-11-22 17:15:05 +08:00
parent f0b21888a4
commit a26c485de2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Temp/Scripts/Taskpanel.cs
View File

@ -154,6 +154,8 @@ public class Taskpanel : MonoBehaviour
string _msg = "leaveroom "; string _msg = "leaveroom ";
_ = SyncCreateRoom.SendMessageAsync(_msg); _ = SyncCreateRoom.SendMessageAsync(_msg);
} }
if (GameManager.Instance.isPlayer)
SceneManager.LoadScene("SampleScene");
} }
@ -161,7 +163,6 @@ public class Taskpanel : MonoBehaviour
{ {
Debug.Log("Leaveroom"); Debug.Log("Leaveroom");
_ = SyncCreateRoom.SendMessageAsync($"send2room offline,{GlobalFlag.currentUser.user_id}"); _ = SyncCreateRoom.SendMessageAsync($"send2room offline,{GlobalFlag.currentUser.user_id}");
SceneManager.LoadScene("SampleScene");
} }
} }

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

@ -24,6 +24,7 @@ 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()
@ -46,7 +47,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), true); spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), isPlayer);
AddPlayers(spt); AddPlayers(spt);
ToolsBootstrap.Instance.SetCameraInfo(spt); ToolsBootstrap.Instance.SetCameraInfo(spt);
//0 red 1 blue //0 red 1 blue
@ -163,7 +164,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]), false); spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), !isPlayer);
AddPlayers(spt); AddPlayers(spt);
} }
break; break;
@ -201,7 +202,7 @@ public class GameManager : MonoSingleton<GameManager>
} }
break; break;
case "offline": case "offline":
break; break;
default: default:
break; break;
@ -237,7 +238,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]), 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.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);