Compare commits

...

2 Commits

Author SHA1 Message Date
yulong 0656d005df Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-01 13:44:27 +08:00
yulong fced58f6ee 2 2024-02-01 13:44:17 +08:00
3 changed files with 83 additions and 75 deletions

View File

@ -669,6 +669,7 @@ MonoBehaviour:
FrequencyBand: {fileID: 7049978149805136275}
SurveillanceFrequencyBand: {fileID: 6513129680526216908}
gamePos: {fileID: 392167392884716949}
gamemap: {fileID: 6311100753636855780}
attackColliders1: []
currentCollider: {fileID: 0}
layerMask:
@ -964,10 +965,16 @@ PrefabInstance:
- target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
type: 3}
propertyPath: m_Layer
value: 16
value: 15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3}
--- !u!1 &6311100753636855780 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
type: 3}
m_PrefabInstance: {fileID: 2480616969672327800}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7888230650824579511 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
@ -1903,6 +1910,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
--- !u!4 &5512074156260461627 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
type: 3}
m_PrefabInstance: {fileID: 2498570764477447715}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4610455937839310686 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@ -1915,12 +1928,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &5512074156260461627 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
type: 3}
m_PrefabInstance: {fileID: 2498570764477447715}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5514169232507334764
PrefabInstance:
m_ObjectHideFlags: 0
@ -2372,24 +2379,24 @@ PrefabInstance:
- {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
- {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
--- !u!1 &6513129680526216908 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6513129680526216909 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8305030183727307535 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1885673261310054197 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6599196944350286780 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -2426,6 +2433,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1885673261310054197 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5373553619706430310 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -2462,18 +2481,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6513129680526216908 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6513129680526216909 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 5514169232507334764}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8108767849280698377
PrefabInstance:
m_ObjectHideFlags: 0
@ -2574,7 +2581,7 @@ PrefabInstance:
- target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
type: 3}
propertyPath: m_Layer
value: 15
value: 16
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3}
@ -3046,6 +3053,24 @@ PrefabInstance:
- {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
- {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
--- !u!1 &7049978149805136275 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 8589356912259884851}
m_PrefabAsset: {fileID: 0}
--- !u!224 &7049978149805136274 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 8589356912259884851}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5257004626334551120 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 8589356912259884851}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6926759985235920099 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -3118,24 +3143,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7049978149805136275 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 8589356912259884851}
m_PrefabAsset: {fileID: 0}
--- !u!224 &7049978149805136274 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 8589356912259884851}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5257004626334551120 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 8589356912259884851}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4193460165237867982 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b,

View File

@ -157,32 +157,31 @@ public class RadarManger : MonoBehaviour
onlyOne = false;
DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, minCamera, rawImage);
}
//Deadzone();//雷达盲区
Deadzone();//雷达盲区
}
/// <summary>
/// 雷达盲区让目标消失在地图上
/// </summary>
//private void Deadzone()
//{
// if (float.Parse(NearBlindArea)>0)
// {
// Collider[] colliders = Physics.OverlapSphere(transform.position,float.Parse(NearBlindArea));
// for (int i = 0; i < colliders.Length; i++)
// {
// if (colliders[i].transform.gameObject.tag=="WRJ")
// {
// Debug.Log("进来了" + Vector3.Distance(transform.position, colliders[i].transform.position));
// UnmannedAerialVehicleManage unmannedAerialVehicle =colliders[i].GetComponent<UnmannedAerialVehicleManage>();
// if (unmannedAerialVehicle)
// {
// GameObject game = unmannedAerialVehicle.gamePos;
// Destroy(game);
// }
// }
// }
// }
//}
private void Deadzone()
{
if (float.Parse(NearBlindArea) > 0)
{
Collider[] colliders = Physics.OverlapSphere(transform.position, float.Parse(NearBlindArea));
for (int i = 0; i < colliders.Length; i++)
{
if (colliders[i].transform.gameObject.tag == "WRJ")
{
Debug.Log("进来了" + Vector3.Distance(transform.position, colliders[i].transform.position));
UnmannedAerialVehicleManage unmannedAerialVehicle = colliders[i].GetComponent<UnmannedAerialVehicleManage>();
if (unmannedAerialVehicle)
{
GameObject game = unmannedAerialVehicle.gamemap;
Destroy(game);
}
}
}
}
}
#region
/// <summary>
/// 导条变化调用

View File

@ -161,11 +161,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
public GameObject SurveillanceFrequencyBand;
/// <summary>
/// 显示地图上的位置
/// 显示频谱地图上的位置
/// </summary>
public GameObject gamePos;
/// <summary>
/// 显示在雷达上的位置
/// </summary>
public GameObject gamemap;
// Start is called before the first frame update
void Start()
{