wewe
This commit is contained in:
parent
640bb4f529
commit
dbea88a61d
|
@ -28,6 +28,7 @@ public class Backpack : MonoBehaviour
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
if (GlobalFlag.isStartRehearsing) return;
|
||||||
if (Input.GetMouseButtonDown(1))
|
if (Input.GetMouseButtonDown(1))
|
||||||
{
|
{
|
||||||
time = 0.2f;
|
time = 0.2f;
|
||||||
|
|
|
@ -211,11 +211,13 @@ public class GameManager : MonoSingleton<GameManager>
|
||||||
{
|
{
|
||||||
if (hitInfo.collider.tag == "WRJ")
|
if (hitInfo.collider.tag == "WRJ")
|
||||||
{
|
{
|
||||||
UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
|
if (hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>() != null)
|
||||||
UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage;
|
{
|
||||||
UnmannedAerialVehicleUI.Instance.ShowButton();
|
UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
|
||||||
|
UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage;
|
||||||
DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true);
|
UnmannedAerialVehicleUI.Instance.ShowButton();
|
||||||
|
DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,8 +115,6 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void OnGetWorldInfo(string msg)
|
public void OnGetWorldInfo(string msg)
|
||||||
{
|
{
|
||||||
Debug.Log("OnGetWorldInfo====" + msg);
|
Debug.Log("OnGetWorldInfo====" + msg);
|
||||||
|
|
|
@ -269,10 +269,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var _unmannedAerialVehicle = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf);
|
var _unmannedAerialVehicle = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf);
|
||||||
if (_unmannedAerialVehicle.Count == 0)
|
if (_unmannedAerialVehicle.Count == 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -64,7 +64,6 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
|
||||||
/// <param name="isShow">是否显示</param>
|
/// <param name="isShow">是否显示</param>
|
||||||
public void CreateUI(UnmannedAerialVehicleManage unmannedAerialVehicleManage, bool isShow)
|
public void CreateUI(UnmannedAerialVehicleManage unmannedAerialVehicleManage, bool isShow)
|
||||||
{
|
{
|
||||||
Debug.Log("生成:" + unmannedAerialVehicleManage.transform.name);
|
|
||||||
if (unmannedAerialVehicleManage.equipmentCommon.deviceID.Length < 10) return;
|
if (unmannedAerialVehicleManage.equipmentCommon.deviceID.Length < 10) return;
|
||||||
RadioAngleView radioAngleView = radioAngleViews.Find(x => x.deviceID == unmannedAerialVehicleManage.equipmentCommon.deviceID);
|
RadioAngleView radioAngleView = radioAngleViews.Find(x => x.deviceID == unmannedAerialVehicleManage.equipmentCommon.deviceID);
|
||||||
if (radioAngleView)
|
if (radioAngleView)
|
||||||
|
|
Loading…
Reference in New Issue