Merge FIX

Assets/Objects/Weapons/M9/M92.prefab

@@ -115,6 +115,7 @@ GameObject:
   m_Component:
   - component: {fileID: 732033708985862910}
   - component: {fileID: 6352645931139448055}
+  - component: {fileID: 5204381087217674634}
   m_Layer: 0
   m_Name: M92
   m_TagString: Untagged
@@ -129,7 +130,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5071598280516985511}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.03999999}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -153,6 +154,29 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &5204381087217674634
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5071598280516985511}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  weaponKind: 0
+  active: 0
+  damage: 0
+  firerate: 320
+  roundsPerShot: 1
+  recoilStrength: 0
+  currentAmmunition: 100
+  magazinSize: 100
+  totalAmmunition: 100
+  bulletExit: {fileID: 2236875552107647873}
+  allowAction: 1
 --- !u!1001 &1330674258901920049
 PrefabInstance:
   m_ObjectHideFlags: 0