Add Teevee, Add TestGun and add RightHandAnchor

2020-08-14 19:00:57 +03:00 · 2020-08-14 19:00:57 +03:00 · 72f065e0d1
parent 3fbd0393da
commit 72f065e0d1
17 changed files with 872 additions and 113 deletions
--- a/Assets/Items/Raygun.prefab
+++ b/Assets/Items/Raygun.prefab
@ -198,7 +198,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5022353220472231776}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.15, y: -0.271, z: 0.309}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1605033999665909937}
@ -219,6 +219,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  RaygunCooldown: 1
+  Handle: {fileID: 1605033999665909937}
  LaserPrefab: {fileID: 8009551885746485900, guid: 5c99da0361d098646b319a35fcc80095, type: 3}
  RaygunAnimator: {fileID: 823779526010534736}
  BulletSourcePoint: {fileID: 9048980524933835922}
--- a/Assets/Items/Teevee.meta
+++ b/Assets/Items/Teevee.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 529d57fc3d0c9b54e922af2bdaa52ab7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Items/Teevee/CoverMat.mat
+++ b/Assets/Items/Teevee/CoverMat.mat
@ -0,0 +1,91 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-9045154936689046649
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CoverMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Items/Teevee/CoverMat.mat.meta
+++ b/Assets/Items/Teevee/CoverMat.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: adeaa37240b39674981c795dbd106297
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Items/Teevee/ScreenMat.mat
+++ b/Assets/Items/Teevee/ScreenMat.mat
@ -0,0 +1,91 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-9045154936689046649
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ScreenMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Items/Teevee/ScreenMat.mat.meta
+++ b/Assets/Items/Teevee/ScreenMat.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 77c8ce291da54e44a95aab36478f4dad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Items/Teevee/TeeveeMat.mat
+++ b/Assets/Items/Teevee/TeeveeMat.mat
@ -0,0 +1,91 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-9045154936689046649
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: TeeveeMat
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Items/Teevee/TeeveeMat.mat.meta
+++ b/Assets/Items/Teevee/TeeveeMat.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1ed5c6a3278058b41963bdc24ba2271b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Items/Teevee/Telly.fbx
+++ b/Assets/Items/Teevee/Telly.fbx
--- a/Assets/Items/Teevee/Telly.fbx.meta
+++ b/Assets/Items/Teevee/Telly.fbx.meta
@ -0,0 +1,101 @@
+fileFormatVersion: 2
+guid: 6a5fc221f07cc47409a6118dbbb9258a
+ModelImporter:
+  serializedVersion: 20101
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Items/TestGun2.prefab
+++ b/Assets/Items/TestGun2.prefab
@ -0,0 +1,373 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4140220380674628973
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 606707962148492301}
+  - component: {fileID: 7648489415013749098}
+  m_Layer: 0
+  m_Name: GunshotSfx
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &606707962148492301
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4140220380674628973}
+  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: 9048980524933835922}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &7648489415013749098
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4140220380674628973}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: -1410552352759146441, guid: ff7bf5284859d9f45a64971a67bb173a, type: 2}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 0
+  MinDistance: 2
+  MaxDistance: 1000
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!1 &4278392104837948798
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1605033999665909937}
+  m_Layer: 0
+  m_Name: GunHandle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1605033999665909937
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4278392104837948798}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.112, z: -0.173}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4677107243738498813}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5022353220472231776
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4677107243738498813}
+  - component: {fileID: 5603130069753505478}
+  m_Layer: 0
+  m_Name: TestGun2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4677107243738498813
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5022353220472231776}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
+  m_Children:
+  - {fileID: 1605033999665909937}
+  - {fileID: 264070833573311472}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!114 &5603130069753505478
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5022353220472231776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 65eee2dbd7da6664dbbe31e2c926fdba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  RaygunCooldown: 1
+  LaserPrefab: {fileID: 8009551885746485900, guid: 5c99da0361d098646b319a35fcc80095, type: 3}
+  RaygunAnimator: {fileID: 823779526010534736}
+  BulletSourcePoint: {fileID: 9048980524933835922}
+  BulletHitLayer:
+    serializedVersion: 2
+    m_Bits: 768
+  BulletPassLayer:
+    serializedVersion: 2
+    m_Bits: 8192
+  GunShotAudioSource: {fileID: 7648489415013749098}
+  RaygunClip: {fileID: 8300000, guid: 643f2f841d3577649b254780ae82bfcf, type: 3}
+--- !u!1 &6228136265624521654
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 264070833573311472}
+  - component: {fileID: 823779526010534736}
+  m_Layer: 0
+  m_Name: GunAnimator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &264070833573311472
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228136265624521654}
+  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: 7863868536358904304}
+  - {fileID: 9048980524933835922}
+  m_Father: {fileID: 4677107243738498813}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &823779526010534736
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228136265624521654}
+  m_Enabled: 0
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 8468d9a1f10314a4c998349493611489, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &6649619388343910146
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9048980524933835922}
+  m_Layer: 0
+  m_Name: GunShootPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9048980524933835922
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6649619388343910146}
+  m_LocalRotation: {x: -0.000000014901156, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.121, z: 0.7509999}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 606707962148492301}
+  m_Father: {fileID: 264070833573311472}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &7685581577592915483
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 264070833573311472}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.445
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.27051878
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.6533145
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.653314
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.27051932
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 135.014
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 1ed5c6a3278058b41963bdc24ba2271b, type: 2}
+    - target: {fileID: -7511558181221131132, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 77c8ce291da54e44a95aab36478f4dad, type: 2}
+    - target: {fileID: -7511558181221131132, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: adeaa37240b39674981c795dbd106297, type: 2}
+    - target: {fileID: 919132149155446097, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+      propertyPath: m_Name
+      value: Telly
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+--- !u!4 &7863868536358904304 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3}
+  m_PrefabInstance: {fileID: 7685581577592915483}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Items/TestGun2.prefab.meta
+++ b/Assets/Items/TestGun2.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b19fafdda1bd1f947b8806693d78dc1c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Player/Player.prefab
+++ b/Assets/Player/Player.prefab
@ -279,8 +279,7 @@ MonoBehaviour:
  HeadCollider: {fileID: 7391558913556166742}
  Ragdolling: 0
  GunGluedToHand: 1
-  Gun: {fileID: 1865991757674780053}
-  GunHandle: {fileID: 5713660789478474713}
+  Gun: {fileID: 1499532377406584238}
 --- !u!114 &6585337033203946896
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -1216,7 +1215,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6689431852042077044}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.15, y: -0.271, z: 0.309}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1865991757674780053}
@ -2907,39 +2906,39 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
--- !u!1 &378181050955954659 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2313131607479007952, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-  m_PrefabInstance: {fileID: 2676956051575718707}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &5585551264296828372 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -1682754096888168729, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-  m_PrefabInstance: {fileID: 2676956051575718707}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4058563969374220487 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2122496377756791796, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &8744249650485362980 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6665228367387902487, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-  m_PrefabInstance: {fileID: 2676956051575718707}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &4604321914683741605 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1928564536991127190, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-  m_PrefabInstance: {fileID: 2676956051575718707}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5591340088261064748 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -1675871812770890977, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &2498596356784760024 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+--- !u!1 &2909126165159328361 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 970877069575420250, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4604321914683741605 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1928564536991127190, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &378181050955954659 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2313131607479007952, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8020497713614398660 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5361814037758830583, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8744249650485362980 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6665228367387902487, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5615618764339399952 stripped
@ -2947,9 +2946,14 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: -1672846623409500637, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &2976767849567766614 stripped
+--- !u!4 &2498596356784760024 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_PrefabInstance: {fileID: 2676956051575718707}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5585551264296828372 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: -8328862363880354971, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_CorrespondingSourceObject: {fileID: -1682754096888168729, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
 --- !u!95 &8380320334439546530 stripped
@ -2962,14 +2966,9 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 4996979199693665407, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &2909126165159328361 stripped
+--- !u!1 &2976767849567766614 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 970877069575420250, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
-  m_PrefabInstance: {fileID: 2676956051575718707}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &8020497713614398660 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5361814037758830583, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+  m_CorrespondingSourceObject: {fileID: -8328862363880354971, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4574503883554023504
@ -3685,14 +3684,9 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
--- !u!1 &8134722540108977799 stripped
+--- !u!1 &7078895688717378999 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &4799245472480801387 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_CorrespondingSourceObject: {fileID: -2502122241363620377, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5143876166499415354 stripped
@ -3700,56 +3694,61 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 8654052703341272426, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &3404627525641887855 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &439248789966776954 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &5077275728796870648 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &7078895688717378999 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -2502122241363620377, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4420112016416942592 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 156644665701319248, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &1328534562678190810 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &7861152345155936203 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &4103164600241655739 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8167146500820978587 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -3590372263194287157, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4103164600241655739 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &439248789966776954 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7861152345155936203 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5077275728796870648 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4799245472480801387 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &3404627525641887855 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8134722540108977799 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
 --- !u!95 &7931246460515997121 stripped
 Animator:
  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1328534562678190810 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6416848661152764776
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -3815,8 +3814,3 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 65eee2dbd7da6664dbbe31e2c926fdba, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!4 &5713660789478474713 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1605033999665909937, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
-  m_PrefabInstance: {fileID: 6416848661152764776}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Scenes/Stardust/TestScene.unity
+++ b/Assets/Scenes/Stardust/TestScene.unity
@ -1879,18 +1879,6 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@ -1939,18 +1927,6 @@ PrefabInstance:
      propertyPath: m_Name
      value: LocalPlayer
      objectReference: {fileID: 0}
-    - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.15
-      objectReference: {fileID: 0}
-    - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.271
-      objectReference: {fileID: 0}
-    - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.309
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
 --- !u!1 &1002460576
--- a/Assets/Scripts/Animation/SoldierProceduralAnimator.cs
+++ b/Assets/Scripts/Animation/SoldierProceduralAnimator.cs
@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using NeonTea.Quakeball.Players;
+using NeonTea.Quakeball.Items;
 using NeonTea.Quakeball.Util;

 namespace NeonTea.Quakeball.Animation {
@ -21,8 +22,6 @@ namespace NeonTea.Quakeball.Animation {

        [Header("Gun holding")]
        public bool GunGluedToHand = true;
-        public Transform Gun;
-        public Transform GunHandle;

        private Animator Animator;
        private Transform BehindHand;
@ -60,7 +59,7 @@ namespace NeonTea.Quakeball.Animation {
            BehindHand = TransformUtil.FindChildWithName(Animator.transform, "HAND.R");
            FrontHand = TransformUtil.FindChildWithName(Animator.transform, "HAND.L");
            if (GunGluedToHand) {
-                Gun.parent = Animator.transform;
+                Player.Gun.transform.parent = Animator.transform;
            }
            AddRigidbodyToRagdoll(Animator.transform);
            StopRagdoll();
@ -102,10 +101,10 @@ namespace NeonTea.Quakeball.Animation {
            HeadCollider.eulerAngles = Head.eulerAngles;

            if (GunGluedToHand) {
-                Vector3 GunOffset = GunHandle.position - Gun.position;
+                Vector3 GunOffset = Player.Gun.RightHandAnchor.position - Player.Gun.transform.position;
                Vector3 GunDirection = (FrontHand.position - BehindHand.position).normalized;
-                Gun.position = BehindHand.position - GunOffset;
-                Gun.LookAt(Gun.position + GunDirection);
+                Player.Gun.transform.position = BehindHand.position - GunOffset;
+                Player.Gun.transform.LookAt(Player.Gun.transform.position + GunDirection);
            }
        }
    }
--- a/Assets/Scripts/Items/Item.cs
+++ b/Assets/Scripts/Items/Item.cs
@ -7,6 +7,7 @@ namespace NeonTea.Quakeball.Items {

        public abstract float Cooldown { get; }
        public abstract Animator Animator { get; }
+        public abstract Transform RightHandAnchor { get; }

        public abstract void Shoot(Player source);
        public abstract void OnSwitched();
--- a/Assets/Scripts/Items/Raygun.cs
+++ b/Assets/Scripts/Items/Raygun.cs
@ -11,8 +11,10 @@ namespace NeonTea.Quakeball.Items {

        public override float Cooldown => RaygunCooldown;
        public override Animator Animator => RaygunAnimator;
+        public override Transform RightHandAnchor => Handle;

        public float RaygunCooldown = 1;
+        public Transform Handle;

        [Header("Visuals")]
        public GameObject LaserPrefab;