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:
YangHua 2024-02-02 12:13:20 +08:00
parent 12e0809d4d 442758cd05
commit 66274c1bc0
6 changed files with 106 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
View File

@ -536,7 +536,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 211272343189438365}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 60, z: 0}
m_LocalPosition: {x: 0, y: 50, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3977472425108262602}
@ -10018,6 +10018,7 @@ MonoBehaviour:
AzimuthBeamwidth: 2
PitchBeamwidth: 13
detectionRadius: 3000
nearBlindArea: 5
NumberOfProbes: 31
minCamera: {fileID: 1822639428928488196}
imageprs: {fileID: 8234605787508067104}

107
Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
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,

2
Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 480111842}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 50.889, z: -0}
m_LocalPosition: {x: -0, y: 50, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7107351192811671799}

35
Assets/Zion/Scenes/Contingenc_yediting_panl.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.16789001, g: 0.3080347, b: 0.6423777, a: 1}
m_IndirectSpecularColor: {r: 0.16789019, g: 0.30791733, b: 0.6417328, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -348,7 +348,7 @@ PrefabInstance:
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -70
value: -195
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
@ -33791,12 +33791,12 @@ PrefabInstance:
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 75
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -820
value: -695
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
@ -74971,6 +74971,11 @@ PrefabInstance:
propertyPath: m_Name
value: ModelItem
objectReference: {fileID: 0}
- target: {fileID: 7504021919138649143, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_Text
value: "\u8F66\u8F861"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 45f26f52bed0c2f48980e3679f72d225, type: 3}
--- !u!224 &150123909 stripped
@ -114028,12 +114033,12 @@ PrefabInstance:
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 200
value: 75
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -195
value: -320
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
@ -623456,7 +623461,7 @@ PrefabInstance:
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -320
value: -195
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
@ -927386,7 +927391,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 454892781
randSeed: 97504203
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@ -928521,7 +928526,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 870}
m_SizeDelta: {x: 0, y: 900}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1823088602
MonoBehaviour:
@ -1001521,7 +1001526,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 25}
m_SizeDelta: {x: 0, y: 900}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1958044294
MonoBehaviour:
@ -1004687,12 +1004692,12 @@ PrefabInstance:
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 200
value: 75
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -695
value: -820
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
@ -1075665,12 +1075670,12 @@ PrefabInstance:
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 75
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -195
value: -70
objectReference: {fileID: 0}
- target: {fileID: 7504021917712410616, guid: 45f26f52bed0c2f48980e3679f72d225,
type: 3}
@ -1090138,7 +1090143,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1370}
m_SizeDelta: {x: 0, y: 1400}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2126916401
MonoBehaviour:

43
Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
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>
/// 导条变化调用

8
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
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()
{