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:
yulong 2024-01-27 16:30:55 +08:00
parent c26236e7e3 bd9202641f
commit b6272794b1
10 changed files with 28950 additions and 25688 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Assets/GameAssets/Prefebs/Models/WRJSetMenu.prefab
View File

@ -535,6 +535,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7828191146020959853}
m_MethodName: SwitchModelScale
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &7828191145835787469
GameObject:
m_ObjectHideFlags: 0
@ -563,16 +574,16 @@ RectTransform:
m_GameObject: {fileID: 7828191145835787469}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 7828191145744498793}
- {fileID: 7828191145983482009}
m_Father: {fileID: 7828191146020959760}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 80, y: -195}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7828191145835787465
@ -677,6 +688,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7828191146020959853}
m_MethodName: SwitchModelScale
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &7828191145844941069
GameObject:
m_ObjectHideFlags: 0
@ -874,17 +896,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_MethodName: SetWRJWayPoint
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7828191146020959853}
m_MethodName: GetRouteSettings
m_Mode: 6
@ -896,6 +907,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 7828191146020959853}
m_MethodName: SwitchModelScale
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &7828191145925431773
GameObject:
m_ObjectHideFlags: 0
@ -1049,10 +1071,10 @@ GameObject:
m_Component:
- component: {fileID: 7828191146020959760}
- component: {fileID: 7828191146020959854}
- component: {fileID: 7828191146020959853}
- component: {fileID: 7828191146020959761}
- component: {fileID: 7828191146020959852}
- component: {fileID: 7828191146020959855}
- component: {fileID: 7828191146020959853}
- component: {fileID: 729007810}
m_Layer: 5
m_Name: WRJSetMenu
m_TagString: Untagged
@ -1084,7 +1106,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 163.60376, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7828191146020959854
CanvasRenderer:
@ -1094,6 +1116,25 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7828191146020959763}
m_CullTransparentMesh: 0
--- !u!114 &7828191146020959853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7828191146020959763}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 553d6fe9e2be1ee448fbaa6b5a91ac39, type: 3}
m_Name:
m_EditorClassIdentifier:
unmannedAerialVehicleManage: {fileID: 0}
btnTheOpportuneMoment: {fileID: 7828191146970283770}
btnBeOnTheAlertAgainst: {fileID: 7828191145763698017}
btnAttack: {fileID: 7828191147017850482}
btnRouteSettings: {fileID: 7828191145920499402}
btnFrequencyBand: {fileID: 5277965304781856079}
btnSurveillanceFrequencyBand: {fileID: 2396476934594705758}
--- !u!114 &7828191146020959761
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1148,7 +1189,7 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!114 &7828191146020959855
--- !u!114 &729007810
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1160,21 +1201,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!114 &7828191146020959853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7828191146020959763}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 553d6fe9e2be1ee448fbaa6b5a91ac39, type: 3}
m_Name:
m_EditorClassIdentifier:
unmannedAerialVehicleManage: {fileID: 0}
--- !u!1 &7828191146119003982
GameObject:
m_ObjectHideFlags: 0
@ -2006,6 +2034,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7828191146020959853}
m_MethodName: SwitchModelScale
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &7828191147017850484
GameObject:
m_ObjectHideFlags: 0
@ -2147,6 +2186,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7828191146020959853}
m_MethodName: SwitchModelScale
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &7828191147262436565
GameObject:
m_ObjectHideFlags: 0

25692
Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
View File

File diff suppressed because it is too large Load Diff

28439
Assets/GameAssets/Prefebs/Models/moder/无人机List（30台备份）.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/GameAssets/Prefebs/Models/moder/无人机List（30台备份）.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 55062d07a0b2669459b062f27bdbb6d3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

262
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
m_IndirectSpecularColor: {r: 0.16234323, g: 0.30648175, b: 0.6709441, a: 1}
m_IndirectSpecularColor: {r: 0.16234416, g: 0.3060211, b: 0.6684391, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -37535,6 +37535,46 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 147647011}
m_Modifications:
- target: {fileID: 403378835674984590, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 403378835674984590, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 403378835674984590, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 403378835674984590, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395481902555999491, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395481902555999491, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395481902555999491, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395481902555999491, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698016, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMin.y
@ -37555,96 +37595,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 729007802}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SwitchModelScale
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_IntArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145763698017, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 729007802}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SwitchModelScale
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7828191145835787467, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@ -37657,17 +37607,12 @@ PrefabInstance:
objectReference: {fileID: 1436809533}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SwitchSet2DMap
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
@ -37680,11 +37625,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SwitchModelScale
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
@ -37692,12 +37632,37 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument
value: 0
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 729007802}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: GetRouteSettings
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SwitchSet2DMap
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7828191145920499405, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
@ -37783,12 +37748,12 @@ PrefabInstance:
- target: {fileID: 7828191146020959760, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -11.5
objectReference: {fileID: 0}
- target: {fileID: 7828191146020959760, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_SizeDelta.x
value: 163.60376
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191146020959760, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
@ -37830,40 +37795,10 @@ PrefabInstance:
propertyPath: m_Name
value: WRJSetMenu
objectReference: {fileID: 0}
- target: {fileID: 7828191146020959763, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
- target: {fileID: 7828191146020959852, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7828191146970283770, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7828191146970283770, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7828191146970283770, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7828191146970283770, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 729007802}
- target: {fileID: 7828191146970283770, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SwitchModelScale
objectReference: {fileID: 0}
- target: {fileID: 7828191146970283770, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
propertyPath: m_ChildForceExpandHeight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191146970283773, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
@ -37885,41 +37820,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 729007802}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: SwitchModelScale
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_IntArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850482, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7828191147017850485, guid: 49c7b765b5b8a8845aad4c0acd9753a8,
type: 3}
propertyPath: m_AnchorMin.y
@ -64331,7 +64231,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 14196796
randSeed: 8637671
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@ -88426,7 +88326,7 @@ PrefabInstance:
- target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
type: 3}
@ -89466,7 +89366,7 @@ PrefabInstance:
- target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9,
type: 3}
@ -91124,7 +91024,7 @@ PrefabInstance:
- target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e,
type: 3}

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

@ -199,6 +199,7 @@ public class GameManager : MonoSingleton<GameManager>
{
UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage;
UnmannedAerialVehicleUI.Instance.ShowButton();
DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage,true);
}

7
Assets/Zion/Scripts/Adam/WRJManager.cs
View File

@ -36,10 +36,6 @@ namespace Assets.Zion.Scripts.Adam
wrjMenuSetPanel.anchoredPosition = new Vector3(posItem.x + 100f, posItem.y, posItem.z);
}
}
else
{
wrjMenuSetPanel.localScale = Vector3.zero;
}
}
else
{
@ -49,6 +45,9 @@ namespace Assets.Zion.Scripts.Adam
}
public Vector3 GetScreenPosition(GameObject target)
{
float width = canvasRect.sizeDelta.x;

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

@ -4,14 +4,11 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using AdamThinkDevicesData;
using AdamSync;
using System.Linq;
using static InterfaceManager;
using Newtonsoft.Json;
using PData;
using TMPro;
using UnityEngine.UIElements;
using System.Security.Permissions;
using UnityEngine.UI;
public enum WRJModel
{
@ -75,7 +72,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
/// 所有子物体无人机
/// </summary>
public List<UnmannedAerialVehicle> unmannedAerialVehicles = new List<UnmannedAerialVehicle>();
/// <summary>
/// 频段设置
/// </summary>
public List<Toggle> togFrequencyBands=new List<Toggle>();
/// <summary>
/// 探测频段设置
/// </summary>
public List<Toggle> togSurveillanceFrequencyBands = new List<Toggle>();
/// <summary>
/// 线预制体
/// </summary>
@ -111,7 +115,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
/// 电子侦察无人机
/// </summary>
public Camera dzWRJCamera;
#region 无人机数据
/// <summary>
/// 续航时间
@ -147,6 +151,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
public string opticalReconnaissanceCapability;
#endregion
/// <summary>
/// 频段设置面板
/// </summary>
public GameObject FrequencyBand;
/// <summary>
/// 侦察频段设置面板
/// </summary>
public GameObject SurveillanceFrequencyBand;
// Start is called before the first frame update
@ -162,7 +174,27 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
//Formation(1);//默认阵型
// 订阅布尔值变化事件
OnActivationChanged += OnActivationChangedHandler;
for(int i = 0;i<togFrequencyBands.Count;i++)
{
togFrequencyBands[i].onValueChanged.AddListener((ison) =>
{
if (ison)
{
dataLinkCommunicationFrequency = togFrequencyBands[i].transform.name;
}
});
}
for (int i = 0; i < togSurveillanceFrequencyBands.Count; i++)
{
togSurveillanceFrequencyBands[i].onValueChanged.AddListener((ison) =>
{
if (ison)
{
electronicReconnaissanceCapability = togSurveillanceFrequencyBands[i].transform.name;
}
});
}
}
[ContextMenu("Test")]

66
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleUI.cs
View File

@ -10,6 +10,23 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
/// 选中的无人机编队
/// </summary>
public UnmannedAerialVehicleManage unmannedAerialVehicleManage;
/// <summary>
/// 待机按钮
/// </summary>
public Button btnTheOpportuneMoment;
/// <summary>
/// 警戒按钮
/// </summary>
public Button btnBeOnTheAlertAgainst;
/// <summary>
/// 攻击目标
/// </summary>
public Button btnAttack;
/// <summary>
/// 航线设置
/// </summary>
public Button btnRouteSettings;
/// <summary>
/// 自身频段设置
/// </summary>
@ -19,6 +36,7 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
/// </summary>
public Button btnSurveillanceFrequencyBand;
public void Awake()
{
Instance = this;
@ -27,7 +45,18 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
// Start is called before the first frame update
void Start()
{
btnFrequencyBand.onClick.AddListener(() => {
if (unmannedAerialVehicleManage)
{
unmannedAerialVehicleManage.FrequencyBand.SetActive(true);
}
});
btnSurveillanceFrequencyBand.onClick.AddListener(() => {
if (unmannedAerialVehicleManage)
{
unmannedAerialVehicleManage.SurveillanceFrequencyBand.SetActive(true);
}
});
}
/// <summary>
@ -41,7 +70,39 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
unmannedAerialVehicleManage.Formation(number);
}
}
public void ShowButton()
{
if (unmannedAerialVehicleManage)
{
switch (unmannedAerialVehicleManage.wrjModel)
{
case WRJModel.光学无人机:
btnTheOpportuneMoment.gameObject.SetActive(true);
btnBeOnTheAlertAgainst.gameObject.SetActive(true);
btnAttack.gameObject.SetActive(true);
btnRouteSettings.gameObject.SetActive(true);
btnFrequencyBand.gameObject.SetActive(true);
btnSurveillanceFrequencyBand.gameObject.SetActive(false);
break;
case WRJModel.电子侦察无人机:
btnTheOpportuneMoment.gameObject.SetActive(true);
btnBeOnTheAlertAgainst.gameObject.SetActive(true);
btnAttack.gameObject.SetActive(true);
btnRouteSettings.gameObject.SetActive(true);
btnFrequencyBand.gameObject.SetActive(true);
btnSurveillanceFrequencyBand.gameObject.SetActive(true);
break;
case WRJModel.自杀式无人机:
btnTheOpportuneMoment.gameObject.SetActive(true);
btnBeOnTheAlertAgainst.gameObject.SetActive(true);
btnAttack.gameObject.SetActive(true);
btnRouteSettings.gameObject.SetActive(false);
btnFrequencyBand.gameObject.SetActive(false);
btnSurveillanceFrequencyBand.gameObject.SetActive(false);
break;
}
}
}
/// <summary>
/// 航线设置
/// </summary>
@ -65,6 +126,7 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
}
}
public void SwitchModelScale(float scale)
{
transform.localScale = new Vector3(scale, scale, scale);

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

@ -131,7 +131,7 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
}
}
}
RenderTexture renderTexture = renderTextures.Find(x => x.name == deviceID);
RenderTexture renderTexture = renderTextures.Find(x => x.name.Contains(deviceID));
if (renderTexture)
{
Destroy(renderTexture);