Merge branch '22.10.2021_Zakhar' into develop

2021-10-29 11:48:15 +03:00 · 2021-10-29 11:48:15 +03:00 · 3efa93409a
commit 3efa93409a
parent bf2833ee45 1f550e442d
19 changed files with 14915 additions and 140 deletions
--- a/Assets/Prefabs_NEW/PlayerActions/AttackPosition.prefab
+++ b/Assets/Prefabs_NEW/PlayerActions/AttackPosition.prefab
@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &927940411605603790
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 927940411605603789}
+  - component: {fileID: 7031861517482839224}
+  m_Layer: 0
+  m_Name: AttackPosition
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &927940411605603789
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 927940411605603790}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.15, z: 1.381}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7516303854996844427}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7031861517482839224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 927940411605603790}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: af824e300ddd57e4e80f391bfd8efbfc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _startPosition: {fileID: 2549735032438626571}
+--- !u!1001 &1799292263412480589
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 927940411605603789}
+    m_Modifications:
+    - target: {fileID: 8121987183708165570, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_Name
+      value: LaserPrefab 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cb8749a9b299fa64089f10bdb65197f5, type: 3}
+--- !u!4 &7516303854996844427 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8121987183708165574, guid: cb8749a9b299fa64089f10bdb65197f5,
+    type: 3}
+  m_PrefabInstance: {fileID: 1799292263412480589}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2549735032438626571 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4294785083892605766, guid: cb8749a9b299fa64089f10bdb65197f5,
+    type: 3}
+  m_PrefabInstance: {fileID: 1799292263412480589}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs_NEW/PlayerActions/AttackPosition.prefab.meta
+++ b/Assets/Prefabs_NEW/PlayerActions/AttackPosition.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f67031e6325e4ad4f8a3e7af4c0fbc43
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs_NEW/PlayerActions/LaserAttack.asset
+++ b/Assets/Prefabs_NEW/PlayerActions/LaserAttack.asset
@ -12,11 +12,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ef86a7fd23f3f604d945074968fd7063, type: 3}
  m_Name: LaserAttack
  m_EditorClassIdentifier: 
-  duration: 0.15
-  distance: 1
+  duration: 0.3
+  distance: 2
  actionType: 1
  standartAttackPref: {fileID: 8121987183708165570, guid: cb8749a9b299fa64089f10bdb65197f5,
    type: 3}
-  standartAttackGroundImpact: {fileID: 8715260329460421181, guid: e0388f43a34de79458c79763de903ffb,
+  standartAttackGroundImpact: {fileID: 8619867339336636724, guid: fb745cfc34702fc4daee97f8f3273f09,
    type: 3}
  throw_SFX: {fileID: 0}
--- a/Assets/Prefabs_NEW/PlayerActions/StandartAttack.asset
+++ b/Assets/Prefabs_NEW/PlayerActions/StandartAttack.asset
@ -20,3 +20,4 @@ MonoBehaviour:
  standartAttackGroundImpact: {fileID: 8619867339336636724, guid: fb745cfc34702fc4daee97f8f3273f09,
    type: 3}
  throw_SFX: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3}
+  _offset: {fileID: 927940411605603789, guid: f67031e6325e4ad4f8a3e7af4c0fbc43, type: 3}
--- a/Assets/Prefabs_NEW/VFX/BulletFatBlue
+++ b/Assets/Prefabs_NEW/VFX/BulletFatBlue
--- a/Assets/Prefabs_NEW/VFX/BulletFatBlue
+++ b/Assets/Prefabs_NEW/VFX/BulletFatBlue
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a391404596041164194f89b424b06fe2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs_NEW/VFX/LaserPrefab
+++ b/Assets/Prefabs_NEW/VFX/LaserPrefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 8121987183708165574}
  - component: {fileID: 8121987183708165575}
  - component: {fileID: 8121987183708165572}
+  - component: {fileID: 2728299416178615475}
  - component: {fileID: 6726407894995915518}
  m_Layer: 0
  m_Name: LaserPrefab 1
@ -30,8 +31,8 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 3560900723245820978}
  - {fileID: 4294785083892605766}
+  - {fileID: 3560900723245820978}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -47,7 +48,7 @@ SphereCollider:
  m_Enabled: 1
  serializedVersion: 2
  m_Radius: 0.3
-  m_Center: {x: 0, y: 1, z: 0}
+  m_Center: {x: 0, y: 1, z: 1}
 --- !u!54 &8121987183708165572
 Rigidbody:
  m_ObjectHideFlags: 0
@ -63,7 +64,20 @@ Rigidbody:
  m_IsKinematic: 0
  m_Interpolate: 0
  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 2
+--- !u!114 &2728299416178615475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8121987183708165570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6ac3eebbbbc00ae408e546b1023dd451, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _startScale: {fileID: 8121987183708165574}
 --- !u!114 &6726407894995915518
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -77,7 +91,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  owner: 0
-  velocity: 50
+  velocity: 25
  damage: 360
 --- !u!1001 &6893609786012621583
 PrefabInstance:
@ -86,10 +100,35 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 8121987183708165574}
    m_Modifications:
+    - target: {fileID: 7219588875864783545, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: InitialModule.startSize.minScalar
+      value: 0.07
+      objectReference: {fileID: 0}
+    - target: {fileID: 7219588875864783545, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: InitialModule.startSizeY.minMaxState
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7219588875864783545, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: InitialModule.startSizeZ.minMaxState
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7219588875864851089, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: InitialModule.startRotationX.minMaxState
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7219588875864851089, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: InitialModule.startRotationY.minMaxState
+      value: 3
+      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
@ -99,7 +138,7 @@ PrefabInstance:
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1
+      value: 1.15
      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
@ -109,12 +148,12 @@ PrefabInstance:
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.7071068
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
@ -129,7 +168,7 @@ PrefabInstance:
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
@ -141,11 +180,21 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7219588875883208677, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7219588875883387333, guid: ab214974cd498df42867306700ba5fd2,
        type: 3}
      propertyPath: m_Name
      value: BulletFatBlue
      objectReference: {fileID: 0}
+    - target: {fileID: 7219588875883387333, guid: ab214974cd498df42867306700ba5fd2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: ab214974cd498df42867306700ba5fd2, type: 3}
 --- !u!4 &4294785083892605766 stripped
@ -164,7 +213,7 @@ PrefabInstance:
    - target: {fileID: 4746165193703840883, guid: 4e7523811a052fd46acf941fc69c8c98,
        type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4746165193703840883, guid: 4e7523811a052fd46acf941fc69c8c98,
        type: 3}
--- a/Assets/Scenes/Level_1.unity
+++ b/Assets/Scenes/Level_1.unity
@ -881,7 +881,7 @@ PrefabInstance:
    - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
        type: 3}
      propertyPath: m_RootOrder
-      value: 4
+      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
        type: 3}
@ -1661,7 +1661,7 @@ RectTransform:
  - {fileID: 925062906}
  - {fileID: 1378130271}
  m_Father: {fileID: 1801060022}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -4108,7 +4108,7 @@ Transform:
  - {fileID: 566274521}
  - {fileID: 1163069908}
  m_Father: {fileID: 1801060022}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 30, z: 0}
 --- !u!114 &1536054282
 MonoBehaviour:
@ -4146,6 +4146,36 @@ MonoBehaviour:
  - {fileID: 808829015}
  - {fileID: 741495690}
  _actualTargets: []
+--- !u!1 &1560310480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1560310481}
+  m_Layer: 0
+  m_Name: StartPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1560310481
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1560310480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.9, z: 0.685}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1801060022}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!850595691 &1579331161
 LightingSettings:
  m_ObjectHideFlags: 0
@ -4618,6 +4648,7 @@ Transform:
  m_LocalPosition: {x: 18.657974, y: 0, z: -16.15812}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 1560310481}
  - {fileID: 1944520322}
  - {fileID: 1996574566}
  - {fileID: 622020284}
@ -5431,7 +5462,7 @@ Transform:
  m_Children:
  - {fileID: 246600703}
  m_Father: {fileID: 1801060022}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2020157753 stripped
 MonoBehaviour:
@ -34141,7 +34172,7 @@ PrefabInstance:
    - target: {fileID: 4572196853266583038, guid: d00f156879942114488e4db0689a3fb7,
        type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4572196853266583038, guid: d00f156879942114488e4db0689a3fb7,
        type: 3}
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@ -167,7 +167,7 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 270363975}
+      - m_Target: {fileID: 1983758578}
        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
        m_MethodName: SetActive
        m_Mode: 6
@ -179,6 +179,82 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 1
        m_CallState: 2
+--- !u!1 &20011622
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 20011623}
+  - component: {fileID: 20011625}
+  - component: {fileID: 20011624}
+  m_Layer: 0
+  m_Name: TopBar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &20011623
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 20011622}
+  m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 34.967644}
+  m_LocalScale: {x: 0.5996092, y: 0.86098766, z: 0.06219328}
+  m_Children:
+  - {fileID: 993001542}
+  m_Father: {fileID: 1983758579}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 119.11127, y: -0.27087402}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &20011624
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 20011622}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3aed4ea9b4b170c44bc4a239f716fbac, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &20011625
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 20011622}
+  m_CullTransparentMesh: 1
 --- !u!1 &22853969
 GameObject:
  m_ObjectHideFlags: 0
@ -317,7 +393,7 @@ GameObject:
  - component: {fileID: 28181228}
  - component: {fileID: 28181230}
  - component: {fileID: 28181229}
-  m_Layer: 0
+  m_Layer: 5
  m_Name: Text (TMP) (1)
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -604,7 +680,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1849782111}
-  m_RootOrder: 2
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0.5}
  m_AnchorMax: {x: 1, y: 0.5}
@ -661,7 +737,7 @@ GameObject:
  - component: {fileID: 259848696}
  - component: {fileID: 259848695}
  - component: {fileID: 259848697}
-  m_Layer: 0
+  m_Layer: 5
  m_Name: ButtonWeapon_Laser
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -676,17 +752,17 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 259848693}
  m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: -8.694454}
-  m_LocalScale: {x: 29.15844, y: 32.43877, z: 32.438778}
+  m_LocalPosition: {x: 0, y: 0, z: -8.69446}
+  m_LocalScale: {x: 28.407621, y: 27.112568, z: 32.43878}
  m_Children:
  - {fileID: 1087850083}
  m_Father: {fileID: 1983758579}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 34.6, y: 15.7}
-  m_SizeDelta: {x: 0.876, y: 1.238}
+  m_AnchoredPosition: {x: 36.4, y: 15}
+  m_SizeDelta: {x: 0.876, y: 1.237999}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &259848695
 MonoBehaviour:
@ -783,7 +859,7 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 270363975}
+      - m_Target: {fileID: 1983758578}
        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
        m_MethodName: SetActive
        m_Mode: 6
@ -795,83 +871,6 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
--- !u!1 &270363975
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 270363976}
-  - component: {fileID: 270363978}
-  - component: {fileID: 270363977}
-  m_Layer: 0
-  m_Name: WeaponBG
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!224 &270363976
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 270363975}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -63}
-  m_LocalScale: {x: 14.446189, y: 14.446189, z: 14.446189}
-  m_Children:
-  - {fileID: 1983758579}
-  - {fileID: 993001542}
-  m_Father: {fileID: 981249586}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 883}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &270363977
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 270363975}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.9843137}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b90b79407b16c7e4a8f2997850adc602, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &270363978
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 270363975}
-  m_CullTransparentMesh: 1
 --- !u!1 &328485496
 GameObject:
  m_ObjectHideFlags: 0
@ -934,7 +933,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1849782111}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0.5}
  m_AnchorMax: {x: 0, y: 0.5}
@ -1539,7 +1538,7 @@ GameObject:
  - component: {fileID: 972429954}
  - component: {fileID: 972429953}
  - component: {fileID: 972429955}
-  m_Layer: 0
+  m_Layer: 5
  m_Name: ButtonWeapon_Lighting
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -1554,17 +1553,17 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 972429951}
  m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: -8.694454}
-  m_LocalScale: {x: 29.15844, y: 32.43877, z: 32.438778}
+  m_LocalPosition: {x: 0, y: 0, z: -8.69446}
+  m_LocalScale: {x: 28.407621, y: 27.112568, z: 32.43878}
  m_Children:
  - {fileID: 28181228}
  m_Father: {fileID: 1983758579}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 34.6, y: -15.7}
-  m_SizeDelta: {x: 0.876, y: 1.238}
+  m_AnchoredPosition: {x: 36.4, y: -15}
+  m_SizeDelta: {x: 0.876, y: 1.237999}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &972429953
 MonoBehaviour:
@ -1661,7 +1660,7 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 270363975}
+      - m_Target: {fileID: 1983758578}
        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
        m_MethodName: SetActive
        m_Mode: 6
@ -1703,9 +1702,9 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
-  - {fileID: 270363976}
+  - {fileID: 1983758579}
  m_Father: {fileID: 1849782111}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -1762,7 +1761,7 @@ GameObject:
  - component: {fileID: 993001545}
  - component: {fileID: 993001544}
  - component: {fileID: 993001543}
-  m_Layer: 0
+  m_Layer: 5
  m_Name: ButtonExit
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -1777,15 +1776,15 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 993001541}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 4.361012}
-  m_LocalScale: {x: 0.056509066, y: 0.056509066, z: 0.056509066}
+  m_LocalPosition: {x: 0, y: 0, z: -258.61777}
+  m_LocalScale: {x: 0.105246246, y: 0.069336705, z: 1.1034981}
  m_Children: []
-  m_Father: {fileID: 270363976}
-  m_RootOrder: 1
+  m_Father: {fileID: 20011623}
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -24, y: 46.19}
+  m_AnchoredPosition: {x: -39, y: -1.5592041}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &993001543
@ -1832,7 +1831,7 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 270363975}
+      - m_Target: {fileID: 1983758578}
        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
        m_MethodName: SetActive
        m_Mode: 6
@ -2046,7 +2045,7 @@ GameObject:
  - component: {fileID: 1087850083}
  - component: {fileID: 1087850085}
  - component: {fileID: 1087850084}
-  m_Layer: 0
+  m_Layer: 5
  m_Name: Text (TMP)
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -2773,9 +2772,9 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 136704028}
  - {fileID: 467766966}
  - {fileID: 981249586}
-  - {fileID: 136704028}
  m_Father: {fileID: 1801607763}
  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3199,13 +3198,13 @@ GameObject:
  - component: {fileID: 1983758579}
  - component: {fileID: 1983758581}
  - component: {fileID: 1983758580}
-  m_Layer: 0
+  m_Layer: 5
  m_Name: MenuBG
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1983758579
 RectTransform:
  m_ObjectHideFlags: 0
@ -3214,19 +3213,20 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1983758578}
  m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: -10.7060795}
-  m_LocalScale: {x: 0.7979032, y: 0.8876673, z: 0.7979032}
+  m_LocalPosition: {x: 0, y: 0, z: -509.5084}
+  m_LocalScale: {x: 17.43327, y: 16.638506, z: 14.570854}
  m_Children:
+  - {fileID: 20011623}
  - {fileID: 259848694}
  - {fileID: 972429952}
-  m_Father: {fileID: 270363976}
+  m_Father: {fileID: 981249586}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -53.625854}
-  m_SizeDelta: {x: 114.9597, y: 114.9597}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -72.99992}
+  m_SizeDelta: {x: 113.7, y: 114.9597}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1983758580
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Actions/Attack.cs
+++ b/Assets/Scripts/Actions/Attack.cs
@ -10,6 +10,10 @@ public class Attack : PlayerAction
    public GameObject standartAttackGroundImpact;

    public AudioClip throw_SFX;
+
+    //
+    //[SerializeField] private Transform _offset;
+    
    
    public override bool IsActionAllowed(TileInfo targetTile, PlayerState playerState)
    {
@ -30,8 +34,8 @@ public class Attack : PlayerAction
    public override void Impact(TileInfo targetTile, PlayerState currentPlayer)
    {
        base.Impact(targetTile, currentPlayer);
-        Vector3 direction = targetTile.tilePosition - currentPlayer.currentTile.tilePosition;
-        InitAttack(currentPlayer.currentTile.tilePosition, direction, currentPlayer.ownerIndex);
+        Vector3 direction = (targetTile.tilePosition  ) - currentPlayer.currentTile.tilePosition ;
+        InitAttack(currentPlayer.currentTile.tilePosition, direction  , currentPlayer.ownerIndex);
        //currentPlayer.GetComponent<AudioController>().PlaySound(throw_SFX);
    }

--- a/Assets/Scripts/ProjectileController.cs
+++ b/Assets/Scripts/ProjectileController.cs
@ -60,10 +60,10 @@ public class ProjectileController : MonoBehaviour
    {
        _isMoving = true;
        _rb.velocity = direction.normalized * velocity;
-        _tileOffset = tileOffset;
+        _tileOffset = tileOffset + 0.5f;
        this.owner = owner;

-        transform.LookAt(direction);
+        transform.LookAt((direction + Vector3.forward) * 10f);
    }

    private void OnTriggerEnter(Collider other)
--- a/Assets/Scripts/Weapons/ScaleChanger.cs
+++ b/Assets/Scripts/Weapons/ScaleChanger.cs
@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ScaleChanger : MonoBehaviour
+{
+    [SerializeField] private Transform _startScale;
+    private float minScale = 0;
+    private float maxScale = 1f;
+
+
+    private void Awake() 
+    {
+        //_startPosition.radius = 0.0f;
+        _startScale.localScale = new Vector3(minScale, minScale);
+    //    _maxRadius.radius = 0.1f;
+    }
+    private void Update() 
+    {
+        for(float i = minScale; i <= 1; i++)
+        {
+            var x = 0.1f;
+            minScale += x;
+            
+            _startScale.localScale = new Vector3(minScale, 1f, minScale);
+        }
+    }
+}
--- a/Assets/Scripts/Weapons/ScaleChanger.cs.meta
+++ b/Assets/Scripts/Weapons/ScaleChanger.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6ac3eebbbbc00ae408e546b1023dd451
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/menu/Portrait/Mode.png.meta
+++ b/Assets/Sprites/menu/Portrait/Mode.png.meta
@ -111,6 +111,18 @@ TextureImporter:
    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: []
--- a/Assets/Sprites/menu/Portrait/WeaponMenu/MenuBG.png.meta
+++ b/Assets/Sprites/menu/Portrait/WeaponMenu/MenuBG.png.meta
@ -44,8 +44,8 @@ TextureImporter:
  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
+  alignment: 4
+  spritePivot: {x: 0, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
--- a/Assets/Sprites/menu/Portrait/WeaponMenu/TopBar.png
+++ b/Assets/Sprites/menu/Portrait/WeaponMenu/TopBar.png
--- a/Assets/Sprites/menu/Portrait/WeaponMenu/TopBar.png.meta
+++ b/Assets/Sprites/menu/Portrait/WeaponMenu/TopBar.png.meta
@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 3aed4ea9b4b170c44bc4a239f716fbac
+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: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 0
+  alignment: 2
+  spritePivot: {x: 0.5, y: 1}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 0
+  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: 
--- a/Assets/StartPosition.cs
+++ b/Assets/StartPosition.cs
@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class StartPosition : MonoBehaviour
+{
+    [SerializeField] private Transform _startPosition; 
+
+    private void Awake() 
+    {
+        _startPosition.localScale = new Vector3(0f, 0f, 0f);
+    }
+    private void FixedUpdate() 
+    {
+        _startPosition.localScale += new Vector3(0.1f, 0.1f, 0.1f);
+    }
+
+}
--- a/Assets/StartPosition.cs.meta
+++ b/Assets/StartPosition.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af824e300ddd57e4e80f391bfd8efbfc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: