Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
e34c22dc7b
|
@ -10,6 +10,7 @@ using Tenkoku.Core;
|
|||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
using UnityTemplateProjects;
|
||||
using static InterfaceManager;
|
||||
|
||||
public class GameManager : MonoSingleton<GameManager>
|
||||
|
@ -66,11 +67,13 @@ public class GameManager : MonoSingleton<GameManager>
|
|||
satelliteImagery.SetActive(false);
|
||||
postureBtn.onClick.AddListener(() =>
|
||||
{
|
||||
currentSpt.GetComponent<SimpleCameraController>().enabled = true;
|
||||
satelliteImagery.SetActive(false);
|
||||
ChangeView(0);
|
||||
});
|
||||
teacherBtn.onClick.AddListener(() =>
|
||||
{
|
||||
currentSpt.GetComponent<SimpleCameraController>().enabled = false;
|
||||
satelliteImagery.SetActive(true);
|
||||
ChangeView(2);
|
||||
});
|
||||
|
@ -468,13 +471,6 @@ public class GameManager : MonoSingleton<GameManager>
|
|||
uavm.groupId = bdxx;
|
||||
}
|
||||
}
|
||||
|
||||
if (uavm)
|
||||
{
|
||||
uavm.SetTipsColor();
|
||||
DroneViewDisplay.Instance.CreateUI(uavm, false);
|
||||
}
|
||||
|
||||
Debug.Log($"<color=yellow>是否是player{data.r3 == GlobalFlag.currentUser.user_id}</color>");
|
||||
device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para, data);
|
||||
device.GetComponent<EquipmentCommon>().deviceID = data.id;
|
||||
|
@ -482,7 +478,11 @@ public class GameManager : MonoSingleton<GameManager>
|
|||
{
|
||||
device.GetComponent<EquipmentCommon>().isPlayer = true;
|
||||
}
|
||||
|
||||
if (uavm)
|
||||
{
|
||||
uavm.SetTipsColor();
|
||||
DroneViewDisplay.Instance.CreateUI(uavm, false);
|
||||
}
|
||||
FormationManager.Instance.WhenSpawn();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue