From 912a282421593d78cc9a0d0a85414eae03b039c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com>
Date: Sun, 28 Jan 2024 16:15:20 +0800
Subject: [PATCH] 1
---
Assets/GameAssets/Animation/LeiDa.controller | 33 +-
Assets/GameAssets/Animation/leiDa.anim | 156 +++++++-
.../Prefebs/Models/moder/探测雷达.prefab | 2 +-
Assets/Temp/Scripts/Spectrumdetection.cs | 4 +-
.../AdamTraining_pilot_terminal_panl 1.unity | 371 +-----------------
.../TerrestrialRadioInterferenceManger.cs | 4 +-
.../UAV/UnmannedAerialVehicleManage.cs | 25 +-
.../Zion/Scripts/WRJ0125/DroneViewDisplay.cs | 4 +
8 files changed, 220 insertions(+), 379 deletions(-)
diff --git a/Assets/GameAssets/Animation/LeiDa.controller b/Assets/GameAssets/Animation/LeiDa.controller
index 42eb7939..0f821d8a 100644
--- a/Assets/GameAssets/Animation/LeiDa.controller
+++ b/Assets/GameAssets/Animation/LeiDa.controller
@@ -11,7 +11,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2224071843181215310}
- m_Position: {x: 488.71527, y: 38.923645, z: 0}
+ m_Position: {x: 380, y: 150, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -5824248305075557933}
+ m_Position: {x: 468.68082, y: 16.76538, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -22,6 +25,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2224071843181215310}
+--- !u!1102 &-5824248305075557933
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: RadarNew
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: af89be2c9e2e1df499cf3d93e000de43, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &-2224071843181215310
AnimatorState:
serializedVersion: 5
@@ -42,7 +71,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: af89be2c9e2e1df499cf3d93e000de43, type: 2}
+ m_Motion: {fileID: 7400000, guid: 289a98aa81356f74b9952085350428f2, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
diff --git a/Assets/GameAssets/Animation/leiDa.anim b/Assets/GameAssets/Animation/leiDa.anim
index 1829b77e..69f1420e 100644
--- a/Assets/GameAssets/Animation/leiDa.anim
+++ b/Assets/GameAssets/Animation/leiDa.anim
@@ -13,7 +13,32 @@ AnimationClip:
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
- m_EulerCurves: []
+ m_EulerCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0, y: 0, z: 0}
+ inSlope: {x: 0, y: 360, z: 0}
+ outSlope: {x: 0, y: 360, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 1
+ value: {x: 0, y: 360, z: 0}
+ inSlope: {x: 0, y: 360, z: 0}
+ outSlope: {x: 0, y: 360, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
@@ -24,7 +49,14 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 3132376662
+ attribute: 4
+ script: {fileID: 0}
+ typeID: 4
+ customType: 4
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -36,7 +68,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 0
+ m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@@ -46,8 +78,122 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
- m_EulerEditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: localEulerAnglesRaw.x
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 360
+ outSlope: 360
+ tangentMode: 34
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 360
+ inSlope: 360
+ outSlope: 360
+ tangentMode: 34
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: localEulerAnglesRaw.y
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: localEulerAnglesRaw.z
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalEulerAngles.x
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalEulerAngles.y
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve: []
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalEulerAngles.z
+ path: "\u96F7\u8FBE\u65CB\u8F6C"
+ classID: 4
+ script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
diff --git a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
index a92ecb0a..2e0febb1 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
@@ -19624,7 +19624,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &8093889963351047177
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs
index 33b39d2d..113a13ce 100644
--- a/Assets/Temp/Scripts/Spectrumdetection.cs
+++ b/Assets/Temp/Scripts/Spectrumdetection.cs
@@ -6,7 +6,9 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
-
+///
+/// 频谱探测
+///
public class Spectrumdetection : MonoBehaviour
{
diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
index fc48ec03..fe3437a7 100644
--- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
+++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
- m_IndirectSpecularColor: {r: 0.16235614, g: 0.30591527, b: 0.66776896, a: 1}
+ m_IndirectSpecularColor: {r: 0.06498189, g: 0.12170648, b: 0.26544884, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -62683,8 +62683,8 @@ MonoBehaviour:
blueContanier: {fileID: 3921061}
deviceBtnItem: {fileID: 633993627584584296, guid: fd27e404fb7dcc3499a0c8fabd75e0c1,
type: 3}
- redShowImage: {fileID: 0}
- blueShowImage: {fileID: 0}
+ redShowImage: {fileID: 6368481659455215670}
+ blueShowImage: {fileID: 6368481658589340120}
--- !u!1 &1720944765
GameObject:
m_ObjectHideFlags: 0
@@ -63885,10 +63885,10 @@ MonoBehaviour:
colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
- colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
+ colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
colorClouds: {r: 1, g: 1, b: 1, a: 1}
- colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1}
+ colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1}
colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1}
colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1}
displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]'
@@ -64226,7 +64226,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- randSeed: 16312687
+ randSeed: 93188062
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@@ -91226,8 +91226,6 @@ RectTransform:
- {fileID: 6368481659455215664}
- {fileID: 6368481659155807908}
- {fileID: 6368481659012800516}
- - {fileID: 6368481659141481127}
- - {fileID: 6368481658281002850}
m_Father: {fileID: 6368481659553906091}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -91392,112 +91390,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 42}
m_SizeDelta: {x: 0, y: 84.03992}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6368481658281002848
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481658281002861}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Texture: {fileID: 8400000, guid: 442b4b7d8601d224aac22c3a3dd578fa, type: 2}
- m_UVRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1
- height: 1
---- !u!222 &6368481658281002849
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481658281002861}
- m_CullTransparentMesh: 0
---- !u!224 &6368481658281002850
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481658281002861}
- 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_Children: []
- m_Father: {fileID: 6368481658055216393}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 727.9, y: -231.1}
- m_SizeDelta: {x: 969.8899, y: 664.5488}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!328 &6368481658281002851
-VideoPlayer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481658281002861}
- m_Enabled: 1
- m_VideoClip: {fileID: 32900000, guid: 4ef5fe4fd879c154eadadf61c39838ac, type: 3}
- m_TargetCameraAlpha: 1
- m_TargetCamera3DLayout: 0
- m_TargetCamera: {fileID: 0}
- m_TargetTexture: {fileID: 8400000, guid: 442b4b7d8601d224aac22c3a3dd578fa, type: 2}
- m_TimeReference: 0
- m_TargetMaterialRenderer: {fileID: 0}
- m_TargetMaterialProperty: _MainTex
- m_RenderMode: 2
- m_AspectRatio: 2
- m_DataSource: 0
- m_PlaybackSpeed: 1
- m_AudioOutputMode: 2
- m_TargetAudioSources:
- - {fileID: 0}
- m_DirectAudioVolumes:
- - 1
- m_Url:
- m_EnabledAudioTracks: 01
- m_DirectAudioMutes: 00
- m_ControlledAudioTrackCount: 1
- m_PlayOnAwake: 1
- m_SkipOnDrop: 1
- m_Looping: 0
- m_WaitForFirstFrame: 1
- m_FrameReadyEventEnabled: 0
---- !u!1 &6368481658281002861
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6368481658281002850}
- - component: {fileID: 6368481658281002849}
- - component: {fileID: 6368481658281002848}
- - component: {fileID: 6368481658281002851}
- m_Layer: 0
- m_Name: RawImage (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!114 &6368481658342163396
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -92076,7 +91968,6 @@ GameObject:
- component: {fileID: 6368481658589340122}
- component: {fileID: 6368481658589340121}
- component: {fileID: 6368481658589340120}
- - component: {fileID: 6368481658589340123}
m_Layer: 0
m_Name: video-red
m_TagString: Untagged
@@ -92137,40 +92028,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: 0, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!328 &6368481658589340123
-VideoPlayer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481658589340069}
- m_Enabled: 1
- m_VideoClip: {fileID: 0}
- m_TargetCameraAlpha: 1
- m_TargetCamera3DLayout: 0
- m_TargetCamera: {fileID: 0}
- m_TargetTexture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2}
- m_TimeReference: 0
- m_TargetMaterialRenderer: {fileID: 0}
- m_TargetMaterialProperty: _MainTex
- m_RenderMode: 2
- m_AspectRatio: 2
- m_DataSource: 0
- m_PlaybackSpeed: 1
- m_AudioOutputMode: 2
- m_TargetAudioSources:
- - {fileID: 0}
- m_DirectAudioVolumes:
- - 1
- m_Url:
- m_EnabledAudioTracks: 01
- m_DirectAudioMutes: 00
- m_ControlledAudioTrackCount: 1
- m_PlayOnAwake: 1
- m_SkipOnDrop: 1
- m_Looping: 0
- m_WaitForFirstFrame: 1
- m_FrameReadyEventEnabled: 0
--- !u!222 &6368481658622910616
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -92669,112 +92526,6 @@ Transform:
m_Father: {fileID: 6368481659336677724}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!328 &6368481659141481124
-VideoPlayer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659141481126}
- m_Enabled: 1
- m_VideoClip: {fileID: 32900000, guid: a8bad4b025a416645bbbca067fa92fa5, type: 3}
- m_TargetCameraAlpha: 1
- m_TargetCamera3DLayout: 0
- m_TargetCamera: {fileID: 0}
- m_TargetTexture: {fileID: 8400000, guid: 0d600ac215cd2004c81406e136b75a8a, type: 2}
- m_TimeReference: 0
- m_TargetMaterialRenderer: {fileID: 0}
- m_TargetMaterialProperty: _MainTex
- m_RenderMode: 2
- m_AspectRatio: 2
- m_DataSource: 0
- m_PlaybackSpeed: 1
- m_AudioOutputMode: 2
- m_TargetAudioSources:
- - {fileID: 0}
- m_DirectAudioVolumes:
- - 1
- m_Url:
- m_EnabledAudioTracks: 01
- m_DirectAudioMutes: 00
- m_ControlledAudioTrackCount: 1
- m_PlayOnAwake: 1
- m_SkipOnDrop: 1
- m_Looping: 0
- m_WaitForFirstFrame: 1
- m_FrameReadyEventEnabled: 0
---- !u!114 &6368481659141481125
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659141481126}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Texture: {fileID: 8400000, guid: 0d600ac215cd2004c81406e136b75a8a, type: 2}
- m_UVRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1
- height: 1
---- !u!1 &6368481659141481126
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6368481659141481127}
- - component: {fileID: 6368481659141481178}
- - component: {fileID: 6368481659141481125}
- - component: {fileID: 6368481659141481124}
- m_Layer: 0
- m_Name: RawImage
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6368481659141481127
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659141481126}
- 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_Children: []
- m_Father: {fileID: 6368481658055216393}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -23.75}
- m_SizeDelta: {x: 428, y: 242.5}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6368481659141481178
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659141481126}
- m_CullTransparentMesh: 0
--- !u!224 &6368481659155807908
RectTransform:
m_ObjectHideFlags: 0
@@ -92931,80 +92682,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u653B\u51FB\u7C7B\u578B"
---- !u!114 &6368481659234529240
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659234529242}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: e60054bb692e0e049866eb548b78ccca, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &6368481659234529241
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659234529242}
- m_CullTransparentMesh: 0
---- !u!1 &6368481659234529242
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6368481659234529243}
- - component: {fileID: 6368481659234529241}
- - component: {fileID: 6368481659234529240}
- m_Layer: 0
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6368481659234529243
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659234529242}
- 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_Children: []
- m_Father: {fileID: 6368481659264686938}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -28}
- m_SizeDelta: {x: 195, y: 195}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6368481659264686885
GameObject:
m_ObjectHideFlags: 0
@@ -93044,7 +92721,6 @@ RectTransform:
m_Children:
- {fileID: 6368481658008034198}
- {fileID: 6368481658589340122}
- - {fileID: 6368481659234529243}
m_Father: {fileID: 6368481658201838891}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -93453,40 +93129,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: -10, y: -55}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!328 &6368481659455215665
-VideoPlayer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6368481659455215667}
- m_Enabled: 1
- m_VideoClip: {fileID: 0}
- m_TargetCameraAlpha: 1
- m_TargetCamera3DLayout: 0
- m_TargetCamera: {fileID: 0}
- m_TargetTexture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2}
- m_TimeReference: 0
- m_TargetMaterialRenderer: {fileID: 0}
- m_TargetMaterialProperty: _MainTex
- m_RenderMode: 2
- m_AspectRatio: 2
- m_DataSource: 0
- m_PlaybackSpeed: 1
- m_AudioOutputMode: 2
- m_TargetAudioSources:
- - {fileID: 0}
- m_DirectAudioVolumes:
- - 1
- m_Url:
- m_EnabledAudioTracks: 01
- m_DirectAudioMutes: 00
- m_ControlledAudioTrackCount: 1
- m_PlayOnAwake: 1
- m_SkipOnDrop: 1
- m_Looping: 0
- m_WaitForFirstFrame: 1
- m_FrameReadyEventEnabled: 0
--- !u!1 &6368481659455215667
GameObject:
m_ObjectHideFlags: 0
@@ -93498,7 +93140,6 @@ GameObject:
- component: {fileID: 6368481659455215664}
- component: {fileID: 6368481659455215671}
- component: {fileID: 6368481659455215670}
- - component: {fileID: 6368481659455215665}
m_Layer: 0
m_Name: video-red
m_TagString: Untagged
diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
index 40d91a78..4a08d6d0 100644
--- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
@@ -495,7 +495,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
//Debug.Log(col.name+"数据链通信频点...:" + unmannedAerialVehicle.dataLinkCommunicationFrequency);
if (unmannedAerialVehicleManage.dataLinkCommunicationFrequency == "" || InterferingFrequency == "") continue;//无数据不执行
//if (unmannedAerialVehicleManage.dataLinkCommunicationFrequency == InterferingFrequency)
- if (unmannedAerialVehicleManage.satellitePositioningFrequency == InterferingFrequency)
+ if (unmannedAerialVehicleManage.satellitePositioningFrequency == disturb)
{
Debug.Log("干扰...:" + colliders[i].name + "成功。");
//unmannedAerialVehicle.BeAssaulted("无线电干扰");
@@ -514,7 +514,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
//Debug.Log(col.name+"数据链通信频点...:" + unmannedAerialVehicle.dataLinkCommunicationFrequency);
if (unmannedAerialVehicle.dataLinkCommunicationFrequency == "" || InterferingFrequency == "") continue;//无数据不执行
//if (unmannedAerialVehicle.dataLinkCommunicationFrequency == InterferingFrequency)
- if (unmannedAerialVehicle.satellitePositioningFrequency == InterferingFrequency)
+ if (unmannedAerialVehicle.satellitePositioningFrequency == disturb)
{
Debug.Log("干扰...:" + colliders[i].name + "成功。");
//unmannedAerialVehicle.BeAssaulted("无线电干扰");
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
index 5f80a5ee..f417fc0a 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
@@ -366,16 +366,35 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
private void SelectiveAttackDrone()
{
//if (isEngagedTarget) return;
- if (wrjModel == WRJModel.电子侦察无人机 || wrjModel == WRJModel.光学无人机)
+ //if (wrjModel == WRJModel.电子侦察无人机 || wrjModel == WRJModel.光学无人机)
+ if (wrjModel == WRJModel.电子侦察无人机)
{
List allColliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体
-
for (int i = 0; i < allColliders.Count; i++)
{
- if (allColliders[i].gameObject.tag == "AttackTarget" && !allColliders[i].isTrigger && !attackColliders1.Contains(allColliders[i]))
+ if (allColliders[i].gameObject.tag == "AttackTarget" && !allColliders[i].isTrigger
+ && !attackColliders1.Contains(allColliders[i]) && allColliders[i].transform.GetComponent())
attackColliders1.Add(allColliders[i]);
}
}
+ else if(wrjModel == WRJModel.光学无人机)
+ {
+ List allColliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体
+ for (int i = 0; i < allColliders.Count; i++)
+ {
+ if (allColliders[i].gameObject.tag == "AttackTarget" && !allColliders[i].isTrigger&& !attackColliders1.Contains(allColliders[i]))
+ {
+ Vector3 pos = gxWRJCamera.WorldToViewportPoint(allColliders[i].transform.position);
+ bool ispcamera = (pos.x > 0 && pos.x < 1 && pos.y > 0 && pos.y < 1 && pos.z > 0);
+ if (ispcamera)
+ {
+ attackColliders1.Add(allColliders[i]);
+ }
+ }
+ }
+
+ }
+
if (wrjModel == WRJModel.电子侦察无人机)
{
WRJAttach.Invoke(attackColliders1);
diff --git a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
index 61bf2c3a..cded4fb9 100644
--- a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
+++ b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
@@ -45,9 +45,13 @@ public class DroneViewDisplay : MonoSingleton
[Header("无线电探测放大显示视角显示RawImage")]
public RawImage rawShow;
#endregion
+
+
// Start is called before the first frame update
void Start()
{
+ renderTextures.Clear();
+ radioAngleViews.Clear();
Debug.Log(GlobalFlag.blueOrRed);
transform.localScale = GlobalFlag.blueOrRed == 0 ? Vector3.one : Vector3.zero;
btnClose.onClick.AddListener(() => { radioAngleViewMax.localScale = Vector3.zero; });