11

提交
2024-02-01 11:00:34 +08:00 · 2024-02-01 10:58:11 +08:00
11 changed files with 240 additions and 115 deletions
--- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
@ -573,7 +573,7 @@ Camera:
  m_Depth: 0
  m_CullingMask:
    serializedVersion: 2
-    m_Bits: 8355840
+    m_Bits: 32768
  m_RenderingPath: -1
  m_TargetTexture: {fileID: 8600000, guid: 8ebba5e1403daa54d86a8510c13d6ed5, type: 2}
  m_TargetDisplay: 0
@ -10009,7 +10009,7 @@ MonoBehaviour:
  aniRandarUI: {fileID: 0}
  TurntableSpeed: 9
  DetectionRange: 3
-  NearBlindArea: 206
+  NearBlindArea: 0
  BatchStandardProcessingCapability: 31
  DetectionSuccessRate: 83
  MinimumDetectionVelocity: 3
--- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
@ -499,6 +499,7 @@ Transform:
  - {fileID: 7222213072416684655}
  - {fileID: 5512074156260461627}
  - {fileID: 4583632407061898182}
+  - {fileID: 7888230650824579511}
  - {fileID: 5266046645074515435}
  m_Father: {fileID: 0}
  m_RootOrder: 0
@ -796,7 +797,7 @@ RectTransform:
  - {fileID: 7049978149805136274}
  - {fileID: 6513129680526216909}
  m_Father: {fileID: 6865737300552731159}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -863,6 +864,116 @@ MonoBehaviour:
  m_BlockingMask:
    serializedVersion: 2
    m_Bits: 4294967295
+--- !u!1001 &2480616969672327800
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6865737300552731159}
+    m_Modifications:
+    - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -5.54
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_Name
+      value: Minimapwrj1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
+        type: 3}
+      propertyPath: m_Layer
+      value: 16
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3}
+--- !u!4 &7888230650824579511 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
+    type: 3}
+  m_PrefabInstance: {fileID: 2480616969672327800}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2498570764477447715
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1792,12 +1903,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
--- !u!4 &5512074156260461627 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 2498570764477447715}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &4610455937839310686 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@ -1810,6 +1915,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!4 &5512074156260461627 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 2498570764477447715}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5514169232507334764
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2261,24 +2372,24 @@ PrefabInstance:
    - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
    - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
--- !u!1 &6513129680526216908 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5514169232507334764}
-  m_PrefabAsset: {fileID: 0}
--- !u!224 &6513129680526216909 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5514169232507334764}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8305030183727307535 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b,
    type: 3}
  m_PrefabInstance: {fileID: 5514169232507334764}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1885673261310054197 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 5514169232507334764}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &6599196944350286780 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -2315,18 +2426,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!114 &1885673261310054197 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5514169232507334764}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &5373553619706430310 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -2363,6 +2462,18 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &6513129680526216908 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 5514169232507334764}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &6513129680526216909 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 5514169232507334764}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8108767849280698377
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2443,7 +2554,7 @@ PrefabInstance:
    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
      propertyPath: m_LocalScale.x
-      value: 15
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
@ -2453,7 +2564,7 @@ PrefabInstance:
    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
      propertyPath: m_LocalScale.z
-      value: 15
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
@ -2467,18 +2578,18 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3}
--- !u!1 &392167392884716949 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
-    type: 3}
-  m_PrefabInstance: {fileID: 8108767849280698377}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4583632407061898182 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
    type: 3}
  m_PrefabInstance: {fileID: 8108767849280698377}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &392167392884716949 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
+    type: 3}
+  m_PrefabInstance: {fileID: 8108767849280698377}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8589356912259884851
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2935,12 +3046,18 @@ PrefabInstance:
    - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
    - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
--- !u!1 &7049978149805136275 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+--- !u!114 &6926759985235920099 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
    type: 3}
  m_PrefabInstance: {fileID: 8589356912259884851}
  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &2851464892156488724 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -2989,42 +3106,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!114 &6926759985235920099 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8589356912259884851}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!114 &4193460165237867982 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8589356912259884851}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!1 &5257004626334551120 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8589356912259884851}
-  m_PrefabAsset: {fileID: 0}
--- !u!224 &7049978149805136274 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8589356912259884851}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7877613851723470549 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b,
@ -3037,3 +3118,33 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &7049978149805136275 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8589356912259884851}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &7049978149805136274 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8589356912259884851}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5257004626334551120 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8589356912259884851}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4193460165237867982 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8589356912259884851}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Prefebs/Models/moder/无人机List（30台备份）.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List（30台备份）.prefab
@ -24390,7 +24390,7 @@ PrefabInstance:
    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
      propertyPath: m_LocalScale.x
-      value: 15
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
@ -24400,7 +24400,7 @@ PrefabInstance:
    - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
      propertyPath: m_LocalScale.z
-      value: 15
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de,
        type: 3}
--- a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab
@ -62,7 +62,7 @@ Camera:
  m_Depth: 0
  m_CullingMask:
    serializedVersion: 2
-    m_Bits: 32768
+    m_Bits: 8323072
  m_RenderingPath: -1
  m_TargetTexture: {fileID: 8400000, guid: 6b626e0708a53914faa12b213dcaa816, type: 2}
  m_TargetDisplay: 0
--- a/Assets/Resources/model/重点攻击目标1.prefab
+++ b/Assets/Resources/model/重点攻击目标1.prefab
@ -291,7 +291,7 @@ Transform:
  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: 4, y: 1, z: 4}
+  m_LocalScale: {x: 9, y: 1, z: 9}
  m_Children: []
  m_Father: {fileID: 8425345772495695667}
  m_RootOrder: 4
--- a/Assets/Resources/model/重点攻击目标2.prefab
+++ b/Assets/Resources/model/重点攻击目标2.prefab
@ -1860,7 +1860,7 @@ Transform:
  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: 3, y: 1, z: 3}
+  m_LocalScale: {x: 9, y: 1, z: 9}
  m_Children: []
  m_Father: {fileID: 8425345772495695667}
  m_RootOrder: 4
--- a/Assets/Resources/model/重点攻击目标3.prefab
+++ b/Assets/Resources/model/重点攻击目标3.prefab
@ -216,7 +216,7 @@ Transform:
  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: 4, y: 1, z: 4}
+  m_LocalScale: {x: 9, y: 1, z: 9}
  m_Children: []
  m_Father: {fileID: 8425345772495695667}
  m_RootOrder: 4
--- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl
+++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 1113159741}
-  m_IndirectSpecularColor: {r: 0.06673167, g: 0.12205913, b: 0.25451294, a: 1}
+  m_IndirectSpecularColor: {r: 0.16232353, g: 0.30599368, b: 0.66842777, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -69417,10 +69417,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.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
+  colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
  colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
  colorClouds: {r: 1, g: 1, b: 1, a: 1}
-  colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1}
+  colorHighlightClouds: {r: 1, g: 1, b: 1, 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]'
@ -69758,7 +69758,7 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
-  randSeed: 17995578
+  randSeed: 473439734
  isDoingTransition: 0
  minimumHeight: 0
 --- !u!114 &1820978574
@ -94989,6 +94989,7 @@ MonoBehaviour:
  cancel4: {fileID: 1569674640}
  cancel5: {fileID: 1982967725}
  menu_button: {fileID: 787014934}
+  guanji_button: {fileID: 578132326}
  fanhuiBtn: {fileID: 404543402}
  fanhui: {fileID: 404543402}
 --- !u!222 &1862065805184089358
--- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
@ -5,6 +5,7 @@ using AdamThinkDevicesData;
 using AdamSync;
 using System.Linq;
 using UnityEngine.UI;
+using System;

 /// <summary>
 /// 雷达控制
@ -152,7 +153,32 @@ public class RadarManger : MonoBehaviour
            onlyOne = false;
            DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, minCamera, rawImage);
        }
+        //Deadzone();//雷达盲区
    }
+    /// <summary>
+    /// 雷达盲区让目标消失在地图上
+    /// </summary>
+    //private void Deadzone()
+    //{
+    //    if (float.Parse(NearBlindArea)>0)
+    //    {
+    //        Collider[] colliders = Physics.OverlapSphere(transform.position,float.Parse(NearBlindArea));
+    //        for (int i = 0; i < colliders.Length; i++)
+    //        {
+    //            if (colliders[i].transform.gameObject.tag=="WRJ")
+    //            {
+    //                Debug.Log("进来了" + Vector3.Distance(transform.position, colliders[i].transform.position));
+    //                UnmannedAerialVehicleManage unmannedAerialVehicle =colliders[i].GetComponent<UnmannedAerialVehicleManage>();
+    //                if (unmannedAerialVehicle)
+    //                {
+    //                    GameObject game = unmannedAerialVehicle.gamePos;
+    //                    Destroy(game);  
+    //                }
+                    
+    //            }
+    //        }
+    //    }
+    //}
    #region  启动暂停
    /// <summary>
    /// 导条变化调用
@ -238,6 +264,7 @@ public class RadarManger : MonoBehaviour
                    break;
                case "近盲区:":
                    NearBlindArea = weaponitemone[i].para_value;
+                    Debug.LogError(NearBlindArea);
                    break;
                case "批量标处理能力:":
                    BatchStandardProcessingCapability = weaponitemone[i].para_value;
@ -323,21 +350,7 @@ public class RadarManger : MonoBehaviour
        }
    }

-    //private void OnMouseEnter()
-    //{
-    //    if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0")
-    //    {
-    //        Debug.LogError("鼠标进入");
-    //        RadarUi.transform.localScale = Vector3.one;
-    //        minCamera.transform.position = new Vector3(transform.position.x, 350, transform.position.z);
-    //    }
-    //}
-
-    //private void OnMouseExit()
-    //{
-    //    Debug.LogError("鼠标离开");
-    //    RadarUi.transform.localScale = Vector3.zero;
-    //}
+    
    /// <summary>
    /// 检测鼠标点击的方法
    /// </summary>
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
@ -552,13 +552,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
                    break;
                case "数据链通信频点:":
                    string date1 = GetFrequencyBand(weaponitemone[i].para_value);
-                    Debug.Log(date1);
+
                    string[] dates1=date1.Split(',');
                    if (dates1.Length > 0)
                    {
                        for (int k = 0; k < togFrequencyBands.Count; k++)
                        {
-                            Debug.Log(togFrequencyBands[k].transform.name);
+                            
                            togFrequencyBands[k].gameObject.SetActive(date1.Contains(togFrequencyBands[k].transform.name));
                        }
                        dataLinkCommunicationFrequency = dates1[0];
@ -576,13 +576,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour

                case "电子侦察能力:":
                    string date2 = GetFrequencyBand(weaponitemone[i].para_value);
-                    Debug.Log(date2);
+                
                    string[] dates2 = date2.Split(',');
                    if (dates2.Length > 0)
                    {
                        for (int k = 0; k < togSurveillanceFrequencyBands.Count; k++)
                        {
-                            Debug.Log(togSurveillanceFrequencyBands[k].transform.name);
+                            
                            togSurveillanceFrequencyBands[k].gameObject.SetActive(date2.Contains(togSurveillanceFrequencyBands[k].transform.name));
                        }
                        electronicReconnaissanceCapability = dates2[0];
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -42,8 +42,8 @@ PlayerSettings:
  m_SplashScreenLogos: []
  m_VirtualRealitySplashScreen: {fileID: 0}
  m_HolographicTrackingLossScreen: {fileID: 0}
-  defaultScreenWidth: 1920
-  defaultScreenHeight: 1080
+  defaultScreenWidth: 1080
+  defaultScreenHeight: 680
  defaultScreenWidthWeb: 960
  defaultScreenHeightWeb: 600
  m_StereoRenderingPath: 0
@ -69,18 +69,18 @@ PlayerSettings:
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
  runInBackground: 1
-  captureSingleScreen: 0
+  captureSingleScreen: 1
  muteOtherAudioSources: 0
  Prepare IOS For Recording: 0
  Force IOS Speakers When Recording: 0
  deferSystemGesturesMode: 0
  hideHomeButton: 0
  submitAnalytics: 1
-  usePlayerLog: 1
+  usePlayerLog: 0
  bakeCollisionMeshes: 0
  forceSingleInstance: 0
  useFlipModelSwapchain: 1
-  resizableWindow: 0
+  resizableWindow: 1
  useMacAppStoreValidation: 0
  macAppStoreCategory: public.app-category.games
  gpuSkinning: 1
@ -91,7 +91,7 @@ PlayerSettings:
  xboxEnableFitness: 0
  visibleInBackground: 1
  allowFullscreenSwitch: 1
-  fullscreenMode: 1
+  fullscreenMode: 3
  xboxSpeechDB: 0
  xboxEnableHeadOrientation: 0
  xboxEnableGuest: 0
Author	SHA1	Message	Date
yulong	e70b5eab69	11	2024-02-01 11:00:34 +08:00
yulong	1c16df548a	提交	2024-02-01 10:58:11 +08:00