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:
账号名 2024-01-29 15:46:24 +08:00
parent 9f074ec875 e5c6733f60
commit 2e4373b2d2
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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);
}
} }
} }
} }

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

@ -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);

4
Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
View File

@ -190,7 +190,7 @@ public class RadarManger : MonoBehaviour
{ {
if (equipmentCommon.isPlayer && timerCoroutine == null) if (equipmentCommon.isPlayer && timerCoroutine == null)
{ {
timerCoroutine = StartCoroutine(Timer()); //timerCoroutine = StartCoroutine(Timer());
isTimerRunning = true; isTimerRunning = true;
} }
} }
@ -239,7 +239,7 @@ public class RadarManger : MonoBehaviour
break; break;
case "探测距离:": case "探测距离:":
DetectionRange = weaponitemone[i].para_value; DetectionRange = weaponitemone[i].para_value;
detectionRadius = float.Parse(DetectionRange) * 100; detectionRadius = float.Parse(DetectionRange) * 200;
minCamera.orthographicSize = detectionRadius; minCamera.orthographicSize = detectionRadius;
break; break;
case "近盲区:": case "近盲区:":

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

@ -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)
{ {

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

@ -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)