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

Assets/GameAssets/Animation/leiDa.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: leiDa
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/GameAssets/Animation/leiDa.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 289a98aa81356f74b9952085350428f2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab

@@ -204,9 +204,10 @@ MonoBehaviour:
   toggle5: {fileID: 5568168215383948007}
   toggle6: {fileID: 5851166370117646347}
   toggle7: {fileID: 455783934966328080}
-  disturb: 
   Waveimage: {fileID: 6753113667049944911}
   buttonoff: {fileID: 1637704249957273881}
+  disturb: 
+  InterferingFrequency1: 
 --- !u!65 &2497641324939056363
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab

@@ -252,7 +252,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7346321952792066827
 RectTransform:
   m_ObjectHideFlags: 0
@@ -332,105 +332,6 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &5101425620612842796
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 171474370036731381}
-  - component: {fileID: 7741990481688815348}
-  - component: {fileID: 609838111492980822}
-  - component: {fileID: 7277993262308379101}
-  m_Layer: 12
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &171474370036731381
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5101425620612842796}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 6504874221885083784}
-  m_Father: {fileID: 7107351192811671799}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!223 &7741990481688815348
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5101425620612842796}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &609838111492980822
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5101425620612842796}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
---- !u!114 &7277993262308379101
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5101425620612842796}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!1 &5136179047312290042
 GameObject:
   m_ObjectHideFlags: 0
@@ -449,7 +350,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &152603132415866519
 RectTransform:
   m_ObjectHideFlags: 0
@@ -462,6 +363,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 7346321952792066827}
+  - {fileID: 6504874221885083784}
   m_Father: {fileID: 7107351192811671799}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -648,7 +550,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 5136179047312290042}
+      - m_Target: {fileID: 4504370092153585706}
         m_MethodName: SetActive
         m_Mode: 6
         m_Arguments:
@@ -779,7 +681,6 @@ Transform:
   - {fileID: 152603132415866519}
   - {fileID: 480111843}
   - {fileID: 7023015303366167859}
-  - {fileID: 171474370036731381}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -823,7 +724,7 @@ MonoBehaviour:
   Responsetime: 0
   Directionfindingaccuracy: 0
   Minimumdetectionvelocity: 0
-  SpectrumdetectionUI: {fileID: 5136179047312290042}
+  SpectrumdetectionUI: {fileID: 4504370092153585706}
   Frequencyiamge: {fileID: 6504874221885083787}
   frenbutton: {fileID: 1245349667316659933}
   toggle1: {fileID: 6607821772367089145}
@@ -953,7 +854,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 171474370036731381}
+    m_TransformParent: {fileID: 152603132415866519}
     m_Modifications:
     - target: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
@@ -1058,17 +959,17 @@ PrefabInstance:
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
@@ -1078,7 +979,7 @@ PrefabInstance:
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
@@ -1369,6 +1270,12 @@ PrefabInstance:
     - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
     - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
+--- !u!224 &6504874221885083784 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
+    type: 3}
+  m_PrefabInstance: {fileID: 5521694617346715177}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &6504874221885083787 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1649737328956898978, guid: 38fb1def99b2cd147a96842efe5a355b,
@@ -1399,18 +1306,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5521694617346715177}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &2017904362660357390 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5521694617346715177}
-  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 &6607821772367089145 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
@@ -1423,12 +1318,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &6504874221885083784 stripped
+--- !u!114 &2017904362660357390 stripped
-RectTransform:
+MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
+  m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b,
     type: 3}
   m_PrefabInstance: {fileID: 5521694617346715177}
   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 &8810536813081833251 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b,

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: 15, y: 1, z: 15}
+  m_LocalScale: {x: 5, y: 1, z: 5}
   m_Children: []
   m_Father: {fileID: 8425345772495695667}
   m_RootOrder: 4

Assets/Temp/Scripts/Spectrumdetection.cs

@@ -314,7 +314,7 @@ public class Spectrumdetection : MonoBehaviour
     void Update()
     {
         Search();//微波武器朝向无人机
-        Emittedray();
+        //Emittedray();
     }
     /// <summary>
     /// 点击物体生成页面
@@ -322,27 +322,7 @@ public class Spectrumdetection : MonoBehaviour
     /// <exception cref="NotImplementedException"></exception>
     private void Emittedray()
     {
-        if (Input.GetMouseButtonDown(0) && UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0")
+       
-        {
-            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-            RaycastHit hit;
-            if (EventSystem.current.IsPointerOverGameObject())
-            {
-                return;
-            }
-            if (Physics.Raycast(ray, out hit, 1000))
-            {
-                if (hit.collider.GetComponent<EquipmentCommon>())
-                {
-                    EquipmentCommon equipmentCommon1 = hit.collider.GetComponent<EquipmentCommon>();
-                    if (equipmentCommon.deviceID == equipmentCommon1.deviceID)
-                    {
-                        Frequencyiamge.transform.position = Camera.main.WorldToScreenPoint(hit.point);
-                        Frequencyiamge.gameObject.SetActive(true);
-                    }
-                }
-            }
-        }
     }
 
     /// <summary>
@@ -355,12 +335,12 @@ public class Spectrumdetection : MonoBehaviour
         {
             if (colliders[i].transform.gameObject.tag == "WRJ")
             {
-                Debug.LogError("进来了");
+                //Debug.LogError("进来了");
                 UnmannedAerialVehicle unmannedAerialVehicle = null;
                 if (colliders[i].GetComponent<UnmannedAerialVehicle>())
                 {
                     unmannedAerialVehicle = colliders[i].GetComponent<UnmannedAerialVehicle>();
-                    if (unmannedAerialVehicle != null)
+                    if (unmannedAerialVehicle != null&& unmannedAerialVehicle.unmannedAerialVehicleManage.dataLinkCommunicationFrequency== Frequency)
                     {
                         Microwaveweapon microwaveweapon = Microwaveweapon.MicrowaveweaponList.Find(x => (x != null && x.ismicow == false));
                         if (microwaveweapon)
@@ -382,6 +362,15 @@ public class Spectrumdetection : MonoBehaviour
         {
             SpectrumdetectionUI.SetActive(true);
         }
+        if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0")
+        {
+            EquipmentCommon equipmentCommon1 = GetComponent<EquipmentCommon>();
+            if (equipmentCommon.deviceID == equipmentCommon1.deviceID)
+            {
+                Frequencyiamge.transform.position = Camera.main.WorldToScreenPoint(transform.position);
+                Frequencyiamge.gameObject.SetActive(true);
+            }
+        }
         //SpectrumdetectionUI.SetActive(true);
     }
     private void OnDestroy()

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.16234416, g: 0.3060211, b: 0.6684391, a: 1}
+  m_IndirectSpecularColor: {r: 0.16207841, g: 0.30599776, b: 0.6701277, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -6729,12 +6729,6 @@ MonoBehaviour:
   isThinck: 0
   wrjModel: 0
   mastermanagement: {fileID: 0}
---- !u!224 &138577124 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-    type: 3}
-  m_PrefabInstance: {fileID: 1586417955055739309}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &147647007
 GameObject:
   m_ObjectHideFlags: 0
@@ -6833,7 +6827,6 @@ RectTransform:
   - {fileID: 729007801}
   - {fileID: 754191142}
   - {fileID: 1719983406}
-  - {fileID: 138577124}
   - {fileID: 1637608973}
   - {fileID: 986231249}
   - {fileID: 522047489}
@@ -64231,7 +64224,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 8637671
+  randSeed: 273660937
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574
@@ -87325,81 +87318,6 @@ Transform:
   m_Father: {fileID: 1025106485868661990}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &343842256428458819
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 343842254875067688, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: orthographic size
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067690, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_Name
-      value: Minimap Camera
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -490.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 350
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -12
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 13
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 343842254875067695, guid: 708d7629e400aea448483dd5797ffa36,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 343842254875067689, guid: 708d7629e400aea448483dd5797ffa36, type: 3}
-  m_SourcePrefab: {fileID: 100100000, guid: 708d7629e400aea448483dd5797ffa36, type: 3}
 --- !u!1 &392437992739231324
 GameObject:
   m_ObjectHideFlags: 0
@@ -88281,130 +88199,6 @@ Transform:
   m_Father: {fileID: 7997812612766063202}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1586417955055739309
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 147647011}
-    m_Modifications:
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -210
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -350
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 420
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 330
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665358, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_Name
-      value: Minimap
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586417955185665358, guid: 18a1ad49a084edc44b006d5905c6d928,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 18a1ad49a084edc44b006d5905c6d928, type: 3}
 --- !u!1 &1635077970712644825
 GameObject:
   m_ObjectHideFlags: 0

Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using AdamThinkDevicesData;
 using AdamSync;
 using System.Linq;
+using UnityEngine.UI;
 
 /// <summary>
 /// 雷达控制
@@ -119,23 +120,23 @@ public class RadarManger : MonoBehaviour
     /// </summary>
     public Camera minCamera;
     /// <summary>
-    /// 计时火炮蓄能时间
+    /// 激活面板预设体
     /// </summary>
-    //public float radartime=0;
+    public Image imageprs;
     void Awake()
     {
-        minCamera = GameObject.Find("Minimap Camera").GetComponent<Camera>();
+        //minCamera = GameObject.Find("Minimap Camera").GetComponent<Camera>();
     }
     void Start()
     {
        
         equipmentCommon = GetComponent<EquipmentCommon>();
-        aniRandar = GetComponent<Animator>();
+        //aniRandar = imageprs.GetComponent<Animator>();
 
-        if (RadarUi == null)
+        //if (RadarUi == null)
-        {
+        //{
-            CreateRadarUI();
+        //    CreateRadarUI();
-        }
+        //}
         // 订阅布尔值变化事件
         OnActivationChanged += OnActivationChangedHandler;
         //InvokeRepeating("RetrievalUAV", 1, 5);//测试用
@@ -207,20 +208,26 @@ public class RadarManger : MonoBehaviour
     /// <summary>
     /// 生成雷达UI
     /// </summary>
+    //void CreateRadarUI()
+    //{
+    //    Transform canvas = GameObject.Find("Canvas").transform;
+    //    if (canvas)
+    //    {
+    //        GameObject _object = Instantiate(RadarUiPrefab, canvas);
+    //        RadarUi = _object;
+    //        RadarUi.transform.localScale = Vector3.zero;
+    //        aniRandarUI = RadarUi.GetComponent<Animator>();
+    //        RadarRotationSpeed(TurntableSpeed);
+    //    }
+
+    //}
     void CreateRadarUI()
     {
-        Transform canvas = GameObject.Find("Canvas").transform;
+        imageprs.transform.localScale = Vector3.zero;
-        if (canvas)
+        aniRandarUI =imageprs.GetComponent<Animator>();
-        {
+        RadarRotationSpeed(TurntableSpeed);
-            GameObject _object = Instantiate(RadarUiPrefab, canvas);
-            RadarUi = _object;
-            RadarUi.transform.localScale = Vector3.zero;
-            aniRandarUI = RadarUi.GetComponent<Animator>();
-            RadarRotationSpeed(TurntableSpeed);
-        }
-
     }
-
+     
     /// <summary>
     /// 数据写入
     /// </summary>
@@ -322,22 +329,31 @@ public class RadarManger : MonoBehaviour
         }
     }
 
-    private void OnMouseEnter()
+    //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>
+    private void OnMouseDown()
     {
-        if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0")
+        if (equipmentCommon.isPlayer)
         {
-            Debug.LogError("鼠标进入");
+            imageprs.gameObject.SetActive(true);
-            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;
-    }
-
     private void OnDestroy()
     {
         Destroy(RadarUi.gameObject);