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

Assets/GameAssets/Prefebs/Models/WRJ/DroneViewDisplay.prefab

@@ -121,12 +121,12 @@ RectTransform:
   m_Children:
   - {fileID: 1640552069294507112}
   m_Father: {fileID: 1640552069749374212}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 12, y: 0}
+  m_SizeDelta: {x: 12, y: -17}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &1640552068777328510
 CanvasRenderer:
@@ -207,86 +207,12 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1640552069826656984}
   m_HandleRect: {fileID: 1640552069826656985}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
-  m_Size: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &1640552068989044857
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1640552068989044856}
-  - component: {fileID: 1640552068989044862}
-  - component: {fileID: 1640552068989044863}
-  m_Layer: 5
-  m_Name: Handle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1640552068989044856
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552068989044857}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1640552069560974910}
-  m_RootOrder: 0
-  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: 20, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1640552068989044862
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552068989044857}
-  m_CullTransparentMesh: 0
---- !u!114 &1640552068989044863
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552068989044857}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.10196079, g: 0.25882354, b: 0.098039225, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1640552069294507113
 GameObject:
   m_ObjectHideFlags: 0
@@ -321,7 +247,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -20, y: -20}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1640552069391739285
 GameObject:
@@ -357,8 +283,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 75600, y: 53800}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 304, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1640552069391739306
 MonoBehaviour:
@@ -397,43 +323,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
-  m_VerticalFit: 1
+  m_VerticalFit: 2
---- !u!1 &1640552069560974911
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1640552069560974910}
-  m_Layer: 5
-  m_Name: Sliding Area
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1640552069560974910
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552069560974911}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1640552068989044856}
-  m_Father: {fileID: 1640552070304884976}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -20, y: -20}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1640552069749374213
 GameObject:
   m_ObjectHideFlags: 0
@@ -465,7 +355,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1640552068655503858}
-  - {fileID: 1640552070304884976}
   - {fileID: 1640552068777328505}
   m_Father: {fileID: 1640552070326309401}
   m_RootOrder: 0
@@ -533,7 +422,7 @@ MonoBehaviour:
   m_DecelerationRate: 0.135
   m_ScrollSensitivity: 20
   m_Viewport: {fileID: 1640552068655503858}
-  m_HorizontalScrollbar: {fileID: 1640552070304884983}
+  m_HorizontalScrollbar: {fileID: 0}
   m_VerticalScrollbar: {fileID: 1640552068777328504}
   m_HorizontalScrollbarVisibility: 2
   m_VerticalScrollbarVisibility: 2
@@ -577,7 +466,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1640552069826656991
 CanvasRenderer:
@@ -616,130 +505,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &1640552070304884977
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1640552070304884976}
-  - component: {fileID: 1640552070304884981}
-  - component: {fileID: 1640552070304884982}
-  - component: {fileID: 1640552070304884983}
-  m_Layer: 5
-  m_Name: Scrollbar Horizontal
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1640552070304884976
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552070304884977}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1640552069560974910}
-  m_Father: {fileID: 1640552069749374212}
-  m_RootOrder: 1
-  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: 20}
-  m_Pivot: {x: 0, y: 0}
---- !u!222 &1640552070304884981
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552070304884977}
-  m_CullTransparentMesh: 0
---- !u!114 &1640552070304884982
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552070304884977}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &1640552070304884983
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1640552070304884977}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 1640552068989044863}
-  m_HandleRect: {fileID: 1640552068989044856}
-  m_Direction: 0
-  m_Value: 1
-  m_Size: 0
-  m_NumberOfSteps: 0
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &1640552070326309402
 GameObject:
   m_ObjectHideFlags: 0
@@ -766,7 +531,7 @@ RectTransform:
   m_GameObject: {fileID: 1640552070326309402}
   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_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1640552069749374212}
   - {fileID: 1755534962032578113}
@@ -791,7 +556,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   uiParent: {fileID: 1640552069391739284}
-  prefabRadioAngleView: {fileID: 0}
+  prefabRadioAngleView: {fileID: 5661051786661170456, guid: 2103aece6a8328643a7acf177751a2e0,
+    type: 3}
   radioAngleViewMax: {fileID: 1755534962032578113}
   textNmme: {fileID: 1755534962027249134}
   btnClose: {fileID: 1755534962362916957}

Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab

@@ -280,6 +280,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2226f7ec37daed743bc4224c8fd85741, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  deviceID: 
   textNmme: {fileID: 0}
   btnAmplification: {fileID: 0}
   btnClose: {fileID: 0}
@@ -602,7 +603,6 @@ RectTransform:
   - {fileID: 5661051787491193928}
   - {fileID: 5661051787615273180}
   - {fileID: 5661051786693390299}
-  - {fileID: 5661051787661160652}
   m_Father: {fileID: 5661051786661170457}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -809,132 +809,3 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
---- !u!1 &5661051787661160655
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5661051787661160652}
-  - component: {fileID: 5661051787661160651}
-  - component: {fileID: 5661051787661160650}
-  - component: {fileID: 5661051787661160653}
-  m_Layer: 12
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5661051787661160652
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5661051787661160655}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 5661051786986208210}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 175, y: 175}
-  m_SizeDelta: {x: -382, y: -382}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5661051787661160651
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5661051787661160655}
-  m_CullTransparentMesh: 0
---- !u!114 &5661051787661160650
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5661051787661160655}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 03097fe8f5a5c4e41940f6e6aa6bf74c, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &5661051787661160653
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5661051787661160655}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 5661051787661160650}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 0}
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2

Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab

@@ -79,7 +79,7 @@ TextMesh:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 114525537}
-  m_Text: Hello World
+  m_Text: 
   m_OffsetZ: 0
   m_CharacterSize: 1
   m_LineSpacing: 1
@@ -123,7 +123,7 @@ Transform:
   m_Children:
   - {fileID: 114525538}
   m_Father: {fileID: 5512074156260461627}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6350339116943227109
 MonoBehaviour:
@@ -175,7 +175,7 @@ Transform:
   m_LocalScale: {x: 0.09868923, y: 0.09868923, z: 0.09868923}
   m_Children: []
   m_Father: {fileID: 5512074156260461627}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1868832763
 MeshFilter:
@@ -284,6 +284,80 @@ Transform:
   m_Father: {fileID: 6865737300552731159}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2040130835863971667
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2056527853569647125}
+  - component: {fileID: 5366621233820033847}
+  m_Layer: 11
+  m_Name: "Camera\u7535\u5B50"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &2056527853569647125
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2040130835863971667}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 275, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5512074156260461627}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!20 &5366621233820033847
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2040130835863971667}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 500
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 32768
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
 --- !u!1 &2096234269966851127
 GameObject:
   m_ObjectHideFlags: 0
@@ -610,6 +684,7 @@ MonoBehaviour:
   detectionRadius: 600
   isEngagedTarget: 0
   gxWRJCamera: {fileID: 6382256847466738257}
+  dzWRJCamera: {fileID: 5366621233820033847}
   batteryLife: 1
   classificationWindResistance: 1
   maximumFlyingSpeed: 1
@@ -623,6 +698,7 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 256
+  WRJName: 
   startPos: {fileID: 0}
   hight: 200
 --- !u!1 &7326748669528570608
@@ -636,7 +712,7 @@ GameObject:
   - component: {fileID: 8245684177115831463}
   - component: {fileID: 6382256847466738257}
   m_Layer: 11
-  m_Name: Camera
+  m_Name: "Camera\u5149\u5B66"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -687,7 +763,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 32567
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
@@ -1558,6 +1634,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
+--- !u!4 &8062921474742261735 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 87581316664468991}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &2044690712093867138 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -1570,12 +1652,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &8062921474742261735 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 87581316664468991}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &715777664892440568
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2435,12 +2511,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &7438984634337869280 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 715777664892440568}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1493477770847098501 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -2453,6 +2523,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &7438984634337869280 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 715777664892440568}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &749958366770983279
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9451,12 +9527,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &8348451640861860600 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 2092430464794464480}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &26700038631426461 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -9469,6 +9539,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &8348451640861860600 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 2092430464794464480}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2303540555920778128
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10328,6 +10404,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
+--- !u!4 &8153123965611774344 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 2303540555920778128}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &189366751241648877 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -10340,12 +10422,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &8153123965611774344 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 2303540555920778128}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2498570764477447715
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12152,6 +12228,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
+--- !u!4 &5201130470601836434 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 2809197756700194186}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &4299622186163530999 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -12164,12 +12246,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &5201130470601836434 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 2809197756700194186}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2982643334479475112
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13029,12 +13105,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &5167349154997552048 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 2982643334479475112}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3761472913846298837 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -13047,6 +13117,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &5167349154997552048 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 2982643334479475112}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3048292988923725988
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13906,12 +13982,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &4944900371505117884 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 3048292988923725988}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3970666008213377497 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -13924,6 +13994,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &4944900371505117884 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 3048292988923725988}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3662279832116246199
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14783,6 +14859,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
+--- !u!4 &6629702139642053807 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 3662279832116246199}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3423894577495912394 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -14795,12 +14877,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &6629702139642053807 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 3662279832116246199}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4110930979306373867
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15660,12 +15736,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &6331659836092723443 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 4110930979306373867}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &2619933972551867286 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -15678,6 +15748,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &6331659836092723443 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 4110930979306373867}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4880875880639175748
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16537,12 +16613,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &3273620095990738524 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 4880875880639175748}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &6839647458606122297 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -16555,6 +16625,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &3273620095990738524 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 4880875880639175748}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5511666963674910243
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17414,6 +17490,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
+--- !u!4 &2499279008215596091 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 5511666963674910243}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5848568455846123358 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -17426,12 +17508,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &2499279008215596091 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 5511666963674910243}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5521732607769453082
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20045,12 +20121,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &4057900896101589523 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 6233801842401300491}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5464551210618669430 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -20063,6 +20133,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &4057900896101589523 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 6233801842401300491}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6236486983173705355
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20922,12 +20998,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &4061707263712443539 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 6236486983173705355}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5466074992090322934 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -20940,6 +21010,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &4061707263712443539 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 6236486983173705355}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6531287970344790646
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -23553,12 +23629,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &713047693628054390 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 7437457271094913390}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8818103163389751315 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -23571,6 +23641,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &713047693628054390 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 7437457271094913390}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8108767849280698377
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -27166,12 +27242,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3}
---- !u!4 &1550832753322196951 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
-    type: 3}
-  m_PrefabInstance: {fileID: 8887797578038627791}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7350113383591171250 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb,
@@ -27184,3 +27254,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &1550832753322196951 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb,
+    type: 3}
+  m_PrefabInstance: {fileID: 8887797578038627791}
+  m_PrefabAsset: {fileID: 0}

Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl wzx0115.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a47110f4171287540829f3704ab158df
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -193,7 +193,14 @@ public class GameManager : MonoSingleton<GameManager>
             {
                 if (hitInfo.collider.tag == "WRJ")
                 {
-                    UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
+                    UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
+                    UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage;
+
+                    DroneViewDisplay.Instance.CreateUI(
+                        unmannedAerialVehicleManage.equipmentCommon.deviceID,
+                        unmannedAerialVehicleManage.wrjModel,
+                        unmannedAerialVehicleManage.WRJName,
+                        unmannedAerialVehicleManage.dzWRJCamera);
                 }
             }
         }

Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs

@@ -55,19 +55,19 @@ public class SingleMachineTest : MonoBehaviour
     
     void FixedUpdate()
     {
-        if (Input.GetMouseButtonDown(1))
+        //if (Input.GetMouseButtonDown(1))
-        {
+        //{
-            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+        //    Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-            RaycastHit hitInfo;
+        //    RaycastHit hitInfo;
-            if (Physics.Raycast(ray, out hitInfo, 1000))
+        //    if (Physics.Raycast(ray, out hitInfo, 1000))
-            {
+        //    {
-                if (hitInfo.collider.tag == "WRJ")
+        //        if (hitInfo.collider.tag == "WRJ")
-                {
+        //        {
-                    UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
+        //            UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = hitInfo.collider.GetComponent<UnmannedAerialVehicleManage>();
 
-                }
+        //        }
-            }
+        //    }
-        }
+        //}
     }
 
     [ContextMenu("Add")]

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

@@ -107,6 +107,10 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
     /// 光学无人机
     /// </summary>
     public Camera gxWRJCamera;
+    /// <summary>
+    /// 电子侦察无人机
+    /// </summary>
+    public Camera dzWRJCamera;
 
     #region  无人机数据
     /// <summary>
@@ -640,7 +644,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
         }
     }
 
-
+    public string WRJName;
     /// <summary>
     /// 单个无人机数据写入
     /// </summary>
@@ -665,6 +669,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
                 uav.wrjModel = wrjModel;
                 if (uav.tips != null)
                     uav.tips.text = wrjModel.ToString();
+                WRJName=wrjModel.ToString();
             }
         }
     }

Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs

@@ -12,9 +12,9 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
     #region UI
     public static List<RadioAngleView> radioAngleViews = new List<RadioAngleView>();
     /// <summary>
-    /// UI
+    /// UIPrefab
     /// </summary>
-    [Header("UI")] 
+    [Header("UIPrefab")] 
     public GameObject prefabRadioAngleView;
     /// <summary>
     /// 放大显示
@@ -56,36 +56,31 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
     /// <param name="wRJModel">无人机设备类型</param>
     /// <param name="name">无人机名称</param>
     /// <param name="camera">渲染摄像机画面</param>
-    public void CreateUI(string deviceID, WRJModel wRJModel,string name,Texture camera)
+    public void CreateUI(string deviceID, WRJModel wRJModel, string name, Camera camera)
     {
         RadioAngleView radioAngleView = radioAngleViews.Find(x => x.deviceID == deviceID);
         if (radioAngleView)
         {
             radioAngleViewMax.localScale = Vector3.one;
             textNmme.text = name;
-            rawShow.texture = camera;   
+            rawShow.texture = camera.targetTexture;
         }
         else
         {
-            switch (wRJModel)
+            if (wRJModel == WRJModel.电子侦察无人机|| wRJModel == WRJModel.光学无人机){
-            {
+                GameObject wrj = Instantiate(prefabRadioAngleView, uiParent);
-                case WRJModel.电子侦察无人机:
+                wrj.name = name;
-                    GameObject wrj = Instantiate(prefabRadioAngleView, uiParent);
+                RadioAngleView _radioAngleView = wrj.GetComponent<RadioAngleView>();
-                    wrj.name = name;
+                if (_radioAngleView)
-                    RadioAngleView _radioAngleView = wrj.GetComponent<RadioAngleView>();
+                {
-                    if (_radioAngleView)
+                    _radioAngleView.deviceID = deviceID;
-                    {
+                    _radioAngleView.textNmme.text = name;
-                        _radioAngleView.deviceID = deviceID;
+                    _radioAngleView.rawShow.texture = camera.targetTexture;
-                        _radioAngleView.textNmme.text = name;
+                    Mask mask = wrj.transform.GetComponentInChildren<Mask>();
-                        _radioAngleView.rawShow.texture = camera;
+                    if (mask)
-                        radioAngleViews.Add(_radioAngleView);
+                        mask.enabled= wRJModel == WRJModel.电子侦察无人机 ? true : false;
-                    }
+                    radioAngleViews.Add(_radioAngleView);
-                    break;
+                }
-                case WRJModel.光学无人机:
-
-                    break;
-                default:
-                    break;
             }
         }
     }