Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

Assets/GameAssets/Materials/JiGuang/WeiBo.mat

@@ -9,12 +9,13 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: WeiBo
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
-  m_LightmapFlags: 4
+  m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
-  stringTagMap: {}
+  stringTagMap:
+    RenderType: Transparent
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -59,19 +60,19 @@ Material:
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
-    - _DstBlend: 0
+    - _DstBlend: 10
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
     - _Metallic: 0
-    - _Mode: 0
+    - _Mode: 3
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
-    - _ZWrite: 1
+    - _ZWrite: 0
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.7607844, g: 0.7607844, b: 0.7607844, a: 0.39215687}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0.5, b: 0.5, a: 1}

Assets/GameAssets/Prefebs/Models/moder/微波武器.prefab

@@ -8446,6 +8446,7 @@ MonoBehaviour:
   selectedSide: 1
   equipmentType: "\u5FAE\u6CE2\u6B66\u5668"
   deviceID: 
+  ISPlayer: 0
   explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
     type: 3}
   isMove: 1

Assets/GameAssets/Textures/微波武器.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: b92c45ad89b8714458fac3b3e49d4fcd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GameAssets/Textures/无线电探测.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 1fc471879c76d584f97b0bfea0bbe918
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/DeviceBtn/地面无线电干扰.prefab

@@ -113,7 +113,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: 91, y: 51}
+  m_SizeDelta: {x: 80, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3438159621899897971
 CanvasRenderer:
@@ -142,7 +142,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: dfb3b6fc11d64104992e827ac7b8687f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1fc471879c76d584f97b0bfea0bbe918, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -256,3 +256,4 @@ MonoBehaviour:
   deviceID: 
   isPlayer: 0
   isThinck: 0
+  wrjModel: 0

Assets/Resources/DeviceBtn/微波武器.prefab

@@ -113,7 +113,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: 91, y: 51}
+  m_SizeDelta: {x: 65, y: 62}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3438159621899897971
 CanvasRenderer:
@@ -142,7 +142,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: fc81585c46f5e6747bf4f1bb89b8e102, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b92c45ad89b8714458fac3b3e49d4fcd, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -256,3 +256,4 @@ MonoBehaviour:
   deviceID: 
   isPlayer: 0
   isThinck: 0
+  wrjModel: 0

Assets/Resources/DeviceBtn/频谱探测.prefab

@@ -113,7 +113,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: 91, y: 51}
+  m_SizeDelta: {x: 75, y: 44}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3438159621899897971
 CanvasRenderer:
@@ -142,7 +142,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 347ce00d63d27a945ad947f85941f339, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dfb3b6fc11d64104992e827ac7b8687f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -256,3 +256,4 @@ MonoBehaviour:
   deviceID: 
   isPlayer: 0
   isThinck: 0
+  wrjModel: 0

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

@@ -407,6 +407,9 @@ GameObject:
   - component: {fileID: 8425345772495695667}
   - component: {fileID: 9146920905969325188}
   - component: {fileID: -486169505435808668}
+  - component: {fileID: -3761067737480147572}
+  - component: {fileID: 6878709344258664203}
+  - component: {fileID: 8016157144492057719}
   m_Layer: 0
   m_Name: "\u91CD\u70B9\u653B\u51FB\u76EE\u68071"
   m_TagString: AttackTarget
@@ -460,12 +463,55 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0e0ba15c2e152f74d80232cb3ddeaa3d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Number: 
   HP: 100
   KeyObjectiveUI: {fileID: 3263110947046999335}
   explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
     type: 3}
   ModerFull: {fileID: 1348717422530557033}
   ModerDamage: {fileID: 2840960697985760213}
+--- !u!54 &-3761067737480147572
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &6878709344258664203
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 8.868731, y: 5.515957, z: 3.712123}
+  m_Center: {x: -0.33009434, y: 2.6862097, z: 0.7494025}
+--- !u!65 &8016157144492057719
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 8.868731, y: 5.515957, z: 3.712123}
+  m_Center: {x: -0.33009434, y: 2.6862097, z: 0.7494025}
 --- !u!1001 &2195208536405657912
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -540,18 +586,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 04f1372da9bb10c47aa6b0a40e860704, type: 3}
---- !u!1 &1348717422530557033 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 04f1372da9bb10c47aa6b0a40e860704,
-    type: 3}
-  m_PrefabInstance: {fileID: 2195208536405657912}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1872455060766600915 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 04f1372da9bb10c47aa6b0a40e860704,
     type: 3}
   m_PrefabInstance: {fileID: 2195208536405657912}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1348717422530557033 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 04f1372da9bb10c47aa6b0a40e860704,
+    type: 3}
+  m_PrefabInstance: {fileID: 2195208536405657912}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3147021502621435524
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -626,15 +672,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dde7214ecd7320c429b349be5ecd3671, type: 3}
---- !u!1 &2840960697985760213 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: dde7214ecd7320c429b349be5ecd3671,
-    type: 3}
-  m_PrefabInstance: {fileID: 3147021502621435524}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3181456821252071791 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dde7214ecd7320c429b349be5ecd3671,
     type: 3}
   m_PrefabInstance: {fileID: 3147021502621435524}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2840960697985760213 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: dde7214ecd7320c429b349be5ecd3671,
+    type: 3}
+  m_PrefabInstance: {fileID: 3147021502621435524}
+  m_PrefabAsset: {fileID: 0}

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

@@ -407,6 +407,9 @@ GameObject:
   - component: {fileID: 8425345772495695667}
   - component: {fileID: 9146920905969325188}
   - component: {fileID: -486169505435808668}
+  - component: {fileID: -5022022242888478449}
+  - component: {fileID: 75488773337544611}
+  - component: {fileID: 8252603743989230177}
   m_Layer: 0
   m_Name: "\u91CD\u70B9\u653B\u51FB\u76EE\u68072"
   m_TagString: AttackTarget
@@ -460,12 +463,55 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0e0ba15c2e152f74d80232cb3ddeaa3d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Number: 
   HP: 100
   KeyObjectiveUI: {fileID: 3263110947046999335}
   explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
     type: 3}
   ModerFull: {fileID: 4529375555355940067}
   ModerDamage: {fileID: 1467464424326605954}
+--- !u!54 &-5022022242888478449
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &75488773337544611
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 10.4813595, y: 5.0323753, z: 10.625547}
+  m_Center: {x: 0.13523197, y: 2.0682993, z: -0.6117883}
+--- !u!65 &8252603743989230177
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 10.4813595, y: 5.0323753, z: 10.625547}
+  m_Center: {x: 0.13523197, y: 2.0682993, z: -0.6117883}
 --- !u!1001 &1773313035969991123
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -540,18 +586,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d439f16d62adcec43a096eee4799d2f1, type: 3}
---- !u!1 &1467464424326605954 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d439f16d62adcec43a096eee4799d2f1,
-    type: 3}
-  m_PrefabInstance: {fileID: 1773313035969991123}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2240166649652246072 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d439f16d62adcec43a096eee4799d2f1,
     type: 3}
   m_PrefabInstance: {fileID: 1773313035969991123}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1467464424326605954 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d439f16d62adcec43a096eee4799d2f1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1773313035969991123}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3610473753887713714
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -621,15 +667,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 841e9e1e0b8cda84faeac0b3562ea7ab, type: 3}
---- !u!1 &4529375555355940067 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 841e9e1e0b8cda84faeac0b3562ea7ab,
-    type: 3}
-  m_PrefabInstance: {fileID: 3610473753887713714}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3859659361796509273 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 841e9e1e0b8cda84faeac0b3562ea7ab,
     type: 3}
   m_PrefabInstance: {fileID: 3610473753887713714}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4529375555355940067 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 841e9e1e0b8cda84faeac0b3562ea7ab,
+    type: 3}
+  m_PrefabInstance: {fileID: 3610473753887713714}
+  m_PrefabAsset: {fileID: 0}

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

@@ -407,6 +407,9 @@ GameObject:
   - component: {fileID: 8425345772495695667}
   - component: {fileID: 9146920905969325188}
   - component: {fileID: -486169505435808668}
+  - component: {fileID: -796140687388611865}
+  - component: {fileID: 1632554587927829006}
+  - component: {fileID: 417164425839934028}
   m_Layer: 0
   m_Name: "\u91CD\u70B9\u653B\u51FB\u76EE\u68073"
   m_TagString: AttackTarget
@@ -460,12 +463,55 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0e0ba15c2e152f74d80232cb3ddeaa3d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Number: 
   HP: 100
   KeyObjectiveUI: {fileID: 3263110947046999335}
   explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
     type: 3}
   ModerFull: {fileID: 4150911519058461992}
   ModerDamage: {fileID: 7378831111228137673}
+--- !u!54 &-796140687388611865
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &1632554587927829006
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 15.769182, y: 8.908303, z: 6.3622355}
+  m_Center: {x: 1.092372, y: 4.6212974, z: -1.3982258}
+--- !u!65 &417164425839934028
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8425345772495991571}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 15.769182, y: 8.908303, z: 6.3622355}
+  m_Center: {x: 1.092372, y: 4.6212974, z: -1.3982258}
 --- !u!1001 &3844501614245427321
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -535,18 +581,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 39765fc7e6ec7ff4db3e0a3378eca818, type: 3}
---- !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!1 &4150911519058461992 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 39765fc7e6ec7ff4db3e0a3378eca818,
+    type: 3}
+  m_PrefabInstance: {fileID: 3844501614245427321}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7685311524505099672
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -621,15 +667,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12765f7a9645443498180e9e8d411fb0, type: 3}
---- !u!1 &7378831111228137673 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 12765f7a9645443498180e9e8d411fb0,
-    type: 3}
-  m_PrefabInstance: {fileID: 7685311524505099672}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &7866961035803687539 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 12765f7a9645443498180e9e8d411fb0,
     type: 3}
   m_PrefabInstance: {fileID: 7685311524505099672}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &7378831111228137673 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 12765f7a9645443498180e9e8d411fb0,
+    type: 3}
+  m_PrefabInstance: {fileID: 7685311524505099672}
+  m_PrefabAsset: {fileID: 0}

Assets/Temp/Scripts/Microwaveweapon.cs

@@ -211,7 +211,9 @@ public class Microwaveweapon : MonoBehaviour
     {
         if (miceopos!=null)
         {
-            microblog.MicrowaveDisplay(micdistance);
+            micdistance = Vector3.Distance(miceopos.position, transform.position);
+            Debug.Log("倍数" + micdistance/10);
+            microblog.MicrowaveDisplay(micdistance/10);
             Closeattack(miceopos);
         }
     }
@@ -225,17 +227,18 @@ public class Microwaveweapon : MonoBehaviour
         UnmannedAerialVehicle unmannedAerialVehicle =pos.GetComponent<UnmannedAerialVehicle>();
         if (unmannedAerialVehicle!=null)
         {
-            Destructiondata(unmannedAerialVehicle);
+            StartCoroutine(Destructiondata(unmannedAerialVehicle));
             StartCoroutine(Offlaserstrike());
         }
     }
     /// <summary>
     /// 击毁无人机
     /// </summary>
-    public void Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle)
+    public IEnumerator Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle)
     {
         var newdata = Aeroplane(unmannedAerialVehicle); 
         DeviceManager.Instance.send2roomStr.Enqueue(newdata);
+        yield return new WaitForSeconds(1);
         GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform);
         game.transform.localPosition = Vector3.zero;
         game.transform.SetParent(null);
@@ -270,7 +273,7 @@ public class Microwaveweapon : MonoBehaviour
         //接收激光下发的位置
         Vector3 vector =new Vector3(float.Parse(data[2]), float.Parse(data[3]),float.Parse(data[4]));
         microwavemoder.transform.DOLookAt(vector, 0.1f).SetEase(Ease.Linear).OnComplete(() => {
-            microblog.MicrowaveDisplay(micdistance);
+            microblog.MicrowaveDisplay(micdistance/10);
             StartCoroutine(Offlaserstrike());
         });
        

Assets/Zion/Scripts/Adam/DeviceManager.cs

@@ -132,29 +132,37 @@ public class DeviceManager : MonoSingleton<DeviceManager>
         return tempUAM;
     }
 
+    public List<UnmannedAerialVehicleManage> unmannedAerialVehicleManages;
     public void SetCollider4WRJ(List<Collider> attackColliders, ref Collider currentTarget)
     {
+        for(int i=0; i<attackColliders.Count; i++)
+        {
+            if (attackColliders[i]==null)
+                attackColliders.RemoveAt(i);
+        }
         if (attackColliders.Count > 0)
         {
-            List<UnmannedAerialVehicleManage> temp = GetGXWRJAndZSWRJ();
+            unmannedAerialVehicleManages = GetGXWRJAndZSWRJ();
-            for (int i = 0; i < temp.Count; i++)
+            for (int i = 0; i < unmannedAerialVehicleManages.Count; i++)
             {
-                if (temp[i].unmannedAerialVehicles[0] != null && temp[i].unmannedAerialVehicles[0].gameObject.activeSelf)
+                if (unmannedAerialVehicleManages[i].unmannedAerialVehicles[0] != null && unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].gameObject.activeSelf)
                 {
-                    if (temp[i].unmannedAerialVehicles[0].attackTarget == null)
+                    if (unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].attackTarget == null)
                     {
-                        for (int j = 0; j < attackColliders.Count; j++)
+                        
-                        {
+                        unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[0].transform);
-                            Collider c = null;
+                        //for (int j = 0; j < attackColliders.Count; j++)
-                            if (attackColliders[i] != null)
+                        //{
-                            {
+                        //    Collider c = null;
-                                c = attackColliders[i];
+                        //    if (attackColliders[i] != null)
-                            }
+                        //    {
-                            if (attackColliders[j] != null)
+                        //        c = attackColliders[i];
-                            {
+                        //    }
-                                temp[i].unmannedAerialVehicles[0].AttAck(attackColliders[j].transform);
+                        //    if (attackColliders[j] != null)
-                            }
+                        //    {
-                        }
+                        //        unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[j].transform);
+                        //    }
+                        //}
                     }
                 }
 
@@ -180,11 +188,12 @@ public class DeviceManager : MonoSingleton<DeviceManager>
         }
         else if (info[0] == "KeyTarget")
         {
+            //Debug.Log("接收处理：KeyTarget...:" + data);
             HighPriorityTarget highPriorityTarget= HighPriorityTarget.HighPriorityTargets.Find(x => x.Number == info[1]);
             if(highPriorityTarget)
             {
                 Vector3 Pos=new Vector3(float.Parse(info[3]), float.Parse(info[4]), float.Parse(info[5]));
-                highPriorityTarget.BeAssaulted(Pos, false);
+                highPriorityTarget.BeAssaulted(Pos, false, int.Parse(info[2]));
             }
         }
         else

Assets/Zion/Scripts/HighPriorityTarget.cs

@@ -47,7 +47,8 @@ public class HighPriorityTarget : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        
+        HighPriorityTargets.Add(this);
+        Number = HighPriorityTargets.Count.ToString();
     }
 
     // Update is called once per frame
@@ -68,23 +69,31 @@ public class HighPriorityTarget : MonoBehaviour
         if (isSend)
         {
             HP -= 10;
-            GameObject Bao = Instantiate(explodePrefab, transform);
-            Bao.transform.localPosition = Pos;
-            Bao.transform.SetParent(null);
-            Bao.SetActive(true);
             string nowData = GetSyncDis(Pos);
-            Debug.Log(nowData);
+            //Debug.Log("发送："+nowData);
             _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
         }
         else
         {
             HP = hp;
         }
-        if (HP < 50) 
+        GameObject Bao = Instantiate(explodePrefab);
+        Bao.transform.position = Pos;
+        Bao.SetActive(true);
+        if (HP < 50 && HP > 0)
         {
             ModerFull.SetActive(false);
             ModerDamage.SetActive(true);
         }
+        else if (HP <= 0)
+        {
+            GameObject BaoMain = Instantiate(explodePrefab,transform);
+            BaoMain.transform.localPosition = Vector3.zero;
+            BaoMain.transform.localScale = Vector3.one * 10;
+            BaoMain.transform.SetParent(null);
+            BaoMain.SetActive(true);
+            Destroy(gameObject);
+        }
         
     }
 

Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs

@@ -262,7 +262,7 @@ public class EquipmentCommon : MonoBehaviour
                 break;
             case "SingleDronePosition"://无人机攻击目标锁定
                 UnmannedAerialVehicleManage unmannedAerialVehicleManage = GetComponent<UnmannedAerialVehicleManage>();
-                if (unmannedAerialVehicleManage)
+                if (unmannedAerialVehicleManage&& unmannedAerialVehicleManage.wrjModel== WRJModel.自杀式无人机)
                 {
                     for (int i = 0; i < unmannedAerialVehicleManage.unmannedAerialVehicles.Count; i++)
                     {

Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs

@@ -72,7 +72,9 @@ public class UnmannedAerialVehicle : MonoBehaviour
     public GameObject explodePrefab;
 
     public TextMesh tips;
-
+    /// <summary>
+    /// 攻击目标
+    /// </summary>
     public Transform attackTarget;
 
     /// <summary>
@@ -129,6 +131,45 @@ public class UnmannedAerialVehicle : MonoBehaviour
         Destroy(gameObject);
     }
 
+    /// <summary>
+    /// 销毁蓝方设备
+    /// </summary>
+    /// <param name="_transform"></param>
+    void AddBao(Transform _transform)
+    {
+        //设备
+        EquipmentCommon _equipmentCommon = _transform.GetComponent<EquipmentCommon>();
+        if (_equipmentCommon)
+        {
+            string nowData = string.Format("{0},{1}", "SetToBeDestroyed", _equipmentCommon.deviceID);
+            //Debug.Log(nowData);
+            _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
+            string currentTime = System.DateTime.Now.ToString();
+            string _log = currentTime + "  " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")"
+                   + "编号" + serialNumber + "子无人机" + "攻击摧毁了" + _equipmentCommon.equipmentType + "(" + _equipmentCommon.deviceID + ")";
+            UploadLog(_log);
+
+            WWWForm headers = new WWWForm();
+            headers.AddField("id", _equipmentCommon.deviceID);
+            StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data =>
+            {
+                //Debug.Log(data);
+            }));
+        }
+        //重点打击目标
+        HighPriorityTarget highPriorityTarget = _transform.GetComponent<HighPriorityTarget>();
+        if (highPriorityTarget )
+        {
+            highPriorityTarget.BeAssaulted(atkPos, true);
+        }
+
+        GameObject Bao = Instantiate(explodePrefab, _transform);
+        Bao.transform.localPosition = Vector3.zero;
+        Bao.transform.SetParent(null);
+        Bao.SetActive(true);
+        if (_equipmentCommon)
+            Destroy(_transform.gameObject);
+    }
     /// <summary>
     ///上传日志
     /// </summary>
@@ -153,33 +194,7 @@ public class UnmannedAerialVehicle : MonoBehaviour
         }));
     }
 
-    /// <summary>
+   
-    /// 销毁蓝方设备
-    /// </summary>
-    /// <param name="_transform"></param>
-    void AddBao(Transform _transform)
-    {
-        EquipmentCommon _equipmentCommon = _transform.GetComponent<EquipmentCommon>();
-        string nowData = string.Format("{0},{1}", "SetToBeDestroyed", _equipmentCommon.deviceID);
-        //Debug.Log(nowData);
-        _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
-        string currentTime = System.DateTime.Now.ToString();
-        string _log = currentTime + "  " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")"
-               + "编号" + serialNumber + "子无人机" + "攻击摧毁了" + _equipmentCommon.equipmentType + "(" + _equipmentCommon.deviceID + ")";
-        UploadLog(_log);
-
-        WWWForm headers = new WWWForm();
-        headers.AddField("id", _equipmentCommon.deviceID);
-        StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data =>
-        {
-            //Debug.Log(data);
-        }));
-        GameObject Bao = Instantiate(explodePrefab, _transform);
-        Bao.transform.localPosition = Vector3.zero;
-        Bao.transform.SetParent(null);
-        Bao.SetActive(true);
-        Destroy(_transform.gameObject);
-    }
 
 
     private void OnBecameInvisible()
@@ -210,11 +225,14 @@ public class UnmannedAerialVehicle : MonoBehaviour
                 if (wrjModel == WRJModel.光学无人机)
                 {
                     Debug.Log("光学无人机攻击");
-                    //StopCoroutine(RangedAttack());
+                    StopCoroutine(RangedAttack());
-                    //StartCoroutine(RangedAttack());
+                    StartCoroutine(RangedAttack());
                 }
                 else
                 {
+                    string nowData = GetSyncData(attackTarget);
+                    Debug.Log(nowData);
+                    _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
                     float distance = Vector3.Distance(transform.position, attackTarget.position);
                     transform.DOMove(attackTarget.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() =>
                     {
@@ -228,6 +246,8 @@ public class UnmannedAerialVehicle : MonoBehaviour
         }
     }
 
+    Vector3 atkPos = new Vector3();
+
     /// <summary>
     /// 远程攻击
     /// </summary>
@@ -235,18 +255,23 @@ public class UnmannedAerialVehicle : MonoBehaviour
     {
         while (attackTarget)
         {
-            yield return new WaitForSeconds(0.5f);
+            Vector3 v3 = attackTarget.position;
+            yield return new WaitForSeconds(5f);
             GameObject obj = Instantiate(bulletPrefab, bulletPoint.position, bulletPoint.rotation);
             obj.SetActive(true);
-            Rigidbody rb = obj.GetComponent<Rigidbody>();
+            //Rigidbody rb = obj.GetComponent<Rigidbody>();
-            rb.AddForce(bulletPoint.forward * 20f, ForceMode.Impulse);
+            //rb.AddForce(bulletPoint.forward * 20f, ForceMode.Impulse);
+            obj.transform.DOMove(v3, 2).SetEase(Ease.Linear).OnComplete(() => {
+                Destroy(obj);
+            });
             ShellBoom sb = obj.AddComponent<ShellBoom>();
             sb.isPlayer = unmannedAerialVehicleManage.equipmentCommon.isPlayer;
             sb.onShellAttack.AddListener(() =>
             {
+                atkPos = sb.transform.position;
                 AddBao(attackTarget.transform);
                 // 销毁objectToDestroy对象
-                BeAssaulted("攻击到目标");
+                //BeAssaulted("攻击到目标");
                 Destroy(sb);
             });
         }
@@ -279,5 +304,14 @@ public class UnmannedAerialVehicle : MonoBehaviour
         return string.Format("{0},{1},{2}", "DroneWasDestroyed", unmannedAerialVehicleManage.equipmentCommon.deviceID, serialNumber);
     }
 
+    /// <summary>
+    /// 无人机攻击目标传递
+    /// </summary>
+    /// <returns></returns>
+    protected string GetSyncData(Transform attackTarget)
+    {
+        return string.Format("{0},{1},{2},{3},{4}", "SingleDronePosition", unmannedAerialVehicleManage.equipmentCommon.deviceID,
+            attackTarget.position.x, attackTarget.position.y, attackTarget.position.z);
+    }
 
 }

Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs

@@ -294,21 +294,37 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
         }
         if (wrjModel == WRJModel.光学无人机)
         {
+            for (int i = 0; i < attackColliders1.Count; i++)
+            {
+                if (attackColliders1[i] == null)
+                    attackColliders1.RemoveAt(i);
+            }
             if (attackColliders1.Count > 0)
             {
-                for (int i = 0; i < attackColliders1.Count; i++)
+                var highPriorityTargets = attackColliders1.FindAll(x => x.transform.GetComponent<HighPriorityTarget>());
+                if (highPriorityTargets.Count > 0)
                 {
-                    Collider c = null;
+                    //SendMsg(highPriorityTargets[0].transform);
-                    if (attackColliders1[i] != null)
+                    unmannedAerialVehicles[0].AttAck(highPriorityTargets[0].transform);
-                    {
-                        c = attackColliders1[i];
-                    }
-                    if (unmannedAerialVehicles[0].attackTarget == null)
-                    {
-                        SendMsg(c.transform);
-                        unmannedAerialVehicles[0].AttAck(c.transform);
-                    }
                 }
+                else{
+                    //SendMsg(attackColliders1[0].transform);
+                    unmannedAerialVehicles[0].AttAck(attackColliders1[0].transform);
+                }
+              
+                //for (int i = 0; i < attackColliders1.Count; i++)
+                //{
+                //    Collider c = null;
+                //    if (attackColliders1[i] != null)
+                //    {
+                //        c = attackColliders1[i];
+                //    }
+                //    if (unmannedAerialVehicles[0]&&unmannedAerialVehicles[0].attackTarget == null)
+                //    {
+                //        SendMsg(c.transform);
+                //        unmannedAerialVehicles[0].AttAck(c.transform);
+                //    }
+                //}
             }
         }
     }