Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

# Conflicts: # Assets/Scenes/00_Fight_Arena/Fight_Arena.unity # Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset
2026-01-22 15:03:04 +01:00
parent 013dca60a5 a7f91bcd67
commit 916dae1183
5 changed files with 141 additions and 155 deletions
--- a/Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset
+++ b/Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset
@@ -12,6 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2fa1c233b63854f6d845066ccd8e48cd, type: 3}
  m_Name: Spell_PurifyingBlaze
  m_EditorClassIdentifier: 
+<<<<<<< HEAD
  spellName: Purifying Blaze
  category: 2
  animationClipName: FlameThrower
@@ -25,3 +26,16 @@ MonoBehaviour:
  preCastDelay: 0
  duration: 1.5
  postEndDelay: 0.1
+=======
+  spellName: 
+  animationClipName: 
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0.3
+  type: 0
+  effectPrefab: {fileID: 0}
+  preCastDelay: 0
+  duration: 2
+  postEndDelay: 0
+>>>>>>> a7f91bcd67c0a8368057faade833aa8dd8d3dd2e