From 5bbd627f9532ef508964370a2be3df3e4a1f80ff Mon Sep 17 00:00:00 2001
From: marcin <marcin.ra.nowak@gmail.com>
Date: Fri, 8 Aug 2025 15:24:24 +0200
Subject: [PATCH] animation for locomotions, block

---
 .../Spider/Materials/bloodSplash Spider.mat   |   1 +
 Assets/AI/Spider/Materials/step Spider.mat    |   1 +
 ...ctor@MeleeCombat Generic Spider.controller | 161 ++++----
 .../iOS/addressables_content_state.bin        | Bin 2517 -> 2517 bytes
 Assets/Meshes/scroll/scrollMat2D.mat          |   2 +-
 Assets/Meshes/scroll/scrollRT.renderTexture   |   4 +-
 .../Beasiculus/Bascileus_BaseModel.prefab     |  22 +-
 ...nvector@MeleeCombat Player PRO2.controller |  80 ++--
 Assets/Prefabs/PlayerWithUI.prefab            |  76 +++-
 Assets/Prefabs/UI/UI.prefab                   | 347 +++++++++++++++++-
 Assets/Scenes/Fight_Arena/Fight_Arena.unity   | 109 +++---
 .../ScriptableObjects/items.asset             |   2 +-
 Assets/Scripts/Utils/RotationDebugger.cs      |  37 ++
 Assets/Scripts/Utils/RotationDebugger.cs.meta |   2 +
 ...niversalRenderPipelineGlobalSettings.asset |  12 +-
 .../New UI/InventoryCamera.renderTexture      |  10 +-
 .../Other/Vases/Materials/Internal.mat        |  20 +-
 .../Animator/Invector@MeleeCombat.controller  | 173 ++++++++-
 .../Invector@MeleeCombat_Upperbody.controller | 200 +++++++++-
 .../Materials/Embers.mat                      |   1 +
 ProjectSettings/EditorBuildSettings.asset     |   2 +-
 21 files changed, 1041 insertions(+), 221 deletions(-)
 create mode 100644 Assets/Scripts/Utils/RotationDebugger.cs
 create mode 100644 Assets/Scripts/Utils/RotationDebugger.cs.meta

diff --git a/Assets/AI/Spider/Materials/bloodSplash Spider.mat b/Assets/AI/Spider/Materials/bloodSplash Spider.mat
index dd0efcf41..ca10b3470 100644
--- a/Assets/AI/Spider/Materials/bloodSplash Spider.mat	
+++ b/Assets/AI/Spider/Materials/bloodSplash Spider.mat	
@@ -25,6 +25,7 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
+  - _EMISSION
   - _NORMALMAP
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords:
diff --git a/Assets/AI/Spider/Materials/step Spider.mat b/Assets/AI/Spider/Materials/step Spider.mat
index 1078fa776..64b4365d6 100644
--- a/Assets/AI/Spider/Materials/step Spider.mat	
+++ b/Assets/AI/Spider/Materials/step Spider.mat	
@@ -13,6 +13,7 @@ Material:
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _DETAIL_MULX2
+  - _EMISSION
   - _NORMALMAP
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
diff --git a/Assets/AI/Spider/Others/Invector@MeleeCombat Generic Spider.controller b/Assets/AI/Spider/Others/Invector@MeleeCombat Generic Spider.controller
index 25dba0ec9..c758f65e1 100644
--- a/Assets/AI/Spider/Others/Invector@MeleeCombat Generic Spider.controller	
+++ b/Assets/AI/Spider/Others/Invector@MeleeCombat Generic Spider.controller	
@@ -134,17 +134,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1101 &-8009230114016819999
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -495,17 +494,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1102 &-6437731079876971950
 AnimatorState:
   serializedVersion: 6
@@ -982,15 +980,15 @@ AnimatorStateMachine:
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_StateMachineTransitions:
+  - first: {fileID: -5435637842980227641}
+    second:
+    - {fileID: 2720164238471712174}
   - first: {fileID: -1688899025759702823}
     second:
     - {fileID: 2851688886782318983}
   - first: {fileID: 3167114701981477117}
     second:
     - {fileID: -1878666232091422448}
-  - first: {fileID: -5435637842980227641}
-    second:
-    - {fileID: 2720164238471712174}
   - first: {fileID: -5331786242001199946}
     second:
     - {fileID: 6733449405045275255}
@@ -1150,17 +1148,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1107 &-3635562645734986207
 AnimatorStateMachine:
   serializedVersion: 6
@@ -1945,17 +1942,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!114 &-673947317450114069
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1981,17 +1977,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!114 &-649231428181458215
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2122,17 +2117,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!114 &-348029272405197234
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -15958,17 +15952,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!114 &114056155133226516
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -27347,12 +27340,12 @@ AnimatorStateMachine:
   m_StateMachineTransitions:
   - first: {fileID: 0}
     second: []
-  - first: {fileID: -4542421127847492856}
-    second:
-    - {fileID: -3372725074987697915}
   - first: {fileID: -4402485756765135232}
     second:
     - {fileID: -5899170128627615500}
+  - first: {fileID: -4542421127847492856}
+    second:
+    - {fileID: -3372725074987697915}
   - first: {fileID: 8636300584622815320}
     second:
     - {fileID: 1182130973115670829}
@@ -30738,17 +30731,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1101 &3052194717672762482
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -31303,17 +31295,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1107 &5357813520523893125
 AnimatorStateMachine:
   serializedVersion: 6
@@ -31617,17 +31608,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!114 &7078742720937134144
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -31712,17 +31702,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!206 &7397786857937398654
 BlendTree:
   m_ObjectHideFlags: 1
@@ -31795,17 +31784,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1101 &7877155640056541740
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -31924,17 +31912,16 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
-  debug: 0
-  useAttackTimeScale: 0
   resetTriggerBeforeTime: 0.5
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
   attackTimeScale: 0.2
   attackTimeScaleStart: -1
   attackTimeScaleEnd: -1
-  maxTargetDistance: 3
-  lowHealthTh: 10
-  degreeThreshold: 20
   rotatePlayerTowardsTarget: 0
-  rotationSpeed: 30
+  rotationActivationAngle: 45
+  debug: 0
 --- !u!1102 &8593672549159747023
 AnimatorState:
   serializedVersion: 6
@@ -31990,12 +31977,12 @@ AnimatorStateMachine:
   m_StateMachineTransitions:
   - first: {fileID: 0}
     second: []
-  - first: {fileID: -6751676885137508850}
-    second:
-    - {fileID: -7596945458921204548}
   - first: {fileID: 3347506453457172476}
     second:
     - {fileID: -1537164945698573202}
+  - first: {fileID: -6751676885137508850}
+    second:
+    - {fileID: -7596945458921204548}
   m_StateMachineBehaviours:
   - {fileID: -348029272405197234}
   m_AnyStatePosition: {x: -528, y: 60, z: 0}
diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin
index f0de76ec08726d11457fcb97ca11618cf4748350..36b690b1c3cb9cb2a70713f790763304efa98b7b 100644
GIT binary patch
delta 59
zcmV-B0L1^*6V(&2kO2WSvylO#1qAAhvm}!^2gd|kMs+Zg0|<r$zw<ewlZ^;^1Q7H~
RSCb0~dIU0;Khcwk2~3;V71#g(

delta 59
zcmV-B0L1^*6V(&2kO2WPvylO#1q4H;5}=bf2gd|gfz?uz0|<r$lnAy(lZ^;^1PL1B
R3zG{8dIYu$=3tYF2~2eR6n_8!

diff --git a/Assets/Meshes/scroll/scrollMat2D.mat b/Assets/Meshes/scroll/scrollMat2D.mat
index 068c2245b..68208e1ce 100644
--- a/Assets/Meshes/scroll/scrollMat2D.mat
+++ b/Assets/Meshes/scroll/scrollMat2D.mat
@@ -138,7 +138,7 @@ Material:
     - _MaxBrightness: 1
     - _Metallic: 0
     - _MinBrightness: 0
-    - _NoiseScale: 1.1615789
+    - _NoiseScale: 1.926683
     - _OcclusionStrength: 1
     - _Parallax: 0.005
     - _QueueControl: 0
diff --git a/Assets/Meshes/scroll/scrollRT.renderTexture b/Assets/Meshes/scroll/scrollRT.renderTexture
index b729517ab..2a68a2397 100644
--- a/Assets/Meshes/scroll/scrollRT.renderTexture
+++ b/Assets/Meshes/scroll/scrollRT.renderTexture
@@ -12,8 +12,8 @@ RenderTexture:
     Hash: 00000000000000000000000000000000
   m_IsAlphaChannelOptional: 0
   serializedVersion: 6
-  m_Width: 2868
-  m_Height: 1320
+  m_Width: 2778
+  m_Height: 1284
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 0
diff --git a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
index 7c4ff1664..653e7df15 100644
--- a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
+++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
@@ -49779,7 +49779,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 0af332725d9792840a4caa29e8991d08, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 0af332725d9792840a4caa29e8991d08, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
@@ -64051,7 +64051,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 11d2368480a40d442a5f8548276defef, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 11d2368480a40d442a5f8548276defef, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.5
@@ -87056,7 +87056,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 11d2368480a40d442a5f8548276defef, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 11d2368480a40d442a5f8548276defef, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.5
@@ -92636,7 +92636,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 11d2368480a40d442a5f8548276defef, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 11d2368480a40d442a5f8548276defef, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.5
@@ -105881,7 +105881,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   openCloseEvents: 0
   openCloseWindow: 1
-  selectedToolbar: 2
+  selectedToolbar: 0
   unlockCursorOnStart: 1
   showCursorOnStart: 1
   toggleWalk: 301
@@ -106082,7 +106082,7 @@ MonoBehaviour:
     useInput: 1
     isAxisInUse: 0
     isUnityInput: 0
-    keyboard: E
+    keyboard: F
     keyboardAxis: 0
     joystick: Mouse1
     joystickAxis: 0
@@ -106114,11 +106114,11 @@ MonoBehaviour:
     useInput: 1
     isAxisInUse: 0
     isUnityInput: 0
-    keyboard: Mouse1
+    keyboard: R
     keyboardAxis: 0
-    joystick: LB
+    joystick: R
     joystickAxis: 0
-    mobile: LB
+    mobile: R
     mobileAxis: 0
     joystickAxisInvert: 0
     keyboardAxisInvert: 0
@@ -107560,7 +107560,7 @@ MonoBehaviour:
   openCloseWindow: 1
   selectedToolbar: 0
   hideWeaponsAutomatically: 1
-  hideWeaponsTimer: 10
+  hideWeaponsTimer: 5
   lockInventoryInputOnLock: 0
   isLocked: 0
   hideAndDrawWeaponsInput:
@@ -124347,7 +124347,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: ec1c32a839515c64ebe8ea2fecf4cc8b, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: ec1c32a839515c64ebe8ea2fecf4cc8b, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.858
diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller
index fa4d939b4..cf27b31f1 100644
--- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller	
+++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller	
@@ -19915,7 +19915,7 @@ AnimatorStateMachine:
     m_Position: {x: 60, y: 72, z: 0}
   - serializedVersion: 1
     m_StateMachine: {fileID: 1107000013582462650}
-    m_Position: {x: 60, y: 24, z: 0}
+    m_Position: {x: 60, y: 20, z: 0}
   - serializedVersion: 1
     m_StateMachine: {fileID: 1107000010808252344}
     m_Position: {x: 60, y: 240, z: 0}
@@ -20663,7 +20663,7 @@ AnimatorTransition:
   m_Conditions:
   - m_ConditionMode: 6
     m_ConditionEvent: DefenseID
-    m_EventTreshold: 3
+    m_EventTreshold: 1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000012097988626}
   m_Solo: 0
@@ -23591,7 +23591,15 @@ BlendTree:
   m_Childs:
   - serializedVersion: 2
     m_Motion: {fileID: 7400036, guid: 6844dcb6a866ab34fa96c67e39eab693, type: 3}
-    m_Threshold: 1
+    m_Threshold: 0
+    m_Position: {x: 0, y: 0}
+    m_TimeScale: 1
+    m_CycleOffset: 0
+    m_DirectBlendParameter: InputHorizontal
+    m_Mirror: 0
+  - serializedVersion: 2
+    m_Motion: {fileID: 7400074, guid: 1bdc2ef74b0fc8b459c915473007e656, type: 3}
+    m_Threshold: 2
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
     m_CycleOffset: 0
@@ -23599,8 +23607,8 @@ BlendTree:
     m_Mirror: 0
   m_BlendParameter: MoveSet_ID
   m_BlendParameterY: Blend
-  m_MinThreshold: 1
-  m_MaxThreshold: 1
+  m_MinThreshold: 0
+  m_MaxThreshold: 2
   m_UseAutomaticThresholds: 0
   m_NormalizedBlendValues: 0
   m_BlendType: 0
@@ -24066,6 +24074,14 @@ BlendTree:
   m_Childs:
   - serializedVersion: 2
     m_Motion: {fileID: 7400012, guid: 6844dcb6a866ab34fa96c67e39eab693, type: 3}
+    m_Threshold: 0
+    m_Position: {x: 0, y: 0}
+    m_TimeScale: 1
+    m_CycleOffset: 0
+    m_DirectBlendParameter: InputHorizontal
+    m_Mirror: 0
+  - serializedVersion: 2
+    m_Motion: {fileID: 7400018, guid: 971c05bc2782d6a4ab995452aa8af824, type: 3}
     m_Threshold: 2
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
@@ -24074,8 +24090,8 @@ BlendTree:
     m_Mirror: 0
   m_BlendParameter: MoveSet_ID
   m_BlendParameterY: Blend
-  m_MinThreshold: 2
-  m_MaxThreshold: 3
+  m_MinThreshold: 0
+  m_MaxThreshold: 2
   m_UseAutomaticThresholds: 0
   m_NormalizedBlendValues: 0
   m_BlendType: 0
@@ -25172,7 +25188,7 @@ BlendTree:
     m_Motion: {fileID: 7400010, guid: bd68d75f916fcab4797c60bb57d4c952, type: 3}
     m_Threshold: 0
     m_Position: {x: 0, y: 0}
-    m_TimeScale: 1
+    m_TimeScale: 1.5
     m_CycleOffset: 0
     m_DirectBlendParameter: InputHorizontal
     m_Mirror: 0
@@ -25203,7 +25219,7 @@ BlendTree:
     m_Motion: {fileID: 7400014, guid: bd68d75f916fcab4797c60bb57d4c952, type: 3}
     m_Threshold: 0
     m_Position: {x: 0, y: 0.5}
-    m_TimeScale: 1.5
+    m_TimeScale: 1.8
     m_CycleOffset: 0
     m_DirectBlendParameter: InputHorizontal
     m_Mirror: 0
@@ -25211,7 +25227,7 @@ BlendTree:
     m_Motion: {fileID: 7400012, guid: bd68d75f916fcab4797c60bb57d4c952, type: 3}
     m_Threshold: 0.33333334
     m_Position: {x: 0, y: -0.5}
-    m_TimeScale: 1.5
+    m_TimeScale: 1.8
     m_CycleOffset: 0
     m_DirectBlendParameter: InputHorizontal
     m_Mirror: 0
@@ -25219,7 +25235,7 @@ BlendTree:
     m_Motion: {fileID: 7400016, guid: bd68d75f916fcab4797c60bb57d4c952, type: 3}
     m_Threshold: 0.6666667
     m_Position: {x: -0.5, y: 0}
-    m_TimeScale: 1.5
+    m_TimeScale: 1.8
     m_CycleOffset: 0
     m_DirectBlendParameter: InputHorizontal
     m_Mirror: 0
@@ -25227,7 +25243,7 @@ BlendTree:
     m_Motion: {fileID: 7400008, guid: bd68d75f916fcab4797c60bb57d4c952, type: 3}
     m_Threshold: 1
     m_Position: {x: 0.5, y: 0}
-    m_TimeScale: 1.5
+    m_TimeScale: 1.8
     m_CycleOffset: 0
     m_DirectBlendParameter: InputHorizontal
     m_Mirror: 0
@@ -25664,7 +25680,7 @@ BlendTree:
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 206501245926286824}
+    m_Motion: {fileID: 206568721273289890}
     m_Threshold: 2
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
@@ -25672,7 +25688,7 @@ BlendTree:
     m_DirectBlendParameter: InputHorizontal
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 206568721273289890}
+    m_Motion: {fileID: 206501245926286824}
     m_Threshold: 3
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
@@ -25977,7 +25993,7 @@ BlendTree:
   - serializedVersion: 2
     m_Motion: {fileID: 1827226128182048838, guid: 531132006e5eab74496ba03b1e0522dc,
       type: 3}
-    m_Threshold: 0
+    m_Threshold: 0.99
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
     m_CycleOffset: 0.5
@@ -25986,7 +26002,7 @@ BlendTree:
   - serializedVersion: 2
     m_Motion: {fileID: 1827226128182048838, guid: b960ca39823c61146aca51117dae0e2e,
       type: 3}
-    m_Threshold: 2
+    m_Threshold: 2.33
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
     m_CycleOffset: 0
@@ -26002,7 +26018,7 @@ BlendTree:
     m_Mirror: 1
   m_BlendParameter: MoveSet_ID
   m_BlendParameterY: Blend
-  m_MinThreshold: 0
+  m_MinThreshold: 0.99
   m_MaxThreshold: 3
   m_UseAutomaticThresholds: 0
   m_NormalizedBlendValues: 0
@@ -26544,7 +26560,7 @@ AnimatorStateTransition:
     m_EventTreshold: 0
   - m_ConditionMode: 6
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 0
+    m_EventTreshold: 10
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000014271736264}
   m_Solo: 0
@@ -26924,9 +26940,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 6
     m_ConditionEvent: HitDirection
     m_EventTreshold: 0
-  - m_ConditionMode: 6
+  - m_ConditionMode: 3
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 1
+    m_EventTreshold: -1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000012484611174}
   m_Solo: 0
@@ -27142,7 +27158,7 @@ AnimatorStateTransition:
     m_EventTreshold: -90
   - m_ConditionMode: 6
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 0
+    m_EventTreshold: 10
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000012278936604}
   m_Solo: 0
@@ -27334,9 +27350,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 6
     m_ConditionEvent: HitDirection
     m_EventTreshold: 180
-  - m_ConditionMode: 6
+  - m_ConditionMode: 3
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 1
+    m_EventTreshold: -1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000012034383302}
   m_Solo: 0
@@ -27367,7 +27383,7 @@ AnimatorStateTransition:
     m_EventTreshold: 180
   - m_ConditionMode: 6
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 0
+    m_EventTreshold: 10
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000014289005662}
   m_Solo: 0
@@ -27509,9 +27525,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 6
     m_ConditionEvent: HitDirection
     m_EventTreshold: 90
-  - m_ConditionMode: 6
+  - m_ConditionMode: 3
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 1
+    m_EventTreshold: -1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000010362101542}
   m_Solo: 0
@@ -27562,9 +27578,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 6
     m_ConditionEvent: HitDirection
     m_EventTreshold: -90
-  - m_ConditionMode: 6
+  - m_ConditionMode: 3
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 1
+    m_EventTreshold: -1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000010708744708}
   m_Solo: 0
@@ -27695,7 +27711,7 @@ AnimatorStateTransition:
     m_EventTreshold: 90
   - m_ConditionMode: 6
     m_ConditionEvent: ReactionID
-    m_EventTreshold: 0
+    m_EventTreshold: 10
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 1102000012631711216}
   m_Solo: 0
@@ -38840,7 +38856,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1102000012097988626}
-    m_Position: {x: 276, y: 168, z: 0}
+    m_Position: {x: 280, y: 170, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102000013808204466}
     m_Position: {x: 276, y: 96, z: 0}
@@ -38897,7 +38913,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1102000010362101542}
-    m_Position: {x: 408, y: 156, z: 0}
+    m_Position: {x: 410, y: 160, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102000010708744708}
     m_Position: {x: 408, y: 108, z: 0}
@@ -41737,7 +41753,7 @@ AnimatorStateMachine:
     m_Position: {x: 264, y: 156, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102477250759222040}
-    m_Position: {x: 264, y: 72, z: 0}
+    m_Position: {x: 260, y: 70, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions:
diff --git a/Assets/Prefabs/PlayerWithUI.prefab b/Assets/Prefabs/PlayerWithUI.prefab
index 49b5eb916..2f3c6b453 100644
--- a/Assets/Prefabs/PlayerWithUI.prefab
+++ b/Assets/Prefabs/PlayerWithUI.prefab
@@ -2613,7 +2613,7 @@ AudioSource:
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026,
     type: 2}
-  m_audioClip: {fileID: 8300000, guid: cb6bca78ec2de584297008b7e79a4893, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: cb6bca78ec2de584297008b7e79a4893, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 0.73
@@ -7744,7 +7744,7 @@ AudioSource:
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026,
     type: 2}
-  m_audioClip: {fileID: 8300000, guid: cb6bca78ec2de584297008b7e79a4893, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: cb6bca78ec2de584297008b7e79a4893, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 0.73
@@ -7952,7 +7952,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 34e85d693383be847abf0cc1fac873cd, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 34e85d693383be847abf0cc1fac873cd, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 1
@@ -18222,11 +18222,6 @@ PrefabInstance:
       propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 408309723930757398, guid: 60b79e23a507e0c48a94b7e3d5138383,
-        type: 3}
-      propertyPath: selectedToolbar
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 535701239129285396, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: m_Type
@@ -18477,11 +18472,6 @@ PrefabInstance:
       propertyPath: debugMode
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4967997804223717273, guid: 60b79e23a507e0c48a94b7e3d5138383,
-        type: 3}
-      propertyPath: selectedToolbar
-      value: 2
-      objectReference: {fileID: 0}
     - target: {fileID: 4967997804335029622, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: m_Name
@@ -18985,7 +18975,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxTargetingDistance: 7
   targetingInterval: 0.25
-  targetingAngleThreshold: 90
+  targetingAngleThreshold: 120
   playerRotationSpeed: 300
   materialHighlightPropertyName: _FresnelColor
   highlightColor: {r: 10.680627, g: 1.0696704, b: 0, a: 2}
@@ -18993,7 +18983,7 @@ MonoBehaviour:
   highlightFadeDuration: 0.3
   preferSkinnedMeshRenderer: 1
   autoLockSelectedTarget: 1
-  alwaysLockOnInCombat: 1
+  alwaysLockOnInCombat: 0
   targetLockSystem: {fileID: 0}
   manualSwitchCooldownDuration: 0.75
 --- !u!4 &6425420852750441961 stripped
@@ -25407,30 +25397,45 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 243.70001
       objectReference: {fileID: 0}
+    - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
     - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.89397
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.89397
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.89397
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.000015227457
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -335.10016
+      value: -314.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 3467769183097150057, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 138.6
       objectReference: {fileID: 0}
     - target: {fileID: 3627601100436493190, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
@@ -25484,6 +25489,37 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 21300000, guid: faf6f4fe86f531744b74405225e0273e,
         type: 3}
+    - target: {fileID: 3645238252358071421, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3646675666221312613, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: a3bd033a37eab52469f1ae1dc69caf5d,
+        type: 3}
+    - target: {fileID: 3646675666221312613, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_Color.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3646675666221312613, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3646675666221312613, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3646675666221312613, guid: 38ca8b4bc26702b40a70a342950990ee,
+        type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3676425008621208229, guid: 38ca8b4bc26702b40a70a342950990ee,
         type: 3}
       propertyPath: m_StaticEditorFlags
diff --git a/Assets/Prefabs/UI/UI.prefab b/Assets/Prefabs/UI/UI.prefab
index 6f0900fe1..b6b504bfe 100644
--- a/Assets/Prefabs/UI/UI.prefab
+++ b/Assets/Prefabs/UI/UI.prefab
@@ -32,7 +32,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6801932090720815126}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -111,15 +110,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -188,7 +189,6 @@ RectTransform:
   - {fileID: 2500768285719994611}
   - {fileID: 1880661522950692548}
   m_Father: {fileID: 6801932089634808189}
-  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -266,7 +266,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6801932089634808189}
-  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -339,7 +338,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7206908192520695755}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -389,6 +387,216 @@ MonoBehaviour:
   selectedToolbar: 0
   itemCollectedDisplayPrefab: {fileID: 7310698609727175809, guid: a52e5958fa7410a42b833b2c74205bf5,
     type: 3}
+--- !u!1 &5349881757870276381
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7392023492043442918}
+  - component: {fileID: 3521564600084792969}
+  - component: {fileID: 5335169791134541749}
+  - component: {fileID: 3462644888346362088}
+  - component: {fileID: 108852143879811704}
+  - component: {fileID: 7378049512233199252}
+  - component: {fileID: 4877984653246485006}
+  - component: {fileID: 5365327521091581160}
+  m_Layer: 5
+  m_Name: BlockButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!224 &7392023492043442918
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  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:
+  - {fileID: 1936450358763552208}
+  m_Father: {fileID: 3467106343024767485}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -270.9, y: 45.8}
+  m_SizeDelta: {x: 80, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3521564600084792969
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  m_CullTransparentMesh: 0
+--- !u!114 &5335169791134541749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  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.9411765}
+  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: 22defd343ced2e44ca4acd2209c4eafc, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3462644888346362088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 2
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 108852143879811704}
+          m_TargetAssemblyTypeName: 
+          m_MethodName: SetDownState
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: Jump
+            m_BoolArgument: 0
+          m_CallState: 1
+  - eventID: 3
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 108852143879811704}
+          m_TargetAssemblyTypeName: Beyond.ButtonHandler, Assembly-CSharp
+          m_MethodName: SetUpState
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: Jump
+            m_BoolArgument: 0
+          m_CallState: 1
+--- !u!114 &108852143879811704
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85bf3be603548374ca46f521a3aa7fda, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: R
+--- !u!114 &7378049512233199252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 1, g: 0.21323532, b: 0.21323532, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5335169791134541749}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!225 &4877984653246485006
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!114 &5365327521091581160
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349881757870276381}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ea88a0c448aaea43a76cba23e3c7076, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  interactable: 1
+  notInteractable: 0.25
+  button: {fileID: 7378049512233199252}
 --- !u!1 &6801932090720815122
 GameObject:
   m_ObjectHideFlags: 0
@@ -424,7 +632,6 @@ RectTransform:
   - {fileID: 6801932089634808189}
   - {fileID: 1839077491}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -448,7 +655,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -492,6 +701,85 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 1409810231
+--- !u!1 &8431563782467928602
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1936450358763552208}
+  - component: {fileID: 960208933649274706}
+  - component: {fileID: 8597564174650697175}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 0
+--- !u!224 &1936450358763552208
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8431563782467928602}
+  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: 7392023492043442918}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &960208933649274706
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8431563782467928602}
+  m_CullTransparentMesh: 0
+--- !u!114 &8597564174650697175
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8431563782467928602}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6431373}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1c7a637ebb71f034c97397ef794d1f18, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Crouch
 --- !u!1 &8698364153252516833
 GameObject:
   m_ObjectHideFlags: 0
@@ -525,7 +813,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3467106343024767485}
-  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -651,6 +938,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 7206908192520695755}
     m_Modifications:
     - target: {fileID: 2833215161112814859, guid: 3a31c3f7ca828d54cba3cf70fdec3a39,
@@ -1164,6 +1452,13 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 2833215161119882625, guid: 3a31c3f7ca828d54cba3cf70fdec3a39,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6753215826827461381}
   m_SourcePrefab: {fileID: 100100000, guid: 3a31c3f7ca828d54cba3cf70fdec3a39, type: 3}
 --- !u!114 &2500768285690122045 stripped
 MonoBehaviour:
@@ -1220,6 +1515,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 6801932089634808189}
     m_Modifications:
     - target: {fileID: 6811243254989464269, guid: acf2c66c1d76e584a9add29c592d6d7c,
@@ -1763,12 +2059,22 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: acf2c66c1d76e584a9add29c592d6d7c, type: 3}
+--- !u!224 &5564275997467306878 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6811243255008885643, guid: acf2c66c1d76e584a9add29c592d6d7c,
+    type: 3}
+  m_PrefabInstance: {fileID: 1422612116762857717}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6801932089623414181
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 6801932090720815126}
     m_Modifications:
     - target: {fileID: 100834, guid: 65d09cff7cef67d47a9d1f9a022f2d84, type: 3}
@@ -2015,6 +2321,21 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 3499237045339575344, guid: 65d09cff7cef67d47a9d1f9a022f2d84, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 22471896, guid: 65d09cff7cef67d47a9d1f9a022f2d84,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1987468028066110297}
+    - targetCorrespondingSourceObject: {fileID: 22471896, guid: 65d09cff7cef67d47a9d1f9a022f2d84,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5564275997467306878}
+    - targetCorrespondingSourceObject: {fileID: 22471896, guid: 65d09cff7cef67d47a9d1f9a022f2d84,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7206908192520695755}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 65d09cff7cef67d47a9d1f9a022f2d84, type: 3}
 --- !u!224 &6801932089634808189 stripped
 RectTransform:
@@ -2027,6 +2348,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 6801932090720815126}
     m_Modifications:
     - target: {fileID: 1335603875, guid: de3c1ae68c6ffa74a849f5dfd15e6fff, type: 3}
@@ -2219,6 +2541,17 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 2817248712471212993}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7960380535989919977, guid: de3c1ae68c6ffa74a849f5dfd15e6fff,
+        type: 3}
+      insertIndex: 7
+      addedObject: {fileID: 7392023492043442918}
+    - targetCorrespondingSourceObject: {fileID: 7960380535989919977, guid: de3c1ae68c6ffa74a849f5dfd15e6fff,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7858099936423330843}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: de3c1ae68c6ffa74a849f5dfd15e6fff, type: 3}
 --- !u!1 &2817248712471212993 stripped
 GameObject:
diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity
index e336adcfb..844e87751 100644
--- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity
+++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity
@@ -11612,6 +11612,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: SpiderSpawner (10)
       objectReference: {fileID: 0}
+    - target: {fileID: 5278190478906961761, guid: dbf14178717e1164086bd444126f4446,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5278190478906961763, guid: dbf14178717e1164086bd444126f4446,
         type: 3}
       propertyPath: m_prefab
@@ -12092,7 +12097,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
@@ -12573,7 +12578,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 3b34a8921a684b74db2296e7a7138d67, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 3b34a8921a684b74db2296e7a7138d67, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.282
@@ -13020,6 +13025,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: SpiderSpawner (13)
       objectReference: {fileID: 0}
+    - target: {fileID: 5278190478906961761, guid: dbf14178717e1164086bd444126f4446,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5278190478906961763, guid: dbf14178717e1164086bd444126f4446,
         type: 3}
       propertyPath: m_prefab
@@ -15129,42 +15139,42 @@ PrefabInstance:
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 210
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -135
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 210.00003
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -45
       objectReference: {fileID: 0}
     - target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15206,16 +15216,6 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
-    - target: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: selectedToolbar
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: weakAttackInput.keyboard
-      value: F
-      objectReference: {fileID: 0}
     - target: {fileID: 1494204689157949844, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -16030,22 +16030,22 @@ PrefabInstance:
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 210
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -225
       objectReference: {fileID: 0}
     - target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -16285,22 +16285,22 @@ PrefabInstance:
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 210
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -315
       objectReference: {fileID: 0}
     - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -16327,11 +16327,6 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 5054440825960491160, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: targetingAngleThreshold
-      value: 120
-      objectReference: {fileID: 0}
     - target: {fileID: 5083365752064418721, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.x
@@ -17362,6 +17357,26 @@ PrefabInstance:
       propertyPath: startItems.Array.data[28].addToEquipArea
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[8].changeAttributes
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[8].attributes.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[8].attributes.Array.data[0].name
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: startItems.Array.data[8].attributes.Array.data[0].value
+      value: 15
+      objectReference: {fileID: 0}
     - target: {fileID: 5613825752652024524, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -17412,11 +17427,6 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
-    - target: {fileID: 5935883484735210940, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: selectedToolbar
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 5935883485110830931, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_IsActive
@@ -17640,22 +17650,22 @@ PrefabInstance:
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 210
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -405
       objectReference: {fileID: 0}
     - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -18439,7 +18449,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
@@ -18959,7 +18969,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
@@ -19147,6 +19157,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: SpiderSpawner (12)
       objectReference: {fileID: 0}
+    - target: {fileID: 5278190478906961761, guid: dbf14178717e1164086bd444126f4446,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5278190478906961763, guid: dbf14178717e1164086bd444126f4446,
         type: 3}
       propertyPath: m_prefab
@@ -21827,7 +21842,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 8b57cdbdc26c0ff4687a14aa72ab330d, type: 3}
+  m_audioClip: {fileID: 0}
   m_Resource: {fileID: 8300000, guid: 8b57cdbdc26c0ff4687a14aa72ab330d, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 0.326
@@ -22903,7 +22918,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
@@ -23183,7 +23198,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
-    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/Scripts/InvectorDerivatives/ScriptableObjects/items.asset b/Assets/Scripts/InvectorDerivatives/ScriptableObjects/items.asset
index c48d518a5..d86f11b12 100644
--- a/Assets/Scripts/InvectorDerivatives/ScriptableObjects/items.asset
+++ b/Assets/Scripts/InvectorDerivatives/ScriptableObjects/items.asset
@@ -2871,7 +2871,7 @@ MonoBehaviour:
   - {fileID: 5246864980739031576}
   - {fileID: 95561586271533144}
   - {fileID: -5307908156765189853}
-  inEdition: 0
+  inEdition: 1
   itemsHidden: 1
 --- !u!114 &13007762861001616
 MonoBehaviour:
diff --git a/Assets/Scripts/Utils/RotationDebugger.cs b/Assets/Scripts/Utils/RotationDebugger.cs
new file mode 100644
index 000000000..4600ef43f
--- /dev/null
+++ b/Assets/Scripts/Utils/RotationDebugger.cs
@@ -0,0 +1,37 @@
+using UnityEngine;
+using Invector.vCharacterController; // Required to get access to the controller
+
+public class RotationDebugger : MonoBehaviour
+{
+    private vThirdPersonController cc;
+    private GUIStyle style;
+
+    void Start()
+    {
+        cc = GetComponent<vThirdPersonController>();
+        
+        // Setup for on-screen display
+        style = new GUIStyle();
+        style.fontSize = 18;
+        style.fontStyle = FontStyle.Bold;
+        style.normal.textColor = Color.white;
+    }
+
+    void OnGUI()
+    {
+        if (cc == null) return;
+
+        // Create a semi-transparent background box
+        GUI.Box(new Rect(10, 10, 350, 140), "");
+
+        // Display critical information on screen
+        string debugText = "--- ROTATION DEBUG ---";
+        debugText += $"\nRotation: {transform.rotation.eulerAngles.ToString("F2")}";
+        debugText += $"\nIs Rolling: {(cc.isRolling ? "<color=green>True</color>" : "<color=red>False</color>")}";
+        debugText += $"\nLock Rotation: {(cc.lockRotation ? "<color=red>True</color>" : "<color=green>False</color>")}";
+        debugText += $"\nAnimator Root Motion: {(cc.animator.applyRootMotion ? "<color=green>True</color>" : "<color=red>False</color>")}";
+
+        style.richText = true;
+        GUI.Label(new Rect(15, 15, 340, 130), debugText, style);
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Utils/RotationDebugger.cs.meta b/Assets/Scripts/Utils/RotationDebugger.cs.meta
new file mode 100644
index 000000000..76a575b63
--- /dev/null
+++ b/Assets/Scripts/Utils/RotationDebugger.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a069af71c57a846598551f9d5bf36cef
\ No newline at end of file
diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
index f192f6062..29372fb03 100644
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -60,7 +60,17 @@ MonoBehaviour:
       - rid: 5667426478487764994
       - rid: 5667426478487764995
     m_RuntimeSettings:
-      m_List: []
+      m_List:
+      - rid: 6119840311943364610
+      - rid: 6119840311943364611
+      - rid: 6119840311943364612
+      - rid: 6119840311943364613
+      - rid: 6119840311943364615
+      - rid: 6119840311943364616
+      - rid: 6119840311943364617
+      - rid: 6119840311943364620
+      - rid: 6119840311943364625
+      - rid: 6119840311943364628
   m_AssetVersion: 8
   m_ObsoleteDefaultVolumeProfile: {fileID: 0}
   m_RenderingLayerNames:
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/ItemManager/Textures/New UI/InventoryCamera.renderTexture b/Assets/ThirdParty/Invector-3rdPersonController/ItemManager/Textures/New UI/InventoryCamera.renderTexture
index 6e6c05ad6..691d48a78 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/ItemManager/Textures/New UI/InventoryCamera.renderTexture	
+++ b/Assets/ThirdParty/Invector-3rdPersonController/ItemManager/Textures/New UI/InventoryCamera.renderTexture	
@@ -10,21 +10,22 @@ RenderTexture:
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 3
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 6
   m_Width: 1024
   m_Height: 1024
   m_AntiAliasing: 4
   m_MipCount: -1
-  m_DepthFormat: 2
+  m_DepthStencilFormat: 92
   m_ColorFormat: 8
   m_MipMap: 1
   m_GenerateMips: 1
   m_SRGB: 0
   m_UseDynamicScale: 1
+  m_UseDynamicScaleExplicit: 0
   m_BindMS: 0
   m_EnableCompatibleFormat: 1
+  m_EnableRandomWrite: 0
   m_TextureSettings:
     serializedVersion: 2
     m_FilterMode: 1
@@ -35,3 +36,4 @@ RenderTexture:
     m_WrapW: 1
   m_Dimension: 2
   m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Other/Vases/Materials/Internal.mat b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Other/Vases/Materials/Internal.mat
index 7c0d4f75c..2d5648f43 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Other/Vases/Materials/Internal.mat	
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Other/Vases/Materials/Internal.mat	
@@ -2,19 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: Internal
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 5
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -54,6 +61,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -74,3 +82,5 @@ Material:
     m_Colors:
     - _Color: {r: 0.4044118, g: 0.2751296, b: 0.24383652, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat.controller
index 1213e637e..258295d3e 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat.controller	
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat.controller	
@@ -1246,6 +1246,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &11404640
 MonoBehaviour:
@@ -1356,6 +1365,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &11424034
 MonoBehaviour:
@@ -1593,6 +1611,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &11468922
 MonoBehaviour:
@@ -1619,6 +1646,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &11476414
 MonoBehaviour:
@@ -1691,6 +1727,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &11483756
 MonoBehaviour:
@@ -1786,6 +1831,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &11487874
 MonoBehaviour:
@@ -14924,7 +14978,7 @@ AnimatorStateMachine:
   m_ChildStateMachines:
   - serializedVersion: 1
     m_StateMachine: {fileID: 1107000012077418080}
-    m_Position: {x: 288, y: -48, z: 0}
+    m_Position: {x: 290, y: -50, z: 0}
   - serializedVersion: 1
     m_StateMachine: {fileID: 1107000012813893614}
     m_Position: {x: 288, y: 0, z: 0}
@@ -16057,6 +16111,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114000012058145300
 MonoBehaviour:
@@ -16134,6 +16197,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114037387642052710
 MonoBehaviour:
@@ -16190,6 +16262,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114109424512592286
 MonoBehaviour:
@@ -16292,6 +16373,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114171435731826654
 MonoBehaviour:
@@ -16369,6 +16459,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114204451307792824
 MonoBehaviour:
@@ -16430,6 +16529,15 @@ MonoBehaviour:
   activeRagdoll: 1
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114231790030935560
 MonoBehaviour:
@@ -16529,6 +16637,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114296478714166974
 MonoBehaviour:
@@ -16795,6 +16912,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114446205462832556
 MonoBehaviour:
@@ -16855,6 +16981,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114480230802912944
 MonoBehaviour:
@@ -17053,6 +17188,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114608773870077618
 MonoBehaviour:
@@ -17079,6 +17223,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114610283087860218
 MonoBehaviour:
@@ -17165,6 +17318,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114633244054452058
 MonoBehaviour:
@@ -17511,6 +17673,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114838529179133088
 MonoBehaviour:
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat_Upperbody.controller b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat_Upperbody.controller
index ad775a65e..55afaacec 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat_Upperbody.controller	
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Animator/Invector@MeleeCombat_Upperbody.controller	
@@ -15301,6 +15301,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114000012058145300
 MonoBehaviour:
@@ -15362,6 +15371,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114009002167766808
 MonoBehaviour:
@@ -15437,6 +15455,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114053124122781816
 MonoBehaviour:
@@ -15463,6 +15490,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114056155133226516
 MonoBehaviour:
@@ -15504,6 +15540,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114073501179577698
 MonoBehaviour:
@@ -15549,6 +15594,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114111844249362474
 MonoBehaviour:
@@ -15610,6 +15664,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114125248183120080
 MonoBehaviour:
@@ -15682,6 +15745,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114143468773884272
 MonoBehaviour:
@@ -15808,6 +15880,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114226517231132080
 MonoBehaviour:
@@ -15834,6 +15915,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114231790030935560
 MonoBehaviour:
@@ -15890,6 +15980,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114295096171708098
 MonoBehaviour:
@@ -16143,6 +16242,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 5
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114406195790751738
 MonoBehaviour:
@@ -16200,6 +16308,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114455692819066584
 MonoBehaviour:
@@ -16226,6 +16343,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114466758671806868
 MonoBehaviour:
@@ -16313,6 +16439,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114524683121802120
 MonoBehaviour:
@@ -16339,6 +16474,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114536242244152982
 MonoBehaviour:
@@ -16650,6 +16794,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114713549601504908
 MonoBehaviour:
@@ -16716,6 +16869,15 @@ MonoBehaviour:
   activeRagdoll: 1
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114728052254744588
 MonoBehaviour:
@@ -16742,6 +16904,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114750145593357160
 MonoBehaviour:
@@ -16799,6 +16970,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 1
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114777390175365682
 MonoBehaviour:
@@ -16871,6 +17051,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114790590439853166
 MonoBehaviour:
@@ -17032,6 +17221,15 @@ MonoBehaviour:
   activeRagdoll: 0
   senselessTime: 0
   resetAttackTrigger: 0
+  resetTriggerBeforeTime: 0.8
+  useAttackTimeScale: 0
+  slowMoActivationDistance: 3
+  lowHealthTh: 10
+  attackTimeScale: 0.2
+  attackTimeScaleStart: -1
+  attackTimeScaleEnd: -1
+  rotatePlayerTowardsTarget: 0
+  rotationActivationAngle: 45
   debug: 0
 --- !u!114 &114875277160491434
 MonoBehaviour:
@@ -32885,7 +33083,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1102000012097988626}
-    m_Position: {x: 276, y: 168, z: 0}
+    m_Position: {x: 280, y: 170, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102000013808204466}
     m_Position: {x: 276, y: 96, z: 0}
diff --git a/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/Embers.mat b/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/Embers.mat
index adcb0dbb9..d9e694880 100644
--- a/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/Embers.mat	
+++ b/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/Embers.mat	
@@ -25,6 +25,7 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
+  - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords:
   - _FLIPBOOKBLENDING_OFF
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index f3ad8c6fd..23ac21078 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -56,7 +56,7 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Scenes/Land_01/Land_Of_Death_ARENAS.unity
     guid: 3ac39dab4b05aa540af7a4bbd73b2a5a
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/Land_01/demo_postptrocesINTRO.unity
     guid: e96c2977de1cfbd42842bca9554dc468
   m_configObjects: