diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 83569447..abf4c5d5 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -133,7 +133,8 @@ public class EquipmentCommon : MonoBehaviour replaceInfoDic.Add("device_name", equipmentCommon.equipmentType); replaceInfoDic.Add("para_list", paraListJson); replaceInfoDic.Add("r1", $"{transform.position.x},{transform.position.y},{transform.position.z},{transform.eulerAngles.x},{transform.eulerAngles.y},{transform.eulerAngles.z}"); - replaceInfoDic.Add("r2", ((int)gameObject.GetComponent().wrjModel).ToString()); + if (gameObject.GetComponent()) + replaceInfoDic.Add("r2", ((int)gameObject.GetComponent().wrjModel).ToString()); StartCoroutine(AsyncWebReq.PostData2(Url_AddDeviceAndGetDeviceId, replaceInfoDic, ResultsInfo => { ReturnDeviceID returnID = JsonConvert.DeserializeObject(ResultsInfo); diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index b3a9f2b2..6cfafd6c 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -145,6 +145,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// 激光火炮打击时间 /// public static float lasertime; + public float lasertimes; /// /// 判断物体是否在相机里面 /// @@ -187,6 +188,10 @@ public class LaserFireControlPlatformManger : MonoBehaviour void Update() { + if (lasertime>0) + { + lasertime -= Time.deltaTime; + } //if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0"&&Input.GetMouseButtonDown(0)) //{ // if (!EventSystem.current.IsPointerOverGameObject()) @@ -195,6 +200,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour // Front = true; // } //} + if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0" && Input.GetMouseButtonDown(0)) { Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); @@ -298,6 +304,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour case "储能间隔时间:": StorageIntervalTime = weaponitemone[i].para_value; lasertime = float.Parse(StorageIntervalTime); + lasertimes = float.Parse(StorageIntervalTime); break; case "毁伤目标累积作用时间:": CumulativeActionTimeOfDamageTarget = weaponitemone[i].para_value; @@ -549,6 +556,10 @@ public class LaserFireControlPlatformManger : MonoBehaviour OuterLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 OuterLaserlineRenderer.SetPosition(1, LaserPoint.transform.position); // 设置线段终点为目标点 } + if (lasertimes!=0) + { + lasertime = lasertimes; + } isLasing = false; } diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index d67be88a..11240118 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -121,7 +121,7 @@ public class RadarManger : MonoBehaviour /// /// 计时火炮蓄能时间 /// - public float radartime; + public float radartime=0; void Start() { Mincamera = GameObject.Find("Minimap Camera").GetComponent(); @@ -305,19 +305,18 @@ public class RadarManger : MonoBehaviour UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent(); if (unmannedAerialVehicle) { - radartime += Time.deltaTime; - if (radartime>=LaserFireControlPlatformManger.lasertime) + if (radartime == LaserFireControlPlatformManger.lasertime) { Debug.Log("今来了"); LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); - radartime = 0; - if (laserFireControlPlatformManger) + if (laserFireControlPlatformManger) { laserFireControlPlatformManger.isLasing = true; //Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name); laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; laserFireControlPlatformManger.Crosshair(); laserFireControlPlatformManger.Lasing(); + radartime = 0; } } number++; diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index cc5973db..c2a1e220 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -450,9 +450,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour } ///根据风得速度改变无人机得速度 - FireSpeed = float.Parse(maximumFlyingSpeed) / int.Parse(currentSceneInfo.EnvWindSpeed); - ///如果风速大于6级,无人机停止飞行 - if (int.Parse(currentSceneInfo.EnvWindSpeed) > 6) + FireSpeed = float.Parse(maximumFlyingSpeed) / float.Parse(currentSceneInfo.EnvWindSpeed); + /////如果风速大于6级,无人机停止飞行 + if (float.Parse(currentSceneInfo.EnvWindSpeed) * 10 > 6) { FireSpeed = 0; }