提交

Assets/Material/BoWen.mat

@@ -2,17 +2,14 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 8
+  serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BoWen
   m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
-  - _ALPHABLEND_ON
-  - _EMISSION
-  m_InvalidKeywords: []
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -21,6 +18,7 @@ Material:
     RenderType: Transparent
   disabledShaderPasses:
   - GRABPASS
+  - ALWAYS
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -48,7 +46,6 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Ints: []
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -81,4 +78,3 @@ Material:
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 1.1320755, g: 1.0258331, b: 0.36845854, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
-  m_BuildTextureStacks: []

Assets/Resources/model/重点攻击目标1.prefab

@@ -263,6 +263,99 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91CD\u70B9\u76EE\u6807"
+--- !u!1 &1001764166187808509
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7654529518488477946}
+  - component: {fileID: 1313408067558622217}
+  - component: {fileID: 514593396939008857}
+  - component: {fileID: 1692094779437141846}
+  m_Layer: 16
+  m_Name: Displaypos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7654529518488477946
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001764166187808509}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 100, z: 0}
+  m_LocalScale: {x: 15, y: 1, z: 15}
+  m_Children: []
+  m_Father: {fileID: 8425345772495695667}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1313408067558622217
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001764166187808509}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &514593396939008857
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001764166187808509}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!135 &1692094779437141846
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001764166187808509}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1114478879427009576
 GameObject:
   m_ObjectHideFlags: 0
@@ -2518,6 +2611,7 @@ Transform:
   - {fileID: 404141722055020978}
   - {fileID: 8104960197897296327}
   - {fileID: 8367991147839033189}
+  - {fileID: 7654529518488477946}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2567,6 +2661,7 @@ MonoBehaviour:
   toggle6: {fileID: 64890494959671527}
   toggle7: {fileID: 4401106011680143311}
   frequency: 
+  gamepos: {fileID: 1001764166187808509}
 --- !u!54 &-3761067737480147572
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Resources/model/重点攻击目标2.prefab

@@ -1832,6 +1832,99 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5062416000507490738
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2688059755449510730}
+  - component: {fileID: 5088724492985955255}
+  - component: {fileID: 6811355874594529717}
+  - component: {fileID: 6875856172300922579}
+  m_Layer: 16
+  m_Name: Reddot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2688059755449510730
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5062416000507490738}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 100, z: 0}
+  m_LocalScale: {x: 15, y: 1, z: 15}
+  m_Children: []
+  m_Father: {fileID: 8425345772495695667}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5088724492985955255
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5062416000507490738}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6811355874594529717
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5062416000507490738}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!135 &6875856172300922579
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5062416000507490738}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &5097883802883278075
 GameObject:
   m_ObjectHideFlags: 0
@@ -2691,6 +2784,7 @@ Transform:
   - {fileID: 404141722055020978}
   - {fileID: 8104960197897296327}
   - {fileID: 2454500112044358149}
+  - {fileID: 2688059755449510730}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2740,6 +2834,7 @@ MonoBehaviour:
   toggle6: {fileID: 848134281435870856}
   toggle7: {fileID: 6994627430635325071}
   frequency: 
+  gamepos: {fileID: 5062416000507490738}
 --- !u!54 &-5022022242888478449
 Rigidbody:
   m_ObjectHideFlags: 0

Assets/Resources/model/重点攻击目标3.prefab

@@ -188,6 +188,99 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91CD\u70B9\u76EE\u6807"
+--- !u!1 &1634967572523846151
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2791210617010008803}
+  - component: {fileID: 1918062767899976586}
+  - component: {fileID: 1555572023258120696}
+  - component: {fileID: 306032285193557315}
+  m_Layer: 16
+  m_Name: reddot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2791210617010008803
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634967572523846151}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 100, z: 0}
+  m_LocalScale: {x: 15, y: 1, z: 15}
+  m_Children: []
+  m_Father: {fileID: 8425345772495695667}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1918062767899976586
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634967572523846151}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1555572023258120696
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634967572523846151}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!135 &306032285193557315
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634967572523846151}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1649022743403480419
 GameObject:
   m_ObjectHideFlags: 0
@@ -2691,6 +2784,7 @@ Transform:
   - {fileID: 404141722055020978}
   - {fileID: 8104960197897296327}
   - {fileID: 277068844380751465}
+  - {fileID: 2791210617010008803}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2740,6 +2834,7 @@ MonoBehaviour:
   toggle6: {fileID: 6688120530323237334}
   toggle7: {fileID: 8540854955145205225}
   frequency: 
+  gamepos: {fileID: 1634967572523846151}
 --- !u!54 &-796140687388611865
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -3089,18 +3184,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 39765fc7e6ec7ff4db3e0a3378eca818, type: 3}
---- !u!4 &3661655900403195794 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 39765fc7e6ec7ff4db3e0a3378eca818,
-    type: 3}
-  m_PrefabInstance: {fileID: 3844501614245427321}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4150911519058461992 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 39765fc7e6ec7ff4db3e0a3378eca818,
     type: 3}
   m_PrefabInstance: {fileID: 3844501614245427321}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &3661655900403195794 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 39765fc7e6ec7ff4db3e0a3378eca818,
+    type: 3}
+  m_PrefabInstance: {fileID: 3844501614245427321}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7685311524505099672
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Temp/Scripts/Spectrumdetection.cs

@@ -291,8 +291,10 @@ public class Spectrumdetection : MonoBehaviour
             }
             if (Physics.Raycast(ray,out hit,1000))
             {
-                EquipmentCommon equipmentCommon1=hit.collider.GetComponent<EquipmentCommon>();
+                if (hit.collider.GetComponent<EquipmentCommon>())
-                if (equipmentCommon.deviceID==equipmentCommon1.deviceID)
+                {
+                    EquipmentCommon equipmentCommon1 = hit.collider.GetComponent<EquipmentCommon>();
+                    if (equipmentCommon.deviceID == equipmentCommon1.deviceID)
                     {
                         Frequencyiamge.transform.position = Camera.main.WorldToScreenPoint(hit.point);
                         Frequencyiamge.gameObject.SetActive(true);
@@ -300,6 +302,7 @@ public class Spectrumdetection : MonoBehaviour
                 }
             }
         }
+    }
 
     /// <summary>
     /// 搜索范围内的无人机

Assets/Zion/Scripts/HighPriorityTarget.cs

@@ -64,7 +64,10 @@ public class HighPriorityTarget : MonoBehaviour
     /// 接收的字段
     /// </summary>
     public string frequency;
-    // Start is called before the first frame update
+    /// <summary>
+    /// 显示地图上的位置
+    /// </summary>
+    public GameObject gamepos;
     void Start()
     {
         HighPriorityTargets.Add(this);
@@ -83,6 +86,7 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "HUF";
+                gamepos.layer = 16;
             }
         });
         toggle2.onValueChanged.AddListener((ison) =>
@@ -90,6 +94,7 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "L";
+                gamepos.layer = 17;
             }
         });
         toggle3.onValueChanged.AddListener((ison) =>
@@ -97,6 +102,7 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "S";
+                gamepos.layer = 18;
             }
         });
         toggle4.onValueChanged.AddListener((ison) =>
@@ -104,6 +110,7 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "C";
+                gamepos.layer = 19;
             }
         });
         toggle5.onValueChanged.AddListener((ison) =>
@@ -111,6 +118,7 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "X";
+                gamepos.layer = 20;
             }
         });
         toggle6.onValueChanged.AddListener((ison) =>
@@ -118,6 +126,7 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "Ku";
+                gamepos.layer = 21;
             }
         });
         toggle7.onValueChanged.AddListener((ison) =>
@@ -125,11 +134,12 @@ public class HighPriorityTarget : MonoBehaviour
             if (ison)
             {
                 frequency = "Ka";
+                gamepos.layer = 22;
             }
         });
     }
 
-    // Update is called once per frame
+  
     void Update()
     {
         if (Camera.main)

Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs

@@ -259,8 +259,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
                 {
                     return;
                 }
-                EquipmentCommon equipment=hit.collider.GetComponent<EquipmentCommon>();
+                if (hit.collider.GetComponent<EquipmentCommon>())
-                if (equipmentCommon.deviceID==equipment.deviceID)
+                {
+                    EquipmentCommon equipment = hit.collider.GetComponent<EquipmentCommon>();
+                    if (equipmentCommon.deviceID == equipment.deviceID)
                     {
                         Waveimage.transform.position = Camera.main.WorldToScreenPoint(hit.point);
                         Waveimage.gameObject.SetActive(true);
@@ -268,6 +270,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
                 }
             }
         }
+    }
 
 
     #region  启动暂停