add catana, shurikens and repair weapon changin and meele weapon animation

2021-09-21 23:09:33 +02:00
parent 2ecd9d20ac
commit 6741aa8b4d
53 changed files with 15052 additions and 1703 deletions
--- a/Assets/Animation/Hit_Catana.anim
+++ b/Assets/Animation/Hit_Catana.anim
--- a/Assets/Animation/Hit_Catana.anim.meta
+++ b/Assets/Animation/Hit_Catana.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7803bbf59f2cf0f4cab8dcc340825fdb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Animation/Hit_Hammer.anim
+++ b/Assets/Animation/Hit_Hammer.anim
@@ -54,7 +54,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: {x: 0.222, y: -0.547, z: 0.788}
+        value: {x: 0.222, y: -0.347, z: 0.988}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@@ -63,7 +63,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.33333334
-        value: {x: -0.469, y: -0.618, z: 1.369}
+        value: {x: -0.469, y: -0.418, z: 1.569}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@@ -72,7 +72,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.6666667
-        value: {x: 0.222, y: -0.547, z: 0.788}
+        value: {x: 0.222, y: -0.347, z: 0.988}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@@ -282,7 +282,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: -0.547
+        value: -0.347
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -291,7 +291,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.33333334
-        value: -0.618
+        value: -0.418
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -300,7 +300,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.6666667
-        value: -0.547
+        value: -0.347
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -319,7 +319,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: 0.788
+        value: 0.988
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -328,7 +328,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.33333334
-        value: 1.369
+        value: 1.569
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -337,7 +337,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.6666667
-        value: 0.788
+        value: 0.988
        inSlope: 0
        outSlope: 0
        tangentMode: 136
--- a/Assets/Animation/catana.controller
+++ b/Assets/Animation/catana.controller
@@ -0,0 +1,156 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-9004220134151213556
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Hit
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2940379869807754939}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &-7449663573921801892
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Nothing
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -9004220134151213556}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &-5428795861593359769
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -7449663573921801892}
+    m_Position: {x: 330, y: 50, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2940379869807754939}
+    m_Position: {x: 330, y: 170, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -7449663573921801892}
+--- !u!1101 &-3674553719226915408
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7449663573921801892}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &-2940379869807754939
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Hit_Catana
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3674553719226915408}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 7803bbf59f2cf0f4cab8dcc340825fdb, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: catana
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Hit
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -5428795861593359769}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
--- a/Assets/Animation/catana.controller.meta
+++ b/Assets/Animation/catana.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c3c9166ac7949440b55f266704c33de
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Animation/hammer.controller
+++ b/Assets/Animation/hammer.controller
@@ -1,8 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-7224886403619174139
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3193041202617100225}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.625
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-5736350174949018188
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -11,7 +33,7 @@ AnimatorState:
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: 7043675722454996173}
+  - {fileID: -7224886403619174139}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -29,7 +51,7 @@ AnimatorState:
  m_TimeParameter: 
 --- !u!1107 &-930544360885875965
 AnimatorStateMachine:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -38,7 +60,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -5736350174949018188}
-    m_Position: {x: 270, y: 120, z: 0}
+    m_Position: {x: 270, y: 180, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3193041202617100225}
    m_Position: {x: 270, y: 60, z: 0}
@@ -82,7 +104,7 @@ AnimatorController:
    m_Controller: {fileID: 9100000}
 --- !u!1102 &3193041202617100225
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -132,28 +154,3 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &7043675722454996173
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Hit
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -5736350174949018188}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.625
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
--- a/Assets/Models/building_lookout.blend.meta
+++ b/Assets/Models/building_lookout.blend.meta
@@ -0,0 +1,102 @@
+fileFormatVersion: 2
+guid: 287374cbbb847314192585d0145508c8
+ModelImporter:
+  serializedVersion: 20200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    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
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/building_lookout.blend1.meta
+++ b/Assets/Models/building_lookout.blend1.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: eeee2dc436a96064097705786918637e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/building_wc.blend.meta
+++ b/Assets/Models/building_wc.blend.meta
@@ -0,0 +1,102 @@
+fileFormatVersion: 2
+guid: de5d1ef5c04aab64d8cc17612a546654
+ModelImporter:
+  serializedVersion: 20200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    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
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/building_wc.blend1.meta
+++ b/Assets/Models/building_wc.blend1.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3535f7e602f6a7942b6d03965db7f20f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/melee_catana.blend1.meta
+++ b/Assets/Models/melee_catana.blend1.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 28008468aabbc2649a205958ca1fab5b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/melee_shurican.blend.meta
+++ b/Assets/Models/melee_shurican.blend.meta
@@ -0,0 +1,102 @@
+fileFormatVersion: 2
+guid: c9e1f5879111e874793df26abc33b999
+ModelImporter:
+  serializedVersion: 20200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    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
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/melee_shurican.blend1.meta
+++ b/Assets/Models/melee_shurican.blend1.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 889891afffaca604db8e3ad907909db3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Enemy.prefab
+++ b/Assets/Prefabs/Enemy.prefab
@@ -51,6 +51,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -75,6 +76,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!195 &4593238991022112296
 NavMeshAgent:
  m_ObjectHideFlags: 0
@@ -241,6 +243,26 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 5004747464968674621}
    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -256,6 +278,11 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
        type: 3}
      propertyPath: m_LocalRotation.x
@@ -271,16 +298,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@@ -296,21 +313,6 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.6
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.6
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: b12b2387bea57e2418c82d9a45fa92d9,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.6
-      objectReference: {fileID: 0}
    - target: {fileID: -2397996973257786244, guid: b12b2387bea57e2418c82d9a45fa92d9,
        type: 3}
      propertyPath: m_Materials.Array.data[0]
@@ -336,6 +338,11 @@ PrefabInstance:
      propertyPath: m_TagString
      value: Enemy
      objectReference: {fileID: 0}
+    - target: {fileID: 8208578879198709976, guid: b12b2387bea57e2418c82d9a45fa92d9,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 25453282709e9e74e93f2def6e1d097d, type: 2}
    - target: {fileID: 8208578879198709976, guid: b12b2387bea57e2418c82d9a45fa92d9,
        type: 3}
      propertyPath: m_Materials.Array.data[2]
@@ -346,11 +353,6 @@ PrefabInstance:
      propertyPath: m_Materials.Array.data[3]
      value: 
      objectReference: {fileID: 2100000, guid: c79a344d43511104bbfcdbfc399e983b, type: 2}
-    - target: {fileID: 8208578879198709976, guid: b12b2387bea57e2418c82d9a45fa92d9,
-        type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 25453282709e9e74e93f2def6e1d097d, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: b12b2387bea57e2418c82d9a45fa92d9, type: 3}
 --- !u!4 &7970332045596602580 stripped
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -349,7 +349,6 @@ GameObject:
  - component: {fileID: 7985979213387740674}
  - component: {fileID: 7985979213387740677}
  - component: {fileID: 7985979213387740676}
-  - component: {fileID: 42642414}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -422,63 +421,3 @@ AudioListener:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7985979213387740679}
  m_Enabled: 1
--- !u!114 &42642414
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7985979213387740679}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  volumeTrigger: {fileID: 7985979213387740674}
-  volumeLayer:
-    serializedVersion: 2
-    m_Bits: 1048576
-  stopNaNPropagation: 1
-  finalBlitToCameraTarget: 0
-  antialiasingMode: 1
-  temporalAntialiasing:
-    jitterSpread: 0.75
-    sharpness: 0.25
-    stationaryBlending: 0.95
-    motionBlending: 0.85
-  subpixelMorphologicalAntialiasing:
-    quality: 2
-  fastApproximateAntialiasing:
-    fastMode: 0
-    keepAlpha: 0
-  fog:
-    enabled: 1
-    excludeSkybox: 1
-  debugLayer:
-    lightMeter:
-      width: 512
-      height: 256
-      showCurves: 1
-    histogram:
-      width: 512
-      height: 256
-      channel: 3
-    waveform:
-      exposure: 0.12
-      height: 256
-    vectorscope:
-      size: 256
-      exposure: 0.12
-    overlaySettings:
-      linearDepth: 0
-      motionColorIntensity: 4
-      motionGridSize: 64
-      colorBlindnessType: 0
-      colorBlindnessStrength: 1
-  m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
-  m_ShowToolkit: 0
-  m_ShowCustomSorter: 0
-  breakBeforeColorGrading: 0
-  m_BeforeTransparentBundles: []
-  m_BeforeStackBundles: []
-  m_AfterStackBundles: []
--- a/Assets/Prefabs/Weapon_2.controller
+++ b/Assets/Prefabs/Weapon_2.controller
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!1102 &-2463383794519997824
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -50,7 +50,7 @@ AnimatorController:
    m_Controller: {fileID: 9100000}
 --- !u!1107 &5711157700122418881
 AnimatorStateMachine:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -59,7 +59,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -2463383794519997824}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 300, y: 60, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
--- a/Assets/Prefabs/Weapon_2.prefab
+++ b/Assets/Prefabs/Weapon_2.prefab
@@ -48,30 +48,6 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &2072999565456097107
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 352135056244199586}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: deacf945ec0a8c64f9d87f0a522f9a03, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  weaponType: 2
-  weaponRange: 2
-  spawnShoot: {fileID: 0}
-  particleShoot: {fileID: 0}
-  damage: 50
-  fireRate: 0.1
-  ammoCost: 2
-  animator: {fileID: 562605605}
-  player: {fileID: 0}
-  hit: 0
-  audioSource: {fileID: 0}
-  shootSound: []
 --- !u!1 &2587956328074680696
 GameObject:
  m_ObjectHideFlags: 0
@@ -121,7 +97,7 @@ MonoBehaviour:
  spawnShoot: {fileID: 0}
  particleShoot: {fileID: 0}
  damage: 50
-  fireRate: 0.1
+  fireRate: 0.2
  ammoCost: 2
  animator: {fileID: 562605605}
  player: {fileID: 0}
@@ -135,6 +111,26 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 3334427446306061280}
    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.2
+      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -143,12 +139,17 @@ PrefabInstance:
    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -0.547
+      value: -0.347
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0.788
+      value: 0.988
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7875457
      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
        type: 3}
@@ -165,16 +166,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0.22044483
      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7875457
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@@ -190,21 +181,6 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: -60.931004
      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.2
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.2
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 88f7f4632151cd5459f7ecc28fa722d4,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.2
-      objectReference: {fileID: 0}
    - target: {fileID: -1504981713932161579, guid: 88f7f4632151cd5459f7ecc28fa722d4,
        type: 3}
      propertyPath: m_CastShadows
--- a/Assets/Prefabs/Weapon_4.prefab
+++ b/Assets/Prefabs/Weapon_4.prefab
@@ -0,0 +1,241 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4058209543356239592
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3890451045794868336}
+  - component: {fileID: 273426593721444451}
+  m_Layer: 0
+  m_Name: Weapon_4
+  m_TagString: Meele
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3890451045794868336
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4058209543356239592}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.728, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5359983766291170622}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &273426593721444451
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4058209543356239592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: deacf945ec0a8c64f9d87f0a522f9a03, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  weaponType: 2
+  weaponRange: 3
+  spawnShoot: {fileID: 0}
+  particleShoot: {fileID: 0}
+  damage: 50
+  fireRate: 1
+  ammoCost: 0
+  animator: {fileID: 5252514808599814944}
+  player: {fileID: 0}
+  hit: 0
+  audioSource: {fileID: 0}
+  shootSound: []
+--- !u!65 &2910064985215499041
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4695473730205589380}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.5, y: 1, z: 17}
+  m_Center: {x: 0, y: 0, z: -2.5}
+--- !u!95 &5252514808599814944
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4695473730205589380}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 8c3c9166ac7949440b55f266704c33de, 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!64 &6232899424166644225
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5072361767776686257}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -5495902117074765545, guid: fae2b1b25861f0d498c4312f8fc61019, type: 3}
+--- !u!1001 &5613954274705285845
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3890451045794868336}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.49791
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.09011
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.17766
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.55182695
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.7892862
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.22076437
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.15419938
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 27.781
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -161.377
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -115.393
+      objectReference: {fileID: 0}
+    - target: {fileID: -5477749408508380018, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -5477749408508380018, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -5477749408508380018, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -1255605710908113952, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -1255605710908113952, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -1255605710908113952, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_Name
+      value: melee_catana
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: fae2b1b25861f0d498c4312f8fc61019,
+        type: 3}
+      propertyPath: m_TagString
+      value: Meele
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fae2b1b25861f0d498c4312f8fc61019, type: 3}
+--- !u!1 &4695473730205589380 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: fae2b1b25861f0d498c4312f8fc61019,
+    type: 3}
+  m_PrefabInstance: {fileID: 5613954274705285845}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5359983766291170622 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fae2b1b25861f0d498c4312f8fc61019,
+    type: 3}
+  m_PrefabInstance: {fileID: 5613954274705285845}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5072361767776686257 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: fae2b1b25861f0d498c4312f8fc61019,
+    type: 3}
+  m_PrefabInstance: {fileID: 5613954274705285845}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Weapon_4.prefab.meta
+++ b/Assets/Prefabs/Weapon_4.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: eed2a44203ade1147baeece20744f05a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Weapon_5.prefab
+++ b/Assets/Prefabs/Weapon_5.prefab
@@ -0,0 +1,278 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2243460039765714572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5579852160259598401}
+  - component: {fileID: 3747204898998437682}
+  - component: {fileID: 8572926720294251368}
+  m_Layer: 0
+  m_Name: Weapon_5
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5579852160259598401
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2243460039765714572}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 7.252058, y: 1.213, z: -0.7147267}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6472527388604877935}
+  - {fileID: 8730499250979427982}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3747204898998437682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2243460039765714572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: deacf945ec0a8c64f9d87f0a522f9a03, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  weaponType: 3
+  weaponRange: 20
+  spawnShoot: {fileID: 4031145088137188922}
+  particleShoot: {fileID: 8511070142498350320, guid: e8e4f071c756d4b40a5522973bd7401e,
+    type: 3}
+  damage: 20
+  fireRate: 0.2
+  ammoCost: 1
+  animator: {fileID: 0}
+  player: {fileID: 0}
+  hit: 0
+  audioSource: {fileID: 0}
+  shootSound:
+  - {fileID: 0}
+--- !u!82 &8572926720294251368
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2243460039765714572}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 0.5
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 2.4825754
+  MaxDistance: 500
+  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: 0
+      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 &4031145088137188922
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8730499250979427982}
+  m_Layer: 0
+  m_Name: ShootSpawn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8730499250979427982
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4031145088137188922}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.348, z: 0.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5579852160259598401}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &6798658766301211524
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5579852160259598401}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: c9e1f5879111e874793df26abc33b999,
+        type: 3}
+      propertyPath: m_Name
+      value: melee_shurican
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c9e1f5879111e874793df26abc33b999, type: 3}
+--- !u!4 &6472527388604877935 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c9e1f5879111e874793df26abc33b999,
+    type: 3}
+  m_PrefabInstance: {fileID: 6798658766301211524}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Weapon_5.prefab.meta
+++ b/Assets/Prefabs/Weapon_5.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2845b9b575871e24caafd706075833f2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/melee_shurican.prefab
+++ b/Assets/Prefabs/melee_shurican.prefab
@@ -0,0 +1,238 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8511070142498350320
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9031605801214312010}
+  - component: {fileID: 5402470220100235759}
+  - component: {fileID: 7862609038585070885}
+  - component: {fileID: 8852965134926415338}
+  - component: {fileID: 4616519279654289465}
+  - component: {fileID: 5253833153845275056}
+  - component: {fileID: 2639618007973915457}
+  m_Layer: 0
+  m_Name: melee_shurican
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9031605801214312010
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5402470220100235759
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  m_Mesh: {fileID: -8678823145569952518, guid: c9e1f5879111e874793df26abc33b999, type: 3}
+--- !u!23 &7862609038585070885
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!96 &8852965134926415338
+TrailRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Time: 0.5
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.06
+        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
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 0.3304112, g: 0.5687684, b: 0.9339623, a: 0.5882353}
+      key1: {r: 0.32941177, g: 0.5686275, b: 0.9333334, a: 0.5882353}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 1
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.1
+  m_Autodestruct: 0
+  m_Emitting: 1
+--- !u!65 &4616519279654289465
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.2, z: 1.2}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &5253833153845275056
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 2
+--- !u!114 &2639618007973915457
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8511070142498350320}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc054dea21bd894997c749bfb9c315a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ammoType: 1
+  rigidBody: {fileID: 5253833153845275056}
+  weaponManager: {fileID: 0}
--- a/Assets/Prefabs/melee_shurican.prefab.meta
+++ b/Assets/Prefabs/melee_shurican.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e8e4f071c756d4b40a5522973bd7401e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/PlayScene.unity
+++ b/Assets/Scenes/PlayScene.unity
@@ -6944,11 +6944,11 @@ RectTransform:
  m_Father: {fileID: 587476773}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 128, y: 32}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0, y: 0}
 --- !u!114 &1191888898
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7143,11 +7143,11 @@ RectTransform:
  m_Father: {fileID: 587476773}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 400, y: 400}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 1, y: 0}
 --- !u!114 &1327297298
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7231,17 +7231,17 @@ RectTransform:
  m_GameObject: {fileID: 1368020645}
  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_LocalScale: {x: 2, y: 2, z: 2}
  m_Children:
  - {fileID: 1942255811}
  m_Father: {fileID: 587476773}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -70}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -10, y: -10}
+  m_SizeDelta: {x: 49, y: 39}
+  m_Pivot: {x: 1, y: 1}
 --- !u!114 &1368020647
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7262,7 +7262,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: aca2defce6c6d644bb6e1a60a2ddae23, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bf3c045077238324cb2b2efcb2ffa74e, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -7839,7 +7839,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 36
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1814508279 stripped
 GameObject:
@@ -8015,54 +8015,6 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 250080840}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &1908201563
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1908201565}
-  - component: {fileID: 1908201564}
-  m_Layer: 20
-  m_Name: PPV
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1908201564
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1908201563}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  sharedProfile: {fileID: 11400000, guid: 601f6c5576713424aabe25899d8694a8, type: 2}
-  isGlobal: 1
-  blendDistance: 0
-  weight: 1
-  priority: 0
--- !u!4 &1908201565
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1908201563}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 6.3091087, y: 5.945063, z: -8.237778}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 36
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1922663893
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -8356,11 +8308,11 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
+    m_FontSize: 100
    m_FontStyle: 0
    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
+    m_MinSize: 1
+    m_MaxSize: 100
    m_Alignment: 1
    m_AlignByGeometry: 0
    m_RichText: 1
@@ -8385,16 +8337,16 @@ RectTransform:
  m_GameObject: {fileID: 1942255808}
  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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
  m_Children: []
  m_Father: {fileID: 1368020646}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -3.8}
-  m_SizeDelta: {x: 130, y: 24}
-  m_Pivot: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 260, y: 120}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!1 &2079126252 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 835007492758508419, guid: 5322794fa1699704b8e50a14cef106b1,
@@ -8803,7 +8755,7 @@ PrefabInstance:
    - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1,
        type: 3}
      propertyPath: m_RootOrder
-      value: 40
+      value: 37
      objectReference: {fileID: 0}
    - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1,
        type: 3}
@@ -9426,7 +9378,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3}
      propertyPath: m_Volume
-      value: 1
+      value: 0.2
      objectReference: {fileID: 0}
    - target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3}
      propertyPath: MinDistance
@@ -9444,7 +9396,7 @@ PrefabInstance:
    - target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
      propertyPath: m_Volume
-      value: 0.08
+      value: 0.01
      objectReference: {fileID: 0}
    - target: {fileID: 6900128296167351179, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
@@ -9466,6 +9418,23 @@ PrefabInstance:
      propertyPath: guiManager
      value: 
      objectReference: {fileID: 587476774}
+    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
+        type: 3}
+      propertyPath: weaponList.Array.size
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
+        type: 3}
+      propertyPath: weaponList.Array.data[3]
+      value: 
+      objectReference: {fileID: 4058209543356239592, guid: eed2a44203ade1147baeece20744f05a,
+        type: 3}
+    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
+        type: 3}
+      propertyPath: weaponList.Array.data[4]
+      value: 
+      objectReference: {fileID: 2243460039765714572, guid: 2845b9b575871e24caafd706075833f2,
+        type: 3}
    - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
      propertyPath: m_RootOrder
--- a/Assets/Scripts/AmmoManager.cs
+++ b/Assets/Scripts/AmmoManager.cs
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AmmoManager : MonoBehaviour
+{
+    public enum AmmoType { None, Shuriken, Bullet };
+    public AmmoType ammoType = AmmoType.None;
+    public Rigidbody rigidBody;
+    public WeaponManager weaponManager;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (ammoType == AmmoType.Shuriken)
+        {
+            rigidBody.AddForce(weaponManager.transform.forward * weaponManager.weaponRange, ForceMode.VelocityChange);
+            rigidBody.AddTorque(weaponManager.transform.right * 5, ForceMode.Force);
+            Destroy(this.gameObject, 5f);
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+     
+    }
+
+    public void OnCollisionEnter(Collision collision)
+    {
+        if (ammoType == AmmoType.Shuriken) {
+            if (collision.transform.tag != "Player") {
+                rigidBody.isKinematic = true;
+                rigidBody.velocity = Vector3.zero;
+                rigidBody.useGravity = false;
+                rigidBody.constraints = RigidbodyConstraints.FreezeAll;
+                GetComponent<TrailRenderer>().enabled = false;
+            }
+            if (collision.transform.tag == "Enemy")
+            {
+                transform.root.parent = collision.transform.root.transform;
+                collision.transform.GetComponent<EnemyManager>().Damage(weaponManager.damage);
+            } 
+        }
+    }
+}
--- a/Assets/Scripts/AmmoManager.cs.meta
+++ b/Assets/Scripts/AmmoManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dfc054dea21bd894997c749bfb9c315a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/EnemyManager.cs
+++ b/Assets/Scripts/EnemyManager.cs
@@ -175,7 +175,7 @@ public class EnemyManager : MonoBehaviour
    void Attack()
    {
        RaycastHit hit;
-        if (Physics.Raycast(transform.position + new Vector3(0,0.5f,0),transform.forward,out hit,1.5f) && attackTime <= Time.time)
+        if (Physics.Raycast(transform.position + new Vector3(0,0.5f,0),transform.forward,out hit,1f) && attackTime <= Time.time)
        {
            if (hit.transform.CompareTag("Player"))
            {
@@ -201,15 +201,42 @@ public class EnemyManager : MonoBehaviour
            Damage();
        }
    }
+    WeaponManager weaponManager = null;
+    bool localHit = false;

    void OnTriggerEnter(Collider collider)
    {
        if (collider.transform.CompareTag("Meele"))
        {
-            WeaponManager weaponManager = collider.transform.GetComponent<WeaponManager>();
-            if (weaponManager != null && weaponManager.hit) {
+            weaponManager = collider.transform.GetComponent<WeaponManager>();
+            if (weaponManager == null)
+            {
+                weaponManager = collider.transform.parent.GetComponent<WeaponManager>();
+            }
+            localHit = weaponManager.hit;
+            if (weaponManager != null && localHit) {
                Damage();
-                weaponManager.hit = false;
+                localHit = false;
+            }
+        }
+    }
+    void OnTriggerStay(Collider collider)
+    {
+        if (collider.transform.CompareTag("Meele"))
+        {
+            bool offOn = false;
+            if (weaponManager.hit == false) {
+                offOn = true;
+            } 
+            if (weaponManager.hit == true && offOn)
+            {
+                localHit = weaponManager.hit;
+                offOn = false;
+            }
+            if (weaponManager != null && localHit)
+            {
+                Damage();
+                localHit = false;
            }
        }
    }
--- a/Assets/Scripts/GuiManager.cs
+++ b/Assets/Scripts/GuiManager.cs
@@ -39,6 +39,6 @@ public class GuiManager : MonoBehaviour

    public void setWave(int wave)
    {
-        waves.text = "Wave: " + wave;
+        waves.text = wave.ToString();
    }
 }
--- a/Assets/Scripts/PlayerManager.cs
+++ b/Assets/Scripts/PlayerManager.cs
@@ -26,8 +26,8 @@ public class PlayerManager : MonoBehaviour
    public Sprite handImage;
    public GuiManager guiManager;
    public int selectedWeapon = 0;
-    private float selectRate = 1;
-    private float selectTime = 1;
+    private float selectRate = 0.1f;
+    private float selectTime = 0.1f;
    public AudioSource audio;
    public AudioClip lose;
    private float nextMapeTime = 3;
--- a/Assets/Scripts/WeaponManager.cs
+++ b/Assets/Scripts/WeaponManager.cs
@@ -4,7 +4,7 @@ using UnityEngine;

 public class WeaponManager : MonoBehaviour
 {
-    public enum WeaponType { None, Shoot, Meele };
+    public enum WeaponType { None, Shoot, Meele, Throw };
    public WeaponType weaponType = WeaponType.None;
    public float weaponRange = 1;
    public GameObject spawnShoot;
@@ -50,17 +50,44 @@ public class WeaponManager : MonoBehaviour
                    fireTime = fireRate + Time.time;
                }
            }
+            else if (weaponType == WeaponType.Throw)
+            {
+                if (particleShoot != null && player.ammo > (ammoCost - 1))
+                {
+                    GameObject shoot = Instantiate(particleShoot, spawnShoot.transform.position, spawnShoot.transform.rotation);
+                    if (shootSound.Count > 0)
+                    {
+                        int rand = Random.Range(0, shootSound.Count);
+                        audioSource.PlayOneShot(shootSound[rand]);
+                    }
+                    shoot.GetComponent<AmmoManager>().weaponManager = this;
+                    player.ammo -= ammoCost;
+                    fireTime = fireRate + Time.time;
+                }
+            }
            else if (weaponType == WeaponType.Meele)
            {
                hit = true;
-                animator.ResetTrigger("Hit");
                animator.SetTrigger("Hit");
                fireTime = fireRate + Time.time;
            }
        }
        if (fireTime <= Time.time)
        {
+            if (animator != null) {
+                animator.ResetTrigger("Hit");
+            }
            hit = false;
        }
    }
+
+    public void Hit_Enemy_Start ()
+    {
+        hit = true;
+    }
+
+    public void Hit_Enemy_End ()
+    {
+        hit = false;
+    }
 }
--- a/Assets/Sprites/Zombie_Waves.png.meta
+++ b/Assets/Sprites/Zombie_Waves.png.meta
@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: bf3c045077238324cb2b2efcb2ffa74e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: