Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame

2020-02-01 06:21:05 +01:00 · 2020-02-01 06:21:05 +01:00 · 418c2928d3
parent 6f0bc3cd2a 53c4133a30
commit 418c2928d3
27 changed files with 9292 additions and 336 deletions
--- a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide
+++ b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide
--- a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm
+++ b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm
--- a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-wal
+++ b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-wal
--- a/Assets/Models/camp_fire.blend.meta
+++ b/Assets/Models/camp_fire.blend.meta
@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8f46595eddc51f745b8068526ad1ddf7
+ModelImporter:
+  serializedVersion: 19300
+  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
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    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/Models/camp_fire.blend1.meta
+++ b/Assets/Models/camp_fire.blend1.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c87e5d654a3101b4fba744a899c9b5d2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/door.blend.meta
+++ b/Assets/Models/door.blend.meta
@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c5e781ac470bf2c469882550ede67f06
+ModelImporter:
+  serializedVersion: 19300
+  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
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    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/Models/ladder.blend.meta
+++ b/Assets/Models/ladder.blend.meta
@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 3eebe2cc6abfd2c4aa95eea59f74fa76
+ModelImporter:
+  serializedVersion: 19300
+  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
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    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/Models/ladder.blend1.meta
+++ b/Assets/Models/ladder.blend1.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8b6c7b957a75c0e4f8a9ab09eac9550b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/wooden_plank.blend.meta
+++ b/Assets/Models/wooden_plank.blend.meta
@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 0f35d674fbc67b547ab04a9379f4328f
+ModelImporter:
+  serializedVersion: 19300
+  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
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    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/Prefabs/Barricade.prefab
+++ b/Assets/Prefabs/Barricade.prefab
@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1999182813209888360
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 874380372637160946}
+  - component: {fileID: 1908658187181555171}
+  m_Layer: 0
+  m_Name: Barricade
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &874380372637160946
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1999182813209888360}
+  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: 3546092385323716967}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1908658187181555171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1999182813209888360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a26079dbac7f3cd4bacb95972241b8cb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  blockType: 1
+  health: 100
+--- !u!1001 &8380342326956505725
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 874380372637160946}
+    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 528f4b131abb8f9498400c1cf4283eca,
+        type: 3}
+      propertyPath: m_Name
+      value: spikes
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 528f4b131abb8f9498400c1cf4283eca, type: 3}
+--- !u!4 &3546092385323716967 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 528f4b131abb8f9498400c1cf4283eca,
+    type: 3}
+  m_PrefabInstance: {fileID: 8380342326956505725}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Barricade.prefab.meta
+++ b/Assets/Prefabs/Barricade.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7933df0606f61e94e9008c58a313b22c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Part_Shoot_Weapon.prefab
+++ b/Assets/Prefabs/Part_Shoot_Weapon.prefab
--- a/Assets/Prefabs/Part_Shoot_Weapon.prefab.meta
+++ b/Assets/Prefabs/Part_Shoot_Weapon.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6480cbf8d57433a49b5d77875ceb391c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@ -47,9 +47,16 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  speed: 10
-  runSpeed: 15
+  runSpeed: 25
  rotateSpeed: 5
  mouseSensitive: 200
+  fireRate: 1
+  buildRate: 0.5
+  barricadeMaterials: 10
+  weaponList:
+  - {fileID: 2179056336067526865, guid: 666835f3de085f9409e62598a45208bf, type: 3}
+  - {fileID: 1999182813209888360, guid: 7933df0606f61e94e9008c58a313b22c, type: 3}
+  selectedWeapon: 0
 --- !u!136 &7985979212931499551
 CapsuleCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Weapon_1.prefab
+++ b/Assets/Prefabs/Weapon_1.prefab
@ -0,0 +1,174 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2179056336067526865
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2179056336067526864}
+  - component: {fileID: 5029589411118839234}
+  m_Layer: 0
+  m_Name: Weapon_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2179056336067526864
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179056336067526865}
+  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: 6577266460643852131}
+  - {fileID: 7618317123895151222}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5029589411118839234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179056336067526865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: deacf945ec0a8c64f9d87f0a522f9a03, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  weaponType: 1
+  weaponRange: 4
+  spawnShoot: {fileID: 4234349944776735638}
+  particleShoot: {fileID: 9220017394946394338, guid: 6480cbf8d57433a49b5d77875ceb391c,
+    type: 3}
+  damage: 0
+  fireRate: 0.5
+--- !u!1 &4234349944776735638
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7618317123895151222}
+  m_Layer: 0
+  m_Name: ShootSpawn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7618317123895151222
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4234349944776735638}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.36, z: 1.66}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2179056336067526864}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2179056334884689017
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2179056336067526864}
+    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.354
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.79
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.08
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.08
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.08
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: f7fb72950098ea84fbcb73709374e822,
+        type: 3}
+      propertyPath: m_Name
+      value: shotgun
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f7fb72950098ea84fbcb73709374e822, type: 3}
+--- !u!4 &6577266460643852131 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: f7fb72950098ea84fbcb73709374e822,
+    type: 3}
+  m_PrefabInstance: {fileID: 2179056334884689017}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Weapon_1.prefab.meta
+++ b/Assets/Prefabs/Weapon_1.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 666835f3de085f9409e62598a45208bf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/cabin.prefab
+++ b/Assets/Prefabs/cabin.prefab
--- a/Assets/Prefabs/cabin.prefab.meta
+++ b/Assets/Prefabs/cabin.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5322794fa1699704b8e50a14cef106b1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Test-Haitem.unity
+++ b/Assets/Scenes/Test-Haitem.unity
@ -121,46 +121,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &391253621 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3667633384733631754, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &391253622
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 391253621}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -2228417370725966487, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &531707007 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7469484624682501897, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &531707008
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 531707007}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -1550514412580984892, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
@ -253,283 +213,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &742958227 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -492420421572216379, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &742958228
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 742958227}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -8678823145569952518, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1012541192
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1012541196}
-  - component: {fileID: 1012541195}
-  - component: {fileID: 1012541194}
-  - component: {fileID: 1012541193}
-  m_Layer: 0
-  m_Name: Cube
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!65 &1012541193
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1012541194
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  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_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
--- !u!33 &1012541195
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1012541196
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.5, z: 4.81}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1046847972 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -594094835925579944, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1046847973
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1046847972}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 2212009239438826721, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1083437162 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -6203755416157869376, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1083437163
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1083437162}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -5611087096184871397, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1139821472 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4695666576454475813, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1139821473
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1139821472}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 4493585093827132993, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1001 &1260635599
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.68
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_Name
-      value: cabin
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1432614924 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -7462036371361415008, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1432614925
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1432614924}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -5053925668127403250, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
 --- !u!1 &1655437821
 GameObject:
  m_ObjectHideFlags: 0
@ -542,7 +225,7 @@ GameObject:
  - component: {fileID: 1655437824}
  - component: {fileID: 1655437823}
  - component: {fileID: 1655437822}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: Ground
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -623,6 +306,75 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &6179705720582673448
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5859379536716062794, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Name
+      value: cabin
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5322794fa1699704b8e50a14cef106b1, type: 3}
 --- !u!1001 &7985979212702423926
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -635,15 +387,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: Player
      objectReference: {fileID: 0}
-    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
-        type: 3}
-      propertyPath: runSpeed
-      value: 25
-      objectReference: {fileID: 0}
    - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: 5.19
      objectReference: {fileID: 0}
    - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
--- a/Assets/Scripts/BarricadeManager.cs
+++ b/Assets/Scripts/BarricadeManager.cs
@ -0,0 +1,45 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BarricadeManager : MonoBehaviour
+{
+    public int health = 0;
+    public List<GameObject> barricadePlanks = new List<GameObject>();
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        viewHealthAsPlanks();
+    }
+
+    public void addPlank()
+    {
+        if (health < (barricadePlanks.Count * 10)) {
+            health += 10;
+        }
+    }
+
+    void viewHealthAsPlanks()
+    {
+        if (barricadePlanks.Count > 0)
+        {
+            for (int i = 0; i < barricadePlanks.Count; i++)
+            {
+                if (i < (health / 10)) {
+                    barricadePlanks[i].SetActive(true);
+                }
+                else
+                {
+                    barricadePlanks[i].SetActive(false);
+                }
+            }
+        }
+    }
+}
--- a/Assets/Scripts/BarricadeManager.cs.meta
+++ b/Assets/Scripts/BarricadeManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: afb8d951e32b9384c861e86155405c9e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/BlockManager.cs
+++ b/Assets/Scripts/BlockManager.cs
@ -6,7 +6,7 @@ public class BlockManager : MonoBehaviour
 {
    public enum BlockType {None, Barricade};
    public BlockType blockType = BlockType.None;
-    public GameObject block;
+    public float health = 100;

    // Start is called before the first frame update
    void Start()
--- a/Assets/Scripts/PlayerManager.cs
+++ b/Assets/Scripts/PlayerManager.cs
@ -9,17 +9,21 @@ public class PlayerManager : MonoBehaviour
    public float runSpeed = 25;
    public float rotateSpeed = 5;
    public float mouseSensitive = 200;
+    public float buildRate = 0.5f;
+    private float buildTime;
    private bool run = false;
    private Camera playerCamera;
    private Rigidbody rigidBody;
+    public int barricadeMaterials = 10;
    public List<GameObject> weaponList = new List<GameObject>();
+    private GameObject createWeapon;
    [HideInInspector]public int selectedWeapon = 0;
-    public List<GameObject> weaponHandList = new List<GameObject>();


    // Start is called before the first frame update
    void Start()
    {
+        buildTime = buildRate;
        playerCamera = GetComponentInChildren<Camera>();
        rigidBody = GetComponent<Rigidbody>();
        Cursor.lockState = CursorLockMode.Locked;
@ -31,7 +35,9 @@ public class PlayerManager : MonoBehaviour
    {
        Move();
        RunSwitch();
-        selectWeapon();
+        SelectWeapon();
+        BuildBlock();
+        BuildBarricade();
    }

    void FixedUpdate()
@ -73,6 +79,10 @@ public class PlayerManager : MonoBehaviour
        ) {
            playerCamera.transform.Rotate(new Vector3(rotateSpeed * (-Input.GetAxis("Mouse Y") < 0 ? -Input.GetAxis("Mouse Y") : 0) * mouseSensitive * Time.deltaTime, 0, 0));
        }
+        else
+        {
+            playerCamera.transform.Rotate(new Vector3(rotateSpeed * -Input.GetAxis("Mouse Y") * mouseSensitive * Time.deltaTime, 0, 0));
+        }
    }

    void RunSwitch()
@ -87,13 +97,17 @@ public class PlayerManager : MonoBehaviour
        }
    }

-    void selectWeapon()
+    void SelectWeapon()
    {
-        if (weaponList.Count > 0 && weaponHandList.Count == weaponList.Count)
+        if (weaponList.Count > 0)
        {
-            weaponHandList[selectedWeapon].SetActive(false);
            if (Input.mouseScrollDelta.y > 0)
            {
+                WeaponManager weaponManager = weaponList[selectedWeapon].GetComponent<WeaponManager>();
+                if (weaponManager != null && createWeapon != null)
+                {
+                    Destroy(createWeapon);
+                }
                if (weaponList.Count > selectedWeapon + 1) {
                    selectedWeapon++;
                }
@ -104,6 +118,11 @@ public class PlayerManager : MonoBehaviour
            }
            else if (Input.mouseScrollDelta.y < 0)
            {
+                WeaponManager weaponManager = weaponList[selectedWeapon].GetComponent<WeaponManager>();
+                if (weaponManager != null && createWeapon != null)
+                {
+                    Destroy(createWeapon);
+                }
                if (selectedWeapon > 0)
                {
                    selectedWeapon--;
@ -113,7 +132,47 @@ public class PlayerManager : MonoBehaviour
                    selectedWeapon = weaponList.Count - 1;
                }
            }
-            weaponHandList[selectedWeapon].SetActive(true);
+            WeaponManager weaponManager2 = weaponList[selectedWeapon].GetComponent<WeaponManager>();
+            if (weaponManager2 != null && createWeapon == null)
+            {
+                createWeapon = Instantiate(weaponList[selectedWeapon]) as GameObject;
+                createWeapon.transform.parent = playerCamera.transform;
+                createWeapon.transform.localPosition = Vector3.zero;
+                createWeapon.transform.localEulerAngles = Vector3.zero;
+            }
+        }
+    }
+
+    void BuildBlock ()
+    {
+        if (Input.GetAxisRaw("Fire1") > 0 && buildTime < Time.time && weaponList.Count > 0)
+        {
+            Ray ray = playerCamera.ScreenPointToRay(Input.mousePosition);
+            RaycastHit hit;
+            if (Physics.Raycast(ray, out hit, Mathf.Infinity, LayerMask.GetMask("BuildPlace")))
+            {
+                BlockManager blockManager = weaponList[selectedWeapon].GetComponent<BlockManager>();
+                if (blockManager != null) { 
+                    Instantiate(weaponList[selectedWeapon], hit.point, transform.rotation);
+                    buildTime = buildRate + Time.time;
+                }
+            }
+        }
+    }
+
+    void BuildBarricade()
+    {
+        Ray ray = playerCamera.ScreenPointToRay(Input.mousePosition);
+        RaycastHit hit;
+        if (Physics.Raycast(ray, out hit, 1))
+        {
+            if (Input.GetAxisRaw("Build") > 0 && buildTime < Time.time && barricadeMaterials > 0 && hit.transform.tag == "BarricadeField")
+            {
+                BarricadeManager barricadeManager = hit.transform.GetComponent<BarricadeManager>();
+                barricadeManager.addPlank();
+                barricadeMaterials--;
+                buildTime = buildRate + Time.time;
+            }
        }
    }
 }
--- a/Assets/Scripts/WeaponManager.cs
+++ b/Assets/Scripts/WeaponManager.cs
@ -0,0 +1,47 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WeaponManager : MonoBehaviour
+{
+    public enum WeaponType { None, Shoot, Meele };
+    public WeaponType weaponType = WeaponType.None;
+    public float weaponRange = 1;
+    public GameObject spawnShoot;
+    public GameObject particleShoot;
+    public float damage = 0;
+    public float fireRate = 0.5f;
+    private float fireTime;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        fireTime = fireRate;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        WeaponAttack();
+    }
+
+    public void WeaponAttack()
+    {
+        if (Input.GetMouseButtonDown(0) && fireTime <= Time.time) {
+            if (weaponType == WeaponType.Shoot)
+            {
+                if (particleShoot != null)
+                {
+                    Debug.Log(transform.position);
+                    GameObject shoot = Instantiate(particleShoot, spawnShoot.transform.position, spawnShoot.transform.rotation);
+                    Destroy(shoot, 0.3f);
+                }
+            }
+            else if (weaponType == WeaponType.Meele)
+            {
+
+            }
+            fireTime = fireRate + Time.time;
+        }
+    }
+}
--- a/Assets/Scripts/WeaponManager.cs.meta
+++ b/Assets/Scripts/WeaponManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: deacf945ec0a8c64f9d87f0a522f9a03
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@ -42,7 +42,7 @@ InputManager:
    descriptiveName: 
    descriptiveNegativeName: 
    negativeButton: 
-    positiveButton: left ctrl
+    positiveButton: 
    altNegativeButton: 
    altPositiveButton: mouse 0
    gravity: 1000
@ -53,6 +53,22 @@ InputManager:
    type: 0
    axis: 0
    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Build
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: e
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
  - serializedVersion: 3
    m_Name: Fire2
    descriptiveName: 
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -3,7 +3,8 @@
 --- !u!78 &1
 TagManager:
  serializedVersion: 2
-  tags: []
+  tags:
+  - BarricadeField
  layers:
  - Default
  - TransparentFX
@ -13,8 +14,8 @@ TagManager:
  - UI
  - 
  - 
-  - 
-  - 
+  - BuildPlace
+  - BarricadeField
  - 
  - 
  -