Mostly finnished shooting

2023-03-23 11:00:03 +01:00 · 2023-03-23 11:00:03 +01:00 · f5bb2d37ca
commit f5bb2d37ca
parent 551f70efc1
13 changed files with 661 additions and 10428 deletions
--- a/Assets/Materials/Grapic/bullet.png
+++ b/Assets/Materials/Grapic/bullet.png
--- a/Assets/Materials/Grapic/bullet.png.meta
+++ b/Assets/Materials/Grapic/bullet.png.meta
@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 061e24b8dfba2754987cf2a9f2b5ccd4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0, y: 0.625}
+  spritePixelsToUnits: 4
+  spriteBorder: {x: 0, y: 1, 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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 4
+    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: Server
+    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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Bullet.prefab
+++ b/Assets/Prefabs/Bullet.prefab
@ -75,8 +75,8 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 7482667652216324306, guid: 75f5f34dc1b5347e0b8351032682f224, type: 3}
+  m_SortingOrder: 100
+  m_Sprite: {fileID: 21300000, guid: 061e24b8dfba2754987cf2a9f2b5ccd4, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@ -137,7 +137,7 @@ BoxCollider2D:
  m_Offset: {x: 0, y: 0.21133333}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.28866667}
+    pivot: {x: 0.5, y: 0.5}
    oldSize: {x: 1, y: 1}
    newSize: {x: 1, y: 1}
    adaptiveTilingThreshold: 0.5
--- a/Assets/Prefabs/Pistol.prefab
+++ b/Assets/Prefabs/Pistol.prefab
@ -29,7 +29,8 @@ Transform:
  m_LocalPosition: {x: -59.94009, y: -0.20920512, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 5720843330968565312}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -73,7 +74,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
  m_Sprite: {fileID: -2064222288, guid: 28104bf5f59125b44af998dd9595d71d, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -98,7 +99,39 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  maxAmmo: -1
-  shootSpeed: 1
+  shootSpeed: 0.3
  damage: 10
-  fullAuto: 0
+  fullAuto: 1
+  shootPointHeight: 0.5
  Bullet: {fileID: 8107388911180569254, guid: a0bbab42aeac389439de3d9037aa88f4, type: 3}
+--- !u!1 &8781998717305130017
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5720843330968565312}
+  m_Layer: 0
+  m_Name: Shooting Point
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5720843330968565312
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8781998717305130017}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.5, y: 0.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8635401260561399923}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &8332619519653655368
+--- !u!1 &2277247808998486282
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -8,9 +8,159 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 8332619519653655371}
-  - component: {fileID: 8332619519653655365}
-  - component: {fileID: 8332619519653655370}
+  - component: {fileID: 2277247808998486281}
+  - component: {fileID: 2277247808998486280}
+  m_Layer: 0
+  m_Name: Hand
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2277247808998486281
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2277247808998486282}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.25, y: -0.25, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7515790212324061113}
+  m_Father: {fileID: 2277247809752681473}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2277247808998486280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2277247808998486282}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 87300c79431bf0440bcfa28bae89965c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &2277247809752681474
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2277247809752681473}
+  - component: {fileID: 2277247809752681472}
+  - component: {fileID: 2277247809752681487}
+  m_Layer: 0
+  m_Name: Arm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2277247809752681473
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2277247809752681474}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2277247808998486281}
+  m_Father: {fileID: 8349803369667653187}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2277247809752681472
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2277247809752681474}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, 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: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 2
+  m_Sprite: {fileID: 123631778, guid: 040af12ab12d3d8489bab4a8cb2b403d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &2277247809752681487
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2277247809752681474}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6ca0b9a86a179dc46bdf894519ceaeee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PL_Ani: {fileID: 8349803369667653189}
+  PL_Col: {fileID: 8349803369667653185}
+  PL_Script: {fileID: 8349803369667653188}
+  PL_Trans: {fileID: 8349803369667653187}
+  GR: {fileID: 8349803369875076366}
+  Cam: {fileID: 0}
+  rot: 0
+--- !u!1 &8349803368041049117
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8349803368041049118}
+  - component: {fileID: 8349803368041049104}
+  - component: {fileID: 8349803368041049119}
  m_Layer: 0
  m_Name: Fart
  m_TagString: Untagged
@ -18,28 +168,28 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &8332619519653655371
+--- !u!4 &8349803368041049118
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619519653655368}
+  m_GameObject: {fileID: 8349803368041049117}
  m_LocalRotation: {x: 0.18301274, y: -0.6830127, z: 0.18301274, w: 0.6830127}
  m_LocalPosition: {x: -2.14, y: 1.5, z: 0}
  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
  m_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 8332619521246703894}
-  m_RootOrder: 1
+  m_Father: {fileID: 8349803369667653187}
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 30, y: -90, z: 0}
--- !u!198 &8332619519653655365
+--- !u!198 &8349803368041049104
 ParticleSystem:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619519653655368}
+  m_GameObject: {fileID: 8349803368041049117}
  serializedVersion: 8
  lengthInSec: 0.5
  simulationSpeed: 1
@ -4740,14 +4890,14 @@ ParticleSystem:
        m_PostInfinity: 2
        m_RotationOrder: 4
    vectorLabel1_3: W
--- !u!199 &8332619519653655370
+--- !u!199 &8349803368041049119
 ParticleSystemRenderer:
  serializedVersion: 6
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619519653655368}
+  m_GameObject: {fileID: 8349803368041049117}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
@ -4812,7 +4962,7 @@ ParticleSystemRenderer:
  m_MeshWeighting2: 1
  m_MeshWeighting3: 1
  m_MaskInteraction: 0
--- !u!1 &8332619520482784791
+--- !u!1 &8349803368903862594
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -4820,7 +4970,7 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 8332619520482784790}
+  - component: {fileID: 8349803368903862595}
  m_Layer: 0
  m_Name: CamFollow
  m_TagString: Untagged
@ -4828,22 +4978,22 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &8332619520482784790
+--- !u!4 &8349803368903862595
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619520482784791}
+  m_GameObject: {fileID: 8349803368903862594}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 8, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 8332619521246703894}
-  m_RootOrder: 2
+  m_Father: {fileID: 8349803369667653187}
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8332619521246703898
+--- !u!1 &8349803369667653199
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -4851,12 +5001,13 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 8332619521246703894}
-  - component: {fileID: 8332619521246703895}
-  - component: {fileID: 8332619521246703892}
-  - component: {fileID: 8332619521246703893}
-  - component: {fileID: 8332619521246703889}
-  - component: {fileID: 8332619521246703888}
+  - component: {fileID: 8349803369667653187}
+  - component: {fileID: 8349803369667653186}
+  - component: {fileID: 8349803369667653185}
+  - component: {fileID: 8349803369667653184}
+  - component: {fileID: 8349803369667653188}
+  - component: {fileID: 8349803369667653189}
+  - component: {fileID: 8349803369667653198}
  m_Layer: 0
  m_Name: Player
  m_TagString: Player
@ -4864,31 +5015,32 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &8332619521246703894
+--- !u!4 &8349803369667653187
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521246703898}
+  m_GameObject: {fileID: 8349803369667653199}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -60.4, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 8332619521319774811}
-  - {fileID: 8332619519653655371}
-  - {fileID: 8332619520482784790}
+  - {fileID: 8349803368041049118}
+  - {fileID: 8349803368903862595}
+  - {fileID: 2277247809752681473}
+  - {fileID: 8349803369875076366}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8332619521246703895
+--- !u!212 &8349803369667653186
 SpriteRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521246703898}
+  m_GameObject: {fileID: 8349803369667653199}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
@ -4934,20 +5086,20 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!61 &8332619521246703892
+--- !u!61 &8349803369667653185
 BoxCollider2D:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521246703898}
+  m_GameObject: {fileID: 8349803369667653199}
  m_Enabled: 1
  m_Density: 1
  m_Material: {fileID: 6200000, guid: 352a265faa8faa434b812090e73f4ceb, type: 2}
  m_IsTrigger: 0
  m_UsedByEffector: 0
  m_UsedByComposite: 0
-  m_Offset: {x: -1.125, y: 2.5}
+  m_Offset: {x: 0, y: 1.25}
  m_SpriteTilingProperty:
    border: {x: 0, y: 0, z: 0, w: 0}
    pivot: {x: 0.5, y: 0.5}
@ -4958,16 +5110,16 @@ BoxCollider2D:
    adaptiveTiling: 0
  m_AutoTiling: 0
  serializedVersion: 2
-  m_Size: {x: 13.75, y: 5}
+  m_Size: {x: 3, y: 9.5}
  m_EdgeRadius: 0
--- !u!50 &8332619521246703893
+--- !u!50 &8349803369667653184
 Rigidbody2D:
  serializedVersion: 4
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521246703898}
+  m_GameObject: {fileID: 8349803369667653199}
  m_BodyType: 0
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
@ -4981,13 +5133,13 @@ Rigidbody2D:
  m_SleepingMode: 0
  m_CollisionDetection: 1
  m_Constraints: 4
--- !u!114 &8332619521246703889
+--- !u!114 &8349803369667653188
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521246703898}
+  m_GameObject: {fileID: 8349803369667653199}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: a238c84151853e1438fb4bf8922712a7, type: 3}
@ -4996,19 +5148,19 @@ MonoBehaviour:
  g:
    serializedVersion: 2
    m_Bits: 64
-  dashvec: {x: 100, y: 44}
-  drag: 1
+  dashvec: {x: 44, y: 22}
+  drag: 10
  dashes: 1
  Speed: 44
  JumpPwr: 44
--- !u!95 &8332619521246703888
+--- !u!95 &8349803369667653189
 Animator:
  serializedVersion: 4
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521246703898}
+  m_GameObject: {fileID: 8349803369667653199}
  m_Enabled: 1
  m_Avatar: {fileID: 0}
  m_Controller: {fileID: 9100000, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2}
@ -5021,7 +5173,20 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &8332619521319774808
+--- !u!114 &8349803369667653198
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8349803369667653199}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f8cf44783af10bb48a2fab4e0572b5d4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  interactImage: {fileID: 0}
+--- !u!1 &8349803369875076365
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -5029,7 +5194,7 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 8332619521319774811}
+  - component: {fileID: 8349803369875076366}
  m_Layer: 0
  m_Name: GroundCheck
  m_TagString: Untagged
@ -5037,18 +5202,92 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &8332619521319774811
+--- !u!4 &8349803369875076366
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8332619521319774808}
+  m_GameObject: {fileID: 8349803369875076365}
  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_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 8332619521246703894}
-  m_RootOrder: 0
+  m_Father: {fileID: 8349803369667653187}
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2277247808569864138
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2277247808998486281}
+    m_Modifications:
+    - target: {fileID: 8635401260561399884, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_FlipY
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399885, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: fullAuto
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399885, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: shootSpeed
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399886, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_Name
+      value: Pistol
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+--- !u!4 &7515790212324061113 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8635401260561399923, guid: f07ede375ba2efb408bce98a7e165ce2, type: 3}
+  m_PrefabInstance: {fileID: 2277247808569864138}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Player.prefab.meta
+++ b/Assets/Prefabs/Player.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: aa3f82e9253196c48943111de60ae509
+guid: ce6cce55512aa6a4ca90d2a65b2d7064
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/HomeBase.unity
+++ b/Assets/Scenes/HomeBase.unity
--- a/Assets/Scenes/Main_Game.unity
+++ b/Assets/Scenes/Main_Game.unity
--- a/Assets/Scripts/Bullet.cs
+++ b/Assets/Scripts/Bullet.cs
@ -10,15 +10,15 @@ public class Bullet : MonoBehaviour
    private void Start()
    {
        Damage = setDmg;
-        rb.AddForce(Vector2.right * 20);
+        rb.AddForce((Vector2)(Quaternion.Euler(0,0,rb.rotation) * Vector2.right) * 100, ForceMode2D.Impulse);
    }
-    private void OnCollisionEnter2D(Collision2D other)
+    private void OnTriggerEnter2D(Collider2D other)
    {
-        if(other.collider.CompareTag("Player"))
+        if(other.CompareTag("Player"))
        {
            return;
        }
-        if(other.collider.TryGetComponent<Health>(out Health health))
+        if(other.TryGetComponent<Health>(out Health health))
        {
            health.RemoveHP(Damage);
        }
--- a/Assets/Scripts/MouseFol.cs
+++ b/Assets/Scripts/MouseFol.cs
@ -14,8 +14,8 @@ public class MouseFol : MonoBehaviour
    public Animator PL_Ani;
    public BoxCollider2D PL_Col;
    public PlayerMovement PL_Script;
+    public Transform PL_Trans;
    public Transform GR;
-    public Camera Cam;
    public float rot;
    private void Awake()
    {
@ -40,7 +40,9 @@ public class MouseFol : MonoBehaviour
    }
    private void Update()
    {
-        Vector2 campoint = Cam.ScreenToWorldPoint(Mouse.ReadValue<Vector2>());
+        Aim.performed += _ => tpStand();
+        Aim.canceled += _ => deTpStand();
+        Vector2 campoint = Camera.main.ScreenToWorldPoint(Mouse.ReadValue<Vector2>());
        rot = (Mathf.Atan2((transform.position.y - campoint.y), (transform.position.x - campoint.x)) * Mathf.Rad2Deg) + 180;
        transform.rotation = Quaternion.AngleAxis(rot, Vector3.forward);
        if (Aim.IsPressed())
@ -55,11 +57,21 @@ public class MouseFol : MonoBehaviour
            {
                Rend.flipY = true;
                hand.transform.localPosition = new Vector3(hand.transform.localPosition.x, 0.25f, 0);
+                if (hand.transform.childCount > 0)
+                {
+                    Transform gun = hand.transform.GetChild(0);
+                    gun.GetComponent<SpriteRenderer>().flipY = true;
+                }
            }
            else
            {
                Rend.flipY = false;
                hand.transform.localPosition = new Vector3(hand.transform.localPosition.x, -0.25f, 0);
+                if (hand.transform.childCount > 0)
+                {
+                    Transform gun = hand.transform.GetChild(0);
+                    gun.GetComponent<SpriteRenderer>().flipY = false;
+                }
            }
        }
        else
@ -70,7 +82,14 @@ public class MouseFol : MonoBehaviour
            PL_Script.Overlap = new Vector2(6, 1);
            GR.localPosition = Vector3.zero;
            hand.SetActive(false);
-
        }
    }
+    private void tpStand()
+    {
+        PL_Trans.position = PL_Trans.position + new Vector3(0, 3.5f, 0);
+    }
+    private void deTpStand()
+    {
+        PL_Trans.position = PL_Trans.position - new Vector3(0, 3.5f, 0);
+    }
 }
--- a/Assets/Scripts/Weapon.cs
+++ b/Assets/Scripts/Weapon.cs
@ -8,13 +8,18 @@ public class Weapon : MonoBehaviour
    [SerializeField] private float shootSpeed;
    [SerializeField] private int damage;
    [SerializeField] private bool fullAuto;
+    [SerializeField] private float shootPointHeight;
    [SerializeField] private GameObject Bullet;
    private int Ammo;
    private bool shootDone;
    private float Wait;
+    private Transform shootPoint;
+    private SpriteRenderer SR;
    private void Start()
    {
        Ammo = maxAmmo;
+        shootPoint = transform.GetChild(0);
+        SR = transform.GetComponent<SpriteRenderer>();
    }
    public void shoot()
    {
@ -27,12 +32,24 @@ public class Weapon : MonoBehaviour
            shootDone = true;
        }
        Wait += shootSpeed;
-        GameObject bullet = GameObject.Instantiate(Bullet, transform.position, transform.rotation);
+        GameObject bullet = GameObject.Instantiate(Bullet, shootPoint.position, transform.rotation);
        bullet.GetComponent<Bullet>().setDmg = damage;
    }
    private void Update()
    {
        Wait -= Time.deltaTime;
        Wait = Mathf.Clamp(Wait, 0, shootSpeed);
+        if(Wait == 0)
+        {
+            shootDone = false;
+        }
+        if(SR.flipY)
+        {
+            shootPoint.localPosition = new Vector3(shootPoint.localPosition.x, -shootPointHeight, 0);
+        }
+        else
+        {
+            shootPoint.localPosition = new Vector3(shootPoint.localPosition.x, shootPointHeight, 0);
+        }
    }
 }
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -9,10 +9,10 @@ EditorUserSettings:
      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b
+      value: 5602505007020f080f0b542740735e444e4e4973297a7667742c1f61b2e56668
      flags: 0
    RecentlyUsedSceneGuid-2:
-      value: 5602505007020f080f0b542740735e444e4e4973297a7667742c1f61b2e56668
+      value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@ -19,7 +19,7 @@ MonoBehaviour:
    width: 1920
    height: 997
  m_ShowMode: 4
-  m_Title: Project
+  m_Title: Game
  m_RootView: {fileID: 2}
  m_MinSize: {x: 875, y: 350}
  m_MaxSize: {x: 10000, y: 10000}
@ -120,7 +120,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 90
+  controlID: 23
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -140,8 +140,8 @@ MonoBehaviour:
    y: 0
    width: 303
    height: 947
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 12}
  m_Panes:
  - {fileID: 12}
@ -171,7 +171,7 @@ MonoBehaviour:
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 91
+  controlID: 24
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -316,21 +316,21 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 14e5ffff28fbffff72620000b4620000
+      m_ExpandedIDs: 60e8fffff4f9ffff18640000466400007c640000
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: Arm
-        m_OriginalName: Arm
+        m_Name: 
+        m_OriginalName: 
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: -6892
+        m_UserData: 0
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
        m_IsRenamingFilename: 0
        m_ClientGUIView: {fileID: 6}
      m_SearchString: 
@ -620,9 +620,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 0.8896792, y: -26.058207, z: -5.6378365}
+    m_Target: {x: -59.94009, y: -0.20920512, z: -3.8147516}
    speed: 2
-    m_Value: {x: 0.8896792, y: -26.058207, z: -5.6378365}
+    m_Value: {x: -59.94009, y: -0.20920512, z: -3.8147516}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -673,9 +673,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 25.051517
+    m_Target: 8.648113
    speed: 2
-    m_Value: 25.051517
+    m_Value: 8.648113
  m_Ortho:
    m_Target: 1
    speed: 2
@ -835,36 +835,36 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets
+    - Assets/Prefabs
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets
+  - Assets/Prefabs
  m_LastFoldersGridSize: -1
  m_LastProjectPath: D:\repos\WIP\RatAttack2D
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 26640000
-    m_LastClickedID: 25638
-    m_ExpandedIDs: 00000000266400003264000046640000de6d0000147200009676000010770000887c000000ca9a3b
+    m_SelectedIDs: 48650000
+    m_LastClickedID: 25928
+    m_ExpandedIDs: 00000000de640000e0640000e2640000e4640000e6640000e8640000ea640000ec64000000ca9a3b
    m_RenameOverlay:
      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Scripts
+      m_OriginalName: Scripts
      m_EditFieldRect:
        serializedVersion: 2
        x: 0
        y: 0
        width: 0
        height: 0
-      m_UserData: 0
+      m_UserData: 25934
      m_IsWaitingForDelay: 0
      m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
      m_IsRenamingFilename: 1
      m_ClientGUIView: {fileID: 9}
    m_SearchString: 
@ -878,7 +878,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 000000002664000028640000
+    m_ExpandedIDs: 00000000de640000e0640000e2640000e4640000e6640000e8640000ea640000ec640000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -905,7 +905,7 @@ MonoBehaviour:
  m_ListAreaState:
    m_SelectedInstanceIDs: 
    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: c62300000000000092720000386300001a6300009a660000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@ -964,7 +964,7 @@ MonoBehaviour:
    m_SaveData: []
  m_LockTracker:
    m_IsLocked: 0
-  m_LastSelectedObjectID: -6892
+  m_LastSelectedObjectID: 25724
 --- !u!114 &17
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -1081,7 +1081,7 @@ MonoBehaviour:
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 377
  m_GlobalObjectId: 
  m_InspectorMode: 0
  m_LockTracker: