Change parry threshold

2025-03-05 13:31:40 -05:00
parent 6bf9825855
commit a8ad374e82
6 changed files with 588 additions and 22 deletions
--- a/Assets/Old/Hub/HubManager.cs
+++ b/Assets/Old/Hub/HubManager.cs
@@ -52,6 +52,10 @@ public class HubManager : MonoBehaviour
        {
            UnloadGameScene();
            ChangeGameButtonsInteractability(true);
+            foreach (PlayerMovement player in FindObjectsByType<PlayerMovement>(FindObjectsSortMode.None))
+            {
+                Destroy(player.gameObject);
+            }
        }
    }

--- a/Assets/Prefabs/Bones.prefab
+++ b/Assets/Prefabs/Bones.prefab
@@ -275,6 +275,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  blocking: 0
+  parryThreshold: 0.5
 --- !u!1 &1648017802882051395
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Player
+++ b/Assets/Prefabs/Player
@@ -26,7 +26,7 @@ RectTransform:
  m_GameObject: {fileID: 539213549865726557}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 8108486552258921288}
--- a/Assets/Prefabs/Player
+++ b/Assets/Prefabs/Player
@@ -366,12 +366,15 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1204188658820747641}
+  - {fileID: 4234251132373118416}
+  - {fileID: 5257551734664631346}
+  - {fileID: 5566924632766593088}
  m_Father: {fileID: 597459829403929617}
  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: 189}
-  m_SizeDelta: {x: 1920.1, y: 1080}
+  m_AnchoredPosition: {x: 0, y: 146.14014}
+  m_SizeDelta: {x: 1756.7, y: 994.27}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4398521839358101483
 MonoBehaviour:
@@ -386,15 +389,15 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Padding:
-    m_Left: 200
+    m_Left: 130
    m_Right: 200
    m_Top: 200
    m_Bottom: 200
-  m_ChildAlignment: 4
+  m_ChildAlignment: 3
  m_StartCorner: 0
  m_StartAxis: 0
  m_CellSize: {x: 100, y: 100}
-  m_Spacing: {x: 300, y: 300}
+  m_Spacing: {x: 161.78, y: 300}
  m_Constraint: 0
  m_ConstraintCount: 4
 --- !u!114 &2354805791164454873
@@ -1277,6 +1280,304 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 2006297455014043296, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3}
  m_PrefabInstance: {fileID: 378488714810919103}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1361276841794986725
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5368898896554409839}
+    m_Modifications:
+    - target: {fileID: 107049055310032802, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: playerText
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Name
+      value: Player Box Target_3
+      objectReference: {fileID: 0}
+    - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_TargetGraphic
+      value: 
+      objectReference: {fileID: 1918502666465040432}
+    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4103967781863842157, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: hurtbox
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 965.33997
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -497.135
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+--- !u!114 &1918502666465040432 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 1361276841794986725}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &5566924632766593088 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 1361276841794986725}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1680714660764438167
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5368898896554409839}
+    m_Modifications:
+    - target: {fileID: 107049055310032802, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: playerText
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Name
+      value: Player Box Target_2
+      objectReference: {fileID: 0}
+    - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_TargetGraphic
+      value: 
+      objectReference: {fileID: 2245263241364763714}
+    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4103967781863842157, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: hurtbox
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 703.56
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -497.135
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+--- !u!114 &2245263241364763714 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 1680714660764438167}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &5257551734664631346 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 1680714660764438167}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3867074982055388481
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1640,7 +1941,7 @@ PrefabInstance:
    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
      propertyPath: m_TargetGraphic
      value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 5145493705120411913}
    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
@@ -1681,18 +1982,6 @@ PrefabInstance:
      propertyPath: m_SizeDelta.y
      value: 100
      objectReference: {fileID: 0}
-    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@@ -1723,11 +2012,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 960.0499
+      value: 180
      objectReference: {fileID: 0}
    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -540
+      value: -497.135
      objectReference: {fileID: 0}
    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@@ -1741,6 +2030,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -1751,6 +2044,17 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
  m_PrefabInstance: {fileID: 5698084126106307548}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5145493705120411913 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 5698084126106307548}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &6158221634364426999
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1983,3 +2287,152 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 8152264223886948235, guid: fb4bf85da5c66429d8a3d24fe0e44ef1, type: 3}
  m_PrefabInstance: {fileID: 7097897689600722934}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7306701849676904309
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5368898896554409839}
+    m_Modifications:
+    - target: {fileID: 107049055310032802, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: playerText
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Name
+      value: Player Box Target_1
+      objectReference: {fileID: 0}
+    - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_TargetGraphic
+      value: 
+      objectReference: {fileID: 7862511508704480672}
+    - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4103967781863842157, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: hurtbox
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 441.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -497.135
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+--- !u!224 &4234251132373118416 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 7306701849676904309}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7862511508704480672 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3}
+  m_PrefabInstance: {fileID: 7306701849676904309}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/Scenes/Player
+++ b/Assets/Scenes/Player
@@ -127,6 +127,38 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 550032718719562693, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_TargetGraphic
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1204188658820747641, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1204188658820747641, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1204188658820747641, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1204188658820747641, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1204188658820747641, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1204188658820747641, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1822053665468713955, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_TargetGraphic
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 4162490554469064066, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
@@ -135,10 +167,86 @@ PrefabInstance:
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
      value: PlayerManager, Assembly-CSharp
      objectReference: {fileID: 0}
+    - target: {fileID: 4234251132373118416, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4234251132373118416, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4234251132373118416, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4234251132373118416, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4234251132373118416, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4234251132373118416, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4405698592650349507, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_TargetGraphic
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 5257551734664631346, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5257551734664631346, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5257551734664631346, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5257551734664631346, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5257551734664631346, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5257551734664631346, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5507202815382103773, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 300.80005
      objectReference: {fileID: 0}
+    - target: {fileID: 5566924632766593088, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5566924632766593088, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5566924632766593088, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5566924632766593088, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5566924632766593088, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5566924632766593088, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7581121400164956810, guid: 52622bff9e983494eb206a8735b4dbbf, type: 3}
      propertyPath: m_Name
      value: Player Select
--- a/Assets/Scripts/Block.cs
+++ b/Assets/Scripts/Block.cs
@@ -7,7 +7,7 @@ public class Block : MonoBehaviour
    public bool blocking = false;
    private InputActionAsset actions;
    private float blockPressTime = 0f;
-    private float parryThreshold = 0.2f;
+    [SerializeField] private float parryThreshold = 0.2f;
    private bool isParrying = false;

    private void Start()