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

新增设备
2023-11-27 14:43:34 +08:00 · 2023-11-27 14:43:24 +08:00
15 changed files with 16422 additions and 255 deletions
--- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab
@ -3059,7 +3059,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3977472425108262603}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -490, y: 163.75, z: -68.73}
+  m_LocalPosition: {x: -499.75793, y: 134.3735, z: -238.27988}
  m_LocalScale: {x: 18, y: 18, z: 18}
  m_Children:
  - {fileID: 3510673994556807547}
@ -3086,6 +3086,7 @@ MonoBehaviour:
  deviceID: 
  explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
    type: 3}
+  isMove: 1
 --- !u!95 &3977472425108262601
 Animator:
  serializedVersion: 3
@ -3137,18 +3138,18 @@ MonoBehaviour:
  RadarUi: {fileID: 0}
  aniRandar: {fileID: 0}
  aniRandarUI: {fileID: 0}
-  TurntableSpeed: 1
-  DetectionRange: 1
-  NearBlindArea: 1
-  BatchStandardProcessingCapability: 1
-  DetectionSuccessRate: 1
-  MinimumDetectionVelocity: 1
-  RangeResolution: 1
-  AzimuthResolution: 1
-  AzimuthBeamwidth: 1
-  PitchBeamwidth: 1
-  detectionRadius: 200
-  NumberOfProbes: 0
+  TurntableSpeed: 9
+  DetectionRange: 3
+  NearBlindArea: 206
+  BatchStandardProcessingCapability: 31
+  DetectionSuccessRate: 83
+  MinimumDetectionVelocity: 3
+  RangeResolution: 2
+  AzimuthResolution: 3
+  AzimuthBeamwidth: 2
+  PitchBeamwidth: 13
+  detectionRadius: 3000
+  NumberOfProbes: 31
 --- !u!54 &916690897
 Rigidbody:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/DeviceBtn/HuoPao.prefab
+++ b/Assets/Resources/DeviceBtn/HuoPao.prefab
@ -77,7 +77,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u706B\u70AE"
+  m_Text: "\u6FC0\u5149\u6B66\u5668"
 --- !u!1 &3438159621899897934
 GameObject:
  m_ObjectHideFlags: 0
@ -253,3 +253,6 @@ MonoBehaviour:
  - {fileID: 0}
  modelname_text: {fileID: 3438159621284867111}
  isDragWRJ: 0
+  deviceID: 
+  isPlayer: 0
+  isThinck: 0
--- a/Assets/Resources/DeviceBtn/LeiDa.prefab
+++ b/Assets/Resources/DeviceBtn/LeiDa.prefab
@ -175,6 +175,9 @@ MonoBehaviour:
  - {fileID: 0}
  modelname_text: {fileID: 5970882835879795696}
  isDragWRJ: 0
+  deviceID: 
+  isPlayer: 0
+  isThinck: 0
 --- !u!1 &5970882835879795698
 GameObject:
  m_ObjectHideFlags: 0
@ -241,7 +244,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 70
+    m_FontSize: 60
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 0
--- a/Assets/Resources/DeviceBtn/PPTC.prefab
+++ b/Assets/Resources/DeviceBtn/PPTC.prefab
@ -0,0 +1,258 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3438159621284867109
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3438159621284867108}
+  - component: {fileID: 3438159621284867110}
+  - component: {fileID: 3438159621284867111}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3438159621284867108
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621284867109}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_Children: []
+  m_Father: {fileID: 3438159622267457519}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -57}
+  m_SizeDelta: {x: 300, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3438159621284867110
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621284867109}
+  m_CullTransparentMesh: 0
+--- !u!114 &3438159621284867111
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621284867109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9716981, g: 0.9487807, b: 0.9487807, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 60
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 70
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9891\u8C31\u63A2\u6D4B"
+--- !u!1 &3438159621899897934
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3438159621899897969}
+  - component: {fileID: 3438159621899897971}
+  - component: {fileID: 3438159621899897968}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3438159621899897969
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621899897934}
+  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: 3438159622267457519}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 91, y: 51}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3438159621899897971
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621899897934}
+  m_CullTransparentMesh: 0
+--- !u!114 &3438159621899897968
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621899897934}
+  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: dfb3b6fc11d64104992e827ac7b8687f, 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!1 &3438159622267457516
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3438159622267457519}
+  - component: {fileID: 3438159622267457296}
+  - component: {fileID: 3438159622267457297}
+  - component: {fileID: 3438159622238491400}
+  m_Layer: 5
+  m_Name: PPTC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3438159622267457519
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  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: 3438159621284867108}
+  - {fileID: 3438159621899897969}
+  m_Father: {fileID: 0}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3438159622267457296
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  m_CullTransparentMesh: 0
+--- !u!114 &3438159622267457297
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  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: 60c5320fb040c6843ab965eab1a777ca, 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 &3438159622238491400
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  prefabItem: {fileID: 625513913607457920, guid: 121324ce722bdb944a7cc1c7c3a5077f,
+    type: 3}
+  model: {fileID: 0}
+  huoPaoCtrls:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  modelname_text: {fileID: 3438159621284867111}
+  isDragWRJ: 0
+  deviceID: 
+  isPlayer: 0
+  isThinck: 0
--- a/Assets/Resources/DeviceBtn/PPTC.prefab.meta
+++ b/Assets/Resources/DeviceBtn/PPTC.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7172d3485574fbe468d89fbd11b8ca15
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/DeviceBtn/WBWQ.prefab
+++ b/Assets/Resources/DeviceBtn/WBWQ.prefab
@ -0,0 +1,258 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3438159621284867109
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3438159621284867108}
+  - component: {fileID: 3438159621284867110}
+  - component: {fileID: 3438159621284867111}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3438159621284867108
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621284867109}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_Children: []
+  m_Father: {fileID: 3438159622267457519}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -57}
+  m_SizeDelta: {x: 300, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3438159621284867110
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621284867109}
+  m_CullTransparentMesh: 0
+--- !u!114 &3438159621284867111
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621284867109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9716981, g: 0.9487807, b: 0.9487807, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 60
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 70
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5FAE\u6CE2\u6B66\u5668"
+--- !u!1 &3438159621899897934
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3438159621899897969}
+  - component: {fileID: 3438159621899897971}
+  - component: {fileID: 3438159621899897968}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3438159621899897969
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621899897934}
+  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: 3438159622267457519}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 91, y: 51}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3438159621899897971
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621899897934}
+  m_CullTransparentMesh: 0
+--- !u!114 &3438159621899897968
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159621899897934}
+  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: dfb3b6fc11d64104992e827ac7b8687f, 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!1 &3438159622267457516
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3438159622267457519}
+  - component: {fileID: 3438159622267457296}
+  - component: {fileID: 3438159622267457297}
+  - component: {fileID: 3438159622238491400}
+  m_Layer: 5
+  m_Name: WBWQ
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3438159622267457519
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  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: 3438159621284867108}
+  - {fileID: 3438159621899897969}
+  m_Father: {fileID: 0}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3438159622267457296
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  m_CullTransparentMesh: 0
+--- !u!114 &3438159622267457297
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  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: 60c5320fb040c6843ab965eab1a777ca, 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 &3438159622238491400
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3438159622267457516}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  prefabItem: {fileID: 625513913607457920, guid: 121324ce722bdb944a7cc1c7c3a5077f,
+    type: 3}
+  model: {fileID: 0}
+  huoPaoCtrls:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  modelname_text: {fileID: 3438159621284867111}
+  isDragWRJ: 0
+  deviceID: 
+  isPlayer: 0
+  isThinck: 0
--- a/Assets/Resources/DeviceBtn/WBWQ.prefab.meta
+++ b/Assets/Resources/DeviceBtn/WBWQ.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: afdd3e932e0d2a849b6a5a894c5fe6b7
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/DeviceBtn/WRJ.prefab
+++ b/Assets/Resources/DeviceBtn/WRJ.prefab
@ -35,7 +35,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: -57}
-  m_SizeDelta: {x: 300, y: 100}
+  m_SizeDelta: {x: 400, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3625114602127132432
 CanvasRenderer:
@ -66,7 +66,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 70
+    m_FontSize: 60
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 0
@ -77,7 +77,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u65E0\u4EBA\u673A"
+  m_Text: "\u8702\u7FA4\u65E0\u4EBA\u673A"
 --- !u!1 &3625114603376075994
 GameObject:
  m_ObjectHideFlags: 0
@ -179,6 +179,9 @@ MonoBehaviour:
  - {fileID: 0}
  modelname_text: {fileID: 3625114602127132433}
  isDragWRJ: 1
+  deviceID: 
+  isPlayer: 0
+  isThinck: 0
 --- !u!1 &3625114603613546360
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/DeviceBtn/WXD.prefab
+++ b/Assets/Resources/DeviceBtn/WXD.prefab
@ -35,7 +35,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: -57}
-  m_SizeDelta: {x: 300, y: 100}
+  m_SizeDelta: {x: 350, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3438159621284867110
 CanvasRenderer:
@ -66,7 +66,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 70
+    m_FontSize: 60
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 0
@ -77,7 +77,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u65E0\u7EBF\u7535"
+  m_Text: "\u65E0\u7EBF\u7535\u5E72\u6270"
 --- !u!1 &3438159621899897934
 GameObject:
  m_ObjectHideFlags: 0
@ -253,3 +253,6 @@ MonoBehaviour:
  - {fileID: 0}
  modelname_text: {fileID: 3438159621284867111}
  isDragWRJ: 0
+  deviceID: 
+  isPlayer: 0
+  isThinck: 0
--- a/Assets/Resources/Prefabs/TaishiPanel.prefab
+++ b/Assets/Resources/Prefabs/TaishiPanel.prefab
@ -535,7 +535,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2257686799701071879}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
@ -613,7 +613,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2572220159207927300}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
@ -1196,7 +1196,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4338166710974772547}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
--- a/Assets/Resources/UIPanel/ZonghePanel.prefab
+++ b/Assets/Resources/UIPanel/ZonghePanel.prefab
--- a/Assets/Resources/UIPanel/ZonghePanel.prefab.meta
+++ b/Assets/Resources/UIPanel/ZonghePanel.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 06182828e54edc3478e9f809a42fa24d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl
+++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl
--- a/Assets/Zion/Scripts/Adam/DragController.cs
+++ b/Assets/Zion/Scripts/Adam/DragController.cs
@ -45,6 +45,10 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
                model.GetComponent<EquipmentCommon>().isStartRehearsing = GlobalFlag.isStartRehearsing;
                List<List_paraItem> temp = UIBootstrap.Instance.GetListParaItemById(deviceID);
                model.GetComponent<EquipmentCommon>().FillInTheData(temp);
+                //
+                //
+                transform.SetAsLastSibling();
+                transform.localScale = Vector3.zero;
            }
            if (DragManager.Instance != null)
            {
@ -57,6 +61,10 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
        }
    }

+    void Add()
+    {
+        
+    }
    private void OnRay(GameObject target)
    {
        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@ -22,6 +22,8 @@ public class GameManager : MonoSingleton<GameManager>
    public DragController ldDrag;
    public DragController hpDrag;
    public DragController wxdDrag;
+    public DragController ppDrag;
+    public DragController wbDrag;
    public GameObject Teacher;
    public GameObject student;
    public GameObject posture;
@ -83,6 +85,22 @@ public class GameManager : MonoSingleton<GameManager>
                    wxd.deviceID = UIBootstrap.Instance.GetDeviceByName("地面无线电干扰").id;
                }
            }
+            if (UIBootstrap.Instance.GetDeviceByName("微波武器").device_count > 0)
+            {
+                for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("微波武器").device_count; i++)
+                {
+                    DragController wxd = Instantiate(wbDrag, dviceContent);
+                    wxd.deviceID = UIBootstrap.Instance.GetDeviceByName("微波武器").id;
+                }
+            }
+            if (UIBootstrap.Instance.GetDeviceByName("频谱探测").device_count > 0)
+            {
+                for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("频谱探测").device_count; i++)
+                {
+                    DragController wxd = Instantiate(ppDrag, dviceContent);
+                    wxd.deviceID = UIBootstrap.Instance.GetDeviceByName("频谱探测").id;
+                }
+            }
        }
        ///04 student 03 teacher
        if (GlobalFlag.currentUser.role_code == "04")
Author	SHA1	Message	Date
账号名	fcdae05dfe	Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane	2023-11-27 14:43:34 +08:00
账号名	300a4b54b3	新增设备	2023-11-27 14:43:24 +08:00