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 2024-03-08 15:41:30 +08:00
parent fca485cfdf d899820158
commit e34c22dc7b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ using Tenkoku.Core;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
using UnityTemplateProjects;
using static InterfaceManager; using static InterfaceManager;
public class GameManager : MonoSingleton<GameManager> public class GameManager : MonoSingleton<GameManager>
@ -66,11 +67,13 @@ public class GameManager : MonoSingleton<GameManager>
satelliteImagery.SetActive(false); satelliteImagery.SetActive(false);
postureBtn.onClick.AddListener(() => postureBtn.onClick.AddListener(() =>
{ {
currentSpt.GetComponent<SimpleCameraController>().enabled = true;
satelliteImagery.SetActive(false); satelliteImagery.SetActive(false);
ChangeView(0); ChangeView(0);
}); });
teacherBtn.onClick.AddListener(() => teacherBtn.onClick.AddListener(() =>
{ {
currentSpt.GetComponent<SimpleCameraController>().enabled = false;
satelliteImagery.SetActive(true); satelliteImagery.SetActive(true);
ChangeView(2); ChangeView(2);
}); });
@ -468,13 +471,6 @@ public class GameManager : MonoSingleton<GameManager>
uavm.groupId = bdxx; uavm.groupId = bdxx;
} }
} }
if (uavm)
{
uavm.SetTipsColor();
DroneViewDisplay.Instance.CreateUI(uavm, false);
}
Debug.Log($"<color=yellow>是否是player{data.r3 == GlobalFlag.currentUser.user_id}</color>"); Debug.Log($"<color=yellow>是否是player{data.r3 == GlobalFlag.currentUser.user_id}</color>");
device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para, data); device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para, data);
device.GetComponent<EquipmentCommon>().deviceID = data.id; device.GetComponent<EquipmentCommon>().deviceID = data.id;
@ -482,7 +478,11 @@ public class GameManager : MonoSingleton<GameManager>
{ {
device.GetComponent<EquipmentCommon>().isPlayer = true; device.GetComponent<EquipmentCommon>().isPlayer = true;
} }
if (uavm)
{
uavm.SetTipsColor();
DroneViewDisplay.Instance.CreateUI(uavm, false);
}
FormationManager.Instance.WhenSpawn(); FormationManager.Instance.WhenSpawn();
} }