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

Compare commits

base: yulong:e5c6733f60d07d1157f21b41fc795ad4fa53a168
Branches Tags
yulong:master
..
compare: yulong:280475be0cd4efc88d6d204629518de7b7b3242e
Branches Tags
yulong:master

No commits in common. "e5c6733f60d07d1157f21b41fc795ad4fa53a168" and "280475be0cd4efc88d6d204629518de7b7b3242e" have entirely different histories.
e5c6733f60 ... 280475be0c

5 changed files with 11 additions and 8 deletions
Show Stats Expand all files Collapse all files

1
Assets/Temp/Scripts/Backpack.cs
View File

@ -28,7 +28,6 @@ public class Backpack : MonoBehaviour
void Update()
{
if (GlobalFlag.isStartRehearsing) return;
if (Input.GetMouseButtonDown(1))
{
time = 0.2f;

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

@ -211,13 +211,11 @@ public class GameManager : MonoSingleton<GameManager>
{
if (hitInfo.collider.tag == "WRJ")
{
if (hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>() != null)
{
UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage;
UnmannedAerialVehicleUI.Instance.ShowButton();
DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true);
}
UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage;
UnmannedAerialVehicleUI.Instance.ShowButton();
DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true);
}
}
}

2
Assets/Zion/Scripts/Adam/UIBootstrap.cs
View File

@ -115,6 +115,8 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
return false;
}
public void OnGetWorldInfo(string msg)
{
Debug.Log("OnGetWorldInfo====" + msg);

3
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -269,7 +269,10 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
}
break;
}
}
var _unmannedAerialVehicle = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf);
if (_unmannedAerialVehicle.Count == 0)
{

1
Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
View File

@ -64,6 +64,7 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
/// <param name="isShow">是否显示</param>
public void CreateUI(UnmannedAerialVehicleManage unmannedAerialVehicleManage, bool isShow)
{
Debug.Log("生成：" + unmannedAerialVehicleManage.transform.name);
if (unmannedAerialVehicleManage.equipmentCommon.deviceID.Length < 10) return;
RadioAngleView radioAngleView = radioAngleViews.Find(x => x.deviceID == unmannedAerialVehicleManage.equipmentCommon.deviceID);
if (radioAngleView)