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

Assets/GameAssets/Prefebs/Models/moder/微波武器.prefab

@@ -1047,7 +1047,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 210587999311835189}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
@@ -8405,6 +8405,9 @@ GameObject:
   - component: {fileID: 4624653741920304516}
   - component: {fileID: -7095872102439359058}
   - component: {fileID: -6342104493674816539}
+  - component: {fileID: -4762106535173360741}
+  - component: {fileID: 3205441564663912432}
+  - component: {fileID: 370307433607595141}
   m_Layer: 0
   m_Name: "\u5FAE\u6CE2\u6B66\u5668"
   m_TagString: AttackTarget
@@ -8473,6 +8476,48 @@ MonoBehaviour:
   microwtimer: 0
   Destructioneffect: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
     type: 3}
+--- !u!54 &-4762106535173360741
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644062476028321268}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &3205441564663912432
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644062476028321268}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.40157714, y: 0.6334842, z: 0.35170844}
+  m_Center: {x: 0.0019944669, y: 0.31143767, z: -0.050865896}
+--- !u!65 &370307433607595141
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644062476028321268}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.40157714, y: 0.6334842, z: 0.35170844}
+  m_Center: {x: 0.0019944669, y: 0.31143767, z: -0.050865896}
 --- !u!1 &1647604280920335269
 GameObject:
   m_ObjectHideFlags: 0
@@ -30485,7 +30530,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6495691818015757367}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0, y: 0.512, z: 0}
+  m_LocalPosition: {x: -0, y: 0.4535, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7770254985625530209}