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

Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab

@@ -1858,7 +1858,6 @@ GameObject:
   m_Component:
   - component: {fileID: 459346150931969862}
   - component: {fileID: 5637926424441476190}
-  - component: {fileID: 4602274861213029408}
   m_Layer: 12
   m_Name: Camera
   m_TagString: Untagged
@@ -1923,14 +1922,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &4602274861213029408
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1767001470430300072}
-  m_Enabled: 1
 --- !u!1 &1873580956069249748
 GameObject:
   m_ObjectHideFlags: 0
@@ -10041,6 +10032,7 @@ MonoBehaviour:
   selectedSide: 1
   equipmentType: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0"
   deviceID: 
+  ISPlayer: 0
   explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
     type: 3}
   isMove: 1
@@ -10111,6 +10103,9 @@ MonoBehaviour:
   Front: 1
   Detection: {fileID: 3494968556799403172, guid: c20b9fea41a9bce4e8780bab3d0e13f9,
     type: 3}
+  isplaser: 1
+  lasertimes: 0
+  ispcamera: 0
 --- !u!114 &7615181139496386323
 MonoBehaviour:
   m_ObjectHideFlags: 0