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

Compare commits

base: yulong:3a4c37ef1c3ca9c25b800405fe958006459aa505
Branches Tags
yulong:master
..
compare: yulong:56692e024431a6cd9f0458ed0dfd403df01dc22f
Branches Tags
yulong:master

No commits in common. "3a4c37ef1c3ca9c25b800405fe958006459aa505" and "56692e024431a6cd9f0458ed0dfd403df01dc22f" have entirely different histories.
3a4c37ef1c ... 56692e0244

2 changed files with 4 additions and 3075 deletions
Show Stats Expand all files Collapse all files

3074
Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
View File

File diff suppressed because it is too large Load Diff

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

@ -220,6 +220,7 @@ public class GameManager : MonoSingleton<GameManager>
{ {
yield return new WaitForSeconds(0.5f); yield return new WaitForSeconds(0.5f);
string[] data = msg.Split(','); string[] data = msg.Split(',');
//Debug.Log($"<color=green>{data[0]}+{data[1]}</color>");
switch (data[0]) switch (data[0])
{ {
case "online": case "online":
@ -227,9 +228,11 @@ public class GameManager : MonoSingleton<GameManager>
if (!userIds.Contains(userId)) if (!userIds.Contains(userId))
{ {
SyncPlayerTransform spt = Instantiate(playerTransformPrefab); SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//0 red 1 blue //0 red 1 blue
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0") if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
{ {
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
spt.gameObject.transform.position = redSpawnPos.position; spt.gameObject.transform.position = redSpawnPos.position;
spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles; spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles;
} }
@ -240,7 +243,7 @@ public class GameManager : MonoSingleton<GameManager>
} }
spt.gameObject.SetActive(true); spt.gameObject.SetActive(true);
spt.SetPlayerInfo(userId, data[2], ulong.Parse(data[3]), false); spt.SetPlayerInfo(userId, data[2], ulong.Parse(data[3]), false);
//spt.GetComponent<Camera>().cullingMask &= ~(1 << 15); spt.GetComponent<Camera>().cullingMask &= ~(1 << 15);
AddPlayers(spt); AddPlayers(spt);
} }
break; break;