Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
0656d005df
|
@ -113,6 +113,10 @@ public class RadarManger : MonoBehaviour
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public float detectionRadius = 5f; //
|
public float detectionRadius = 5f; //
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 近盲区
|
||||||
|
/// </summary>
|
||||||
|
public float nearBlindArea = 5f; //
|
||||||
|
/// <summary>
|
||||||
/// 批量标处理能力
|
/// 批量标处理能力
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int NumberOfProbes = 0;
|
public int NumberOfProbes = 0;
|
||||||
|
@ -258,12 +262,13 @@ public class RadarManger : MonoBehaviour
|
||||||
break;
|
break;
|
||||||
case "探测距离:":
|
case "探测距离:":
|
||||||
DetectionRange = weaponitemone[i].para_value;
|
DetectionRange = weaponitemone[i].para_value;
|
||||||
detectionRadius = float.Parse(DetectionRange) * 200;
|
detectionRadius = float.Parse(DetectionRange) * 1000;
|
||||||
minCamera.orthographicSize = detectionRadius;
|
minCamera.orthographicSize = detectionRadius;
|
||||||
break;
|
break;
|
||||||
case "近盲区:":
|
case "近盲区:":
|
||||||
NearBlindArea = weaponitemone[i].para_value;
|
NearBlindArea = weaponitemone[i].para_value;
|
||||||
Debug.LogError(NearBlindArea);
|
Debug.LogError(NearBlindArea);
|
||||||
|
nearBlindArea = float.Parse(DetectionRange);
|
||||||
break;
|
break;
|
||||||
case "批量标处理能力:":
|
case "批量标处理能力:":
|
||||||
BatchStandardProcessingCapability = weaponitemone[i].para_value;
|
BatchStandardProcessingCapability = weaponitemone[i].para_value;
|
||||||
|
@ -329,8 +334,8 @@ public class RadarManger : MonoBehaviour
|
||||||
if (unmannedAerialVehicle)
|
if (unmannedAerialVehicle)
|
||||||
{
|
{
|
||||||
attackColliders1.Add(colliders[i]);
|
attackColliders1.Add(colliders[i]);
|
||||||
LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false && x.lasertime <= 0));
|
LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null&& x.isLasing == false&& x.lasertime <= 0&& Vector3.Distance(transform.position, x.transform.position) > nearBlindArea));
|
||||||
//Microwaveweapon microwaveweapon = Microwaveweapon.MicrowaveweaponList.Find(x => (x != null && x.ismicow == false));
|
Microwaveweapon microwaveweapon = Microwaveweapon.MicrowaveweaponList.Find(x => x != null && x.ismicow == false && Vector3.Distance(transform.position, x.transform.position) > nearBlindArea);
|
||||||
if (laserFireControlPlatformManger)
|
if (laserFireControlPlatformManger)
|
||||||
{
|
{
|
||||||
laserFireControlPlatformManger.lasertime = laserFireControlPlatformManger.storageIntervalTime+1.5f;
|
laserFireControlPlatformManger.lasertime = laserFireControlPlatformManger.storageIntervalTime+1.5f;
|
||||||
|
@ -338,12 +343,12 @@ public class RadarManger : MonoBehaviour
|
||||||
laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform;
|
laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform;
|
||||||
laserFireControlPlatformManger.Lasing();
|
laserFireControlPlatformManger.Lasing();
|
||||||
}
|
}
|
||||||
//else if (microwaveweapon)
|
else if (microwaveweapon)
|
||||||
//{
|
{
|
||||||
// microwaveweapon.ismicow = true;
|
microwaveweapon.ismicow = true;
|
||||||
// microwaveweapon.miceopos = unmannedAerialVehicle.transform;
|
microwaveweapon.miceopos = unmannedAerialVehicle.transform;
|
||||||
// microwaveweapon.Orientation();
|
microwaveweapon.Orientation();
|
||||||
//}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue