Potion ability & bugfixing

2024-08-05 12:35:22 +01:00 · 2024-08-05 12:35:22 +01:00 · aa933c631e
commit aa933c631e
parent d667f3c6d5
19 changed files with 960 additions and 67 deletions
--- a/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/CharacterAnimatorNecroUpdate.controller
+++ b/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/CharacterAnimatorNecroUpdate.controller
@ -431,6 +431,31 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: throwingTime
+--- !u!1101 &-2748198142735823690
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: potion
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1680542179859437728}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-1955213380481053044
 AnimatorState:
  serializedVersion: 6
@ -587,6 +612,12 @@ AnimatorController:
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 0}
+  - m_Name: potion
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -634,6 +665,28 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1101 &1518989702242217990
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1955213380481053044}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.84375
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &1543724191371247514
 AnimatorState:
  serializedVersion: 6
@ -660,6 +713,33 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &1680542179859437728
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Use_Item
+  m_Speed: 1.5
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1518989702242217990}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7417917891377754313, guid: e1e4fb5684939bb479c83e16bac91038, type: 3}
+  m_Tag: 
+  m_SpeedParameter: throwingTime
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &2026711263043783155
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -714,7 +794,7 @@ AnimatorStateMachine:
    m_Position: {x: 240, y: 130, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 5990272421327647975}
-    m_Position: {x: 240, y: -230, z: 0}
+    m_Position: {x: 240, y: -380, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6266310880896572649}
    m_Position: {x: 240, y: 200, z: 0}
@ -727,6 +807,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: -4514913191733491953}
    m_Position: {x: 470, y: 200, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1680542179859437728}
+    m_Position: {x: 240, y: -170, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions:
  - {fileID: -5718744200409098312}
@ -736,6 +819,7 @@ AnimatorStateMachine:
  - {fileID: -3609341490177184666}
  - {fileID: 6156162753974265385}
  - {fileID: -9018154837033491220}
+  - {fileID: -2748198142735823690}
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
--- a/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Mage.fbx.meta
+++ b/Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Mage.fbx.meta
@ -906,9 +906,9 @@ ModelImporter:
      hasAdditiveReferencePose: 0
      loopTime: 0
      loopBlend: 0
-      loopBlendOrientation: 0
-      loopBlendPositionY: 0
-      loopBlendPositionXZ: 0
+      loopBlendOrientation: 1
+      loopBlendPositionY: 1
+      loopBlendPositionXZ: 1
      keepOriginalOrientation: 0
      keepOriginalPositionY: 1
      keepOriginalPositionXZ: 0
--- a/Assets/Developer/Prefabs/Persistent
+++ b/Assets/Developer/Prefabs/Persistent
@ -680,6 +680,82 @@ MonoBehaviour:
  manaFill: {fileID: 4514444964280280819}
  mana_TMP: {fileID: 2589173984611106071}
  onPlayerSpawned: {fileID: 7475116342871483259}
+--- !u!1 &592444273080244905
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4675474138111442744}
+  - component: {fileID: 4078500534553118664}
+  - component: {fileID: 5622391511445555213}
+  m_Layer: 5
+  m_Name: Cooldown
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4675474138111442744
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 592444273080244905}
+  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: 7468532132649587021}
+  m_RootOrder: 0
+  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 &4078500534553118664
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 592444273080244905}
+  m_CullTransparentMesh: 1
+--- !u!114 &5622391511445555213
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 592444273080244905}
+  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: 0.122641504, g: 0.122641504, b: 0.122641504, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 66efb24ed46044ab8a039599cbc47d7b, type: 3}
+  m_Type: 3
+  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!1 &619617294214395873
 GameObject:
  m_ObjectHideFlags: 0
@ -1302,6 +1378,83 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1428969422420060825
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7468532132649587021}
+  - component: {fileID: 3353244514930168756}
+  - component: {fileID: 8533728432487297650}
+  m_Layer: 5
+  m_Name: Potion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7468532132649587021
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428969422420060825}
+  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: 4675474138111442744}
+  m_Father: {fileID: 7508560910363727501}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 60, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3353244514930168756
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428969422420060825}
+  m_CullTransparentMesh: 1
+--- !u!114 &8533728432487297650
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428969422420060825}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 00bb925151ca0004882e11e583903f24, 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!1 &1493622591950221911
 GameObject:
  m_ObjectHideFlags: 0
@ -1587,6 +1740,83 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &2174341104199087341
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7508560910363727501}
+  - component: {fileID: 6103553798802480624}
+  - component: {fileID: 8898181726569888190}
+  m_Layer: 5
+  m_Name: PotionSlot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7508560910363727501
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2174341104199087341}
+  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: 7468532132649587021}
+  m_Father: {fileID: 3792008555843204228}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.5, y: 0}
+  m_SizeDelta: {x: 70, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6103553798802480624
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2174341104199087341}
+  m_CullTransparentMesh: 1
+--- !u!114 &8898181726569888190
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2174341104199087341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 189571641b1d947459e125a4c1696df1, 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!1 &2260362402963569666
 GameObject:
  m_ObjectHideFlags: 0
@ -6561,6 +6791,7 @@ MonoBehaviour:
  - {fileID: 11400000, guid: 53883407168ab9f47bbf22ab81586dfc, type: 2}
  - {fileID: 11400000, guid: 9981ff1af19439c40b7aacc70d98d40b, type: 2}
  - {fileID: 11400000, guid: 11aadf57387f53d46874db2f283732fa, type: 2}
+  - {fileID: 11400000, guid: 4fceae8a71096354698248481a42b897, type: 2}
 --- !u!1 &7475116341184709871
 GameObject:
  m_ObjectHideFlags: 0
@ -8632,6 +8863,141 @@ MonoBehaviour:
  m_ChildScaleWidth: 0
  m_ChildScaleHeight: 0
  m_ReverseArrangement: 0
+--- !u!1 &7608632821485182384
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9023841784305562936}
+  - component: {fileID: 955118803057877624}
+  - component: {fileID: 725922398168710940}
+  m_Layer: 5
+  m_Name: cooldown (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9023841784305562936
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7608632821485182384}
+  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: 2816142847727109582}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -20, y: -20}
+  m_SizeDelta: {x: 35, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &955118803057877624
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7608632821485182384}
+  m_CullTransparentMesh: 1
+--- !u!114 &725922398168710940
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7608632821485182384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 0
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4278231295
+  m_fontColor: {r: 1, g: 0.6255317, b: 0, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 17.9
+  m_fontSizeBase: 24
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 1
+  m_fontSizeMax: 30
+  m_fontStyle: 1
+  m_HorizontalAlignment: 4
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 5, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &7629968242334688007
 GameObject:
  m_ObjectHideFlags: 0
@ -9386,6 +9752,84 @@ MonoBehaviour:
  Response:
    m_PersistentCalls:
      m_Calls: []
+--- !u!1 &8302222566310208419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3792008555843204228}
+  - component: {fileID: 352075103329129140}
+  - component: {fileID: 2862221084439331854}
+  m_Layer: 5
+  m_Name: PotionSlotBackground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3792008555843204228
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8302222566310208419}
+  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: 7508560910363727501}
+  - {fileID: 2816142847727109582}
+  m_Father: {fileID: 5048153147575811555}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 231, y: 129}
+  m_SizeDelta: {x: 85, y: 127}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &352075103329129140
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8302222566310208419}
+  m_CullTransparentMesh: 1
+--- !u!114 &2862221084439331854
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8302222566310208419}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 247e0ab21be0ed44a8fa16ade651071a, type: 3}
+  m_Type: 1
+  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!1 &8394233754574761252
 GameObject:
  m_ObjectHideFlags: 0
@ -16616,6 +17060,176 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 2412437425886835842, guid: 643e6490d2edf164ca8048fc8b1a9372, type: 3}
  m_PrefabInstance: {fileID: 7484538593892713956}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7563720291230280170
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3792008555843204228}
+    m_Modifications:
+    - target: {fileID: 155897292336221392, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_fontColor.b
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 155897292336221392, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_fontColor.g
+      value: 0.6255317
+      objectReference: {fileID: 0}
+    - target: {fileID: 155897292336221392, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_fontColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 155897292336221392, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4278231295
+      objectReference: {fileID: 0}
+    - target: {fileID: 1279504101772050932, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 65
+      objectReference: {fileID: 0}
+    - target: {fileID: 1279504101772050932, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 65
+      objectReference: {fileID: 0}
+    - target: {fileID: 1279504101772050932, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4128365416075155250, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4444551169812095635, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5122095429438571753, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 110
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6068416968010641387, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Name
+      value: AbilityBindInstance (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8068696760208408251, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Name
+      value: cooldown
+      objectReference: {fileID: 0}
+    - target: {fileID: 8068696760208408251, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8427117269225081217, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: gameKey
+      value: 
+      objectReference: {fileID: 11400000, guid: 8c87c2ccccdd90548bc46b87e6616d7d, type: 2}
+    - target: {fileID: 8427117269225081217, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: cooldown
+      value: 
+      objectReference: {fileID: 725922398168710940}
+    - target: {fileID: 8473829197331167793, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Color.b
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8473829197331167793, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Color.g
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8473829197331167793, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Color.r
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8702117578033848689, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 00bb925151ca0004882e11e583903f24, type: 3}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+--- !u!224 &2816142847727109582 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5756525528600931364, guid: 8e6107cb87ae02d43b74a0f7156a7754, type: 3}
+  m_PrefabInstance: {fileID: 7563720291230280170}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7851723298658955819
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectOverTimeWithTickEvent.prefab
+++ b/Assets/Resources/Abilities/BloodVacuum_AreaOfEffectOverTimeWithTickEvent.prefab
@ -150,18 +150,6 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 9037188531532085365}
-        m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine
-        m_MethodName: Play
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!114 &5268821355948254241
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -432,6 +420,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: AudioPlayer_SFX
      objectReference: {fileID: 0}
+    - target: {fileID: 1082793402966804016, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
      propertyPath: m_RootOrder
      value: 2
@ -483,8 +475,3 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
  m_PrefabInstance: {fileID: 8858972772124452120}
  m_PrefabAsset: {fileID: 0}
--- !u!82 &9037188531532085365 stripped
-AudioSource:
-  m_CorrespondingSourceObject: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
-  m_PrefabInstance: {fileID: 8858972772124452120}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Resources/Abilities/SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab
+++ b/Assets/Resources/Abilities/SanguineSlash_NetworkedSlashWithOnHitEvent_Prefab.prefab
@ -100,18 +100,6 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 2770210058144862626}
-        m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine
-        m_MethodName: Play
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!114 &1844807267285195553
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -346,6 +334,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: AudioPlayer_SFX
      objectReference: {fileID: 0}
+    - target: {fileID: 1082793402966804016, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
      propertyPath: m_RootOrder
      value: 2
@ -392,11 +384,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
--- !u!82 &2770210058144862626 stripped
-AudioSource:
-  m_CorrespondingSourceObject: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
-  m_PrefabInstance: {fileID: 2443814697000078543}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6083765841649557432 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
--- a/Assets/Resources/Bosses/SunDragonBossEnemyPrefabTemplate
+++ b/Assets/Resources/Bosses/SunDragonBossEnemyPrefabTemplate
@ -185,11 +185,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5460205518301792031, guid: 4d5cd1124d0c47647899411ebcfe8b8a, type: 3}
      propertyPath: m_StoppingDistance
-      value: 3.8
+      value: 3.9
      objectReference: {fileID: 0}
    - target: {fileID: 5460205518301792031, guid: 4d5cd1124d0c47647899411ebcfe8b8a, type: 3}
      propertyPath: m_ObstacleAvoidanceType
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5909578744954783082, guid: 4d5cd1124d0c47647899411ebcfe8b8a, type: 3}
      propertyPath: m_Name
--- a/Assets/Resources/PlayerPrefab.prefab
+++ b/Assets/Resources/PlayerPrefab.prefab
@ -165,7 +165,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3272896860243150918}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4847227750113470832
 MonoBehaviour:
@ -1137,6 +1137,57 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2999029931726912185
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1715803057582024218}
+  - component: {fileID: 2015544591442729876}
+  m_Layer: 0
+  m_Name: PotionKeyBinder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1715803057582024218
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999029931726912185}
+  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: 3272896860243150918}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2015544591442729876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999029931726912185}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 23949325107769d4d8ab836117a98768, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onLocalPlayerFainted: {fileID: 4208248794315303369}
+  onLocalPlayerPermaDeath: {fileID: 7710901043301821002}
+  onLocalPlayerRevived: {fileID: 7711071309134240638}
+  ability: {fileID: 11400000, guid: 4fceae8a71096354698248481a42b897, type: 2}
+  key: {fileID: 11400000, guid: 8c87c2ccccdd90548bc46b87e6616d7d, type: 2}
+  castingStateController: {fileID: 7040887640505163424}
+  onAbilityKeyBinderSpawned: {fileID: 11400000, guid: 9bfd488187aea4848a890711a2d587c8, type: 2}
 --- !u!1 &3607197976230645580
 GameObject:
  m_ObjectHideFlags: 0
@ -1546,6 +1597,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 1715803057582024218}
  - {fileID: 1889881498524506150}
  - {fileID: 8854296129110628071}
  - {fileID: 6123670428979609552}
@ -1799,7 +1851,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3272896860243150918}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5627210965781110480
 MonoBehaviour:
@ -1898,7 +1950,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3272896860243150918}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6259208590911633741
 MonoBehaviour:
@ -2117,7 +2169,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3272896860243150918}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3337123064848582692
 MonoBehaviour:
--- a/Assets/Scenes/0-Splash.unity
+++ b/Assets/Scenes/0-Splash.unity
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.063866585, g: 0.12782213, b: 0.13344485, a: 1}
+  m_IndirectSpecularColor: {r: 0.064334005, g: 0.12879592, b: 0.13447195, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -268,6 +268,17 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &595157538 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 725922398168710940, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
+  m_PrefabInstance: {fileID: 7475116341764246899}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &694588455
 GameObject:
  m_ObjectHideFlags: 0
@ -1463,6 +1474,14 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2018906784613884011, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
+      propertyPath: isAlphaKey
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2018906784613884011, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
+      propertyPath: cooldown_Text
+      value: 
+      objectReference: {fileID: 595157538}
    - target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -2735,6 +2754,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8734183595183613982, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
--- a/Assets/Scriptables/Data/Abilities/Debug/Player/Potion.asset
+++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Potion.asset
@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e59b462147ebfc49a7a387e9bf168f4, type: 3}
+  m_Name: Potion
+  m_EditorClassIdentifier: 
+  Icon: {fileID: 21300000, guid: 00bb925151ca0004882e11e583903f24, type: 3}
+  targettingTags:
+  - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2}
+  tags: []
+  abilityEffects: []
+  castTime: 1
+  manaCost: 0
+  healthCost: 0
+  classResourceCost: 0
+  cooldown: 20
+  castableWhileMoving: 1
+  animationType: 6
+  healingPercent: 0.6
--- a/Assets/Scriptables/Data/Abilities/Debug/Player/Potion.asset.meta
+++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Potion.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4fceae8a71096354698248481a42b897
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scriptables/Data/Keys/PotionSkillKey.asset
+++ b/Assets/Scriptables/Data/Keys/PotionSkillKey.asset
@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 207304cf4dcff4e459d8b5124fb8b27c, type: 3}
+  m_Name: PotionSkillKey
+  m_EditorClassIdentifier: 
+  keyCode: 113
--- a/Assets/Scriptables/Data/Keys/PotionSkillKey.asset.meta
+++ b/Assets/Scriptables/Data/Keys/PotionSkillKey.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c87c2ccccdd90548bc46b87e6616d7d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs
+++ b/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs
@ -0,0 +1,19 @@
+using Photon.Pun;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "PotionAbility", menuName = "RiftMayhem/AbilitySystem/Abilities/PotionAbility", order = 1)]
+public class PotionAbility : BaseAbility
+{
+    [Header("PotionPercentValue:")]
+    public float healingPercent;
+
+    Health userHealth;
+    public override void Execute(PhotonView user, Taggable userTag)
+    {
+        userHealth = userTag.GetComponent<Health>();
+
+        userHealth.ChangeValue(userHealth.GetMaxValue() * healingPercent);
+    }
+}
--- a/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs.meta
+++ b/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4e59b462147ebfc49a7a387e9bf168f4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/CharacterAnimatorController.cs
+++ b/Assets/Scripts/CharacterAnimatorController.cs
@ -188,6 +188,12 @@ public class CharacterAnimatorController : MonoBehaviour
            case AbilityAnimationType.Summon:
                anim.SetTrigger("summon");
                break;
+            case AbilityAnimationType.Jump:
+                anim.SetTrigger("jump");
+                break;
+            case AbilityAnimationType.Potion:
+                anim.SetTrigger("potion");
+                break;
            default:
                break;
        }
@ -203,5 +209,6 @@ public enum AbilityAnimationType
    Melee,
    Spin,
    Summon,
-    Jump
+    Jump,
+    Potion
 }
--- a/Assets/Scripts/Player/PlayerController.cs
+++ b/Assets/Scripts/Player/PlayerController.cs
@ -26,6 +26,7 @@ public class PlayerController : MonoBehaviour
    Plane plane = new Plane(Vector3.down, 0);

    PhotonView photonView;
+    ProjectileSpawnLocationController projectileSpawnLocationController;

    Ray ray;
    RaycastHit hit;
@ -40,6 +41,8 @@ public class PlayerController : MonoBehaviour
        cam = Camera.main;
        motor = GetComponent<PlayerMovement>();
        photonView = GetComponent<PhotonView>();
+
+        projectileSpawnLocationController = GetComponentInChildren<ProjectileSpawnLocationController>();
    }

    // Start is called before the first frame update
@ -74,7 +77,7 @@ public class PlayerController : MonoBehaviour

        motor.StopLocomotion(0);
        motor.ToggleAgentMoving(true);
-        motor.InstantFaceTarget();
+        motor.InstantFaceCast(projectileSpawnLocationController.GetLookat());

        onStartFishing.Invoke();
    }
--- a/Assets/Scripts/UI/AbilityBindInstance.cs
+++ b/Assets/Scripts/UI/AbilityBindInstance.cs
@ -8,9 +8,12 @@ public class AbilityBindInstance : MonoBehaviour
 {
    public GameKey gameKey;

+    public bool isAlphaKey = true;
+
    [SerializeField] private GameEventListener_AbilityKeyBinder onAbilityKeyBinderSpawned;
    public TMP_Text bind;
    public TMP_Text manaCost;
+    public TMP_Text cooldown_Text;
    public Image icon;
    public GameObject noMana;
    public GameObject pressed;
@ -31,9 +34,12 @@ public class AbilityBindInstance : MonoBehaviour
        this.abilityKeyBinder = abilityKeyBinder;
        string keyName = gameKey.keyCode.ToString();
        //alpha
+        if (isAlphaKey)
            keyName = keyName.Remove(0, 5);
        this.bind.text = keyName;
        this.manaCost.text = abilityKeyBinder.Ability.manaCost.ToString();
+        if (cooldown_Text != null)
+            this.cooldown_Text.text = abilityKeyBinder.Ability.cooldown.ToString();
        this.icon.sprite = abilityKeyBinder.Ability.Icon;
        noMana.SetActive(false);
        pressed.SetActive(false);
--- a/Skybox/Skybox.mat
+++ b/Skybox/Skybox.mat
@ -94,7 +94,7 @@ Material:
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
-    - _Rotation: 6.8487434
+    - _Rotation: 6.1494164
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans