diff --git a/Assets/AI/Demon/Meteor.prefab b/Assets/AI/Demon/Meteor.prefab
index a6d961db5..5aad2eefc 100644
--- a/Assets/AI/Demon/Meteor.prefab
+++ b/Assets/AI/Demon/Meteor.prefab
@@ -9660,7 +9660,7 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 1410334711
   explosionRadius: 5
-  damage: 10
+  damage: 15
   knockbackForce: 5
   impactVfxPrefab: {fileID: 1031498901634068, guid: 0ff49e2dd236f364ab8b6ece0a44d04a,
     type: 3}
diff --git a/Assets/AI/Demon/SA_CastShield.cs b/Assets/AI/Demon/SA_CastShield.cs
index 3d96a678a..dc8023c26 100644
--- a/Assets/AI/Demon/SA_CastShield.cs
+++ b/Assets/AI/Demon/SA_CastShield.cs
@@ -88,6 +88,9 @@ namespace DemonBoss.Magic
 		// timers for auto-advance
 		private float _phaseScheduledEnd = 0f; // absolute Time.time when Start/End should be done
 
+		// Flag to prevent multiple endings
+		private bool _hasEnded = false;
+
 		public override void DoAction(vIFSMBehaviourController fsm, vFSMComponentExecutionType execType = vFSMComponentExecutionType.OnStateUpdate)
 		{
 			if (execType == vFSMComponentExecutionType.OnStateEnter) OnEnter(fsm);
@@ -99,12 +102,20 @@ namespace DemonBoss.Magic
 
 		private void OnEnter(vIFSMBehaviourController fsm)
 		{
+			// Reset all state
+			_hasEnded = false;
+			_phase = Phase.None;
+			_shieldActive = false;
+
 			_npc = fsm.transform;
 			_anim = _npc.GetComponent<Animator>();
 
 			if (_anim != null && !string.IsNullOrEmpty(animatorBlockingBool))
 				_anim.SetBool(animatorBlockingBool, true);
 
+			// SET COOLDOWN IMMEDIATELY when shield is used
+			DEC_CheckCooldown.SetCooldownStatic(fsm, "Shield", 60f);
+
 			SpawnShieldFX();
 
 			_shieldStartTime = Time.time;
@@ -125,10 +136,15 @@ namespace DemonBoss.Magic
 				if (debugLogs) Debug.Log("[SA_CastShield] No Start/Keep clips; waiting to End.");
 				_phase = Phase.Keep; // logical keep (no anim)
 			}
+
+			if (debugLogs) Debug.Log($"[SA_CastShield] Shield started - duration: {shieldDuration}s, cooldown set to 60s");
 		}
 
 		private void OnUpdate(vIFSMBehaviourController fsm)
 		{
+			// Don't process if we're already done
+			if (_hasEnded || _phase == Phase.Done) return;
+
 			// handle crossfade
 			if (_fading)
 			{
@@ -149,16 +165,15 @@ namespace DemonBoss.Magic
 				// When shield timer is up, begin End
 				if (_shieldActive && (Time.time - _shieldStartTime) >= shieldDuration)
 				{
+					if (debugLogs) Debug.Log("[SA_CastShield] Shield duration expired, beginning end phase");
 					BeginEnd();
 				}
 			}
 			else if (_phase == Phase.End && Time.time >= _phaseScheduledEnd)
 			{
 				// End completed
-				_phase = Phase.Done;
-				TeardownGraph();
-				CleanupShieldFX();
-				_shieldActive = false;
+				if (debugLogs) Debug.Log("[SA_CastShield] End phase completed, finishing shield");
+				FinishShield();
 			}
 		}
 
@@ -167,8 +182,8 @@ namespace DemonBoss.Magic
 			if (_anim != null && !string.IsNullOrEmpty(animatorBlockingBool))
 				_anim.SetBool(animatorBlockingBool, false);
 
-			// If we left early, optionally play End briefly (best-effort)
-			if (playEndOnEarlyExit && _phase != Phase.End && _phase != Phase.Done && endClip != null)
+			// If we left early and haven't ended yet, optionally play End briefly
+			if (playEndOnEarlyExit && !_hasEnded && _phase != Phase.End && _phase != Phase.Done && endClip != null)
 			{
 				if (debugLogs) Debug.Log("[SA_CastShield] Early exit: playing End quickly.");
 				// build graph if it was never built (e.g., no Start/Keep)
@@ -177,14 +192,11 @@ namespace DemonBoss.Magic
 				_phase = Phase.End;
 				_phaseScheduledEnd = Time.time + Mathf.Min(endClip.length / SafeSpeed(), 0.25f); // quick outro
 			}
-			else
-			{
-				// otherwise normal cleanup
-				TeardownGraph();
-			}
 
-			CleanupShieldFX();
-			_shieldActive = false;
+			// Always cleanup when exiting
+			FinishShield();
+
+			if (debugLogs) Debug.Log("[SA_CastShield] State exited and cleaned up");
 		}
 
 		// ------------------ Phase Transitions ------------------
@@ -218,14 +230,13 @@ namespace DemonBoss.Magic
 
 		private void BeginEnd()
 		{
+			// Prevent multiple end calls
+			if (_hasEnded) return;
+
 			if (endClip == null)
 			{
 				// No end clip; just finish
-				_phase = Phase.Done;
-				TeardownGraph();
-				CleanupShieldFX();
-				_shieldActive = false;
-				if (debugLogs) Debug.Log("[SA_CastShield] No End clip; finished.");
+				FinishShield();
 				return;
 			}
 			CrossfadeTo(endClip, out _pEnd, quick: false);
@@ -234,6 +245,20 @@ namespace DemonBoss.Magic
 			if (debugLogs) Debug.Log("[SA_CastShield] End phase.");
 		}
 
+		private void FinishShield()
+		{
+			// Prevent multiple finish calls
+			if (_hasEnded) return;
+			_hasEnded = true;
+
+			_phase = Phase.Done;
+			TeardownGraph();
+			CleanupShieldFX();
+			_shieldActive = false;
+
+			if (debugLogs) Debug.Log("[SA_CastShield] Shield finished and cleaned up");
+		}
+
 		// ------------------ Graph Setup / Crossfade ------------------
 
 		private void BuildGraphIfNeeded()
@@ -312,6 +337,12 @@ namespace DemonBoss.Magic
 			newPlayable.SetApplyPlayableIK(false);
 			newPlayable.SetSpeed(speed);
 
+			// Set looping if requested
+			if (loop)
+			{
+				newPlayable.SetDuration(double.PositiveInfinity);
+			}
+
 			// Connect to mixer
 			_graph.Connect(newPlayable, 0, _mixer, targetInput);
 			_mixer.SetInputWeight(targetInput, 0f);
@@ -364,11 +395,11 @@ namespace DemonBoss.Magic
 
 		// ------------------ Public Query ------------------
 
-		public bool IsShieldActive() => _shieldActive;
+		public bool IsShieldActive() => _shieldActive && !_hasEnded;
 
 		public float GetRemainingShieldTime()
 		{
-			if (!_shieldActive) return 0f;
+			if (!_shieldActive || _hasEnded) return 0f;
 			float t = Mathf.Max(0f, shieldDuration - (Time.time - _shieldStartTime));
 			return (_phase == Phase.End || _phase == Phase.Done) ? 0f : t;
 		}
diff --git a/Assets/AI/FSM/FSM_Demon.asset b/Assets/AI/FSM/FSM_Demon.asset
index f4e9170fb..c3ff5b751 100644
--- a/Assets/AI/FSM/FSM_Demon.asset
+++ b/Assets/AI/FSM/FSM_Demon.asset
@@ -140,7 +140,7 @@ MonoBehaviour:
   clipSpeed: 1
   crossfadeTime: 0.12
   playEndOnEarlyExit: 1
-  debugLogs: 0
+  debugLogs: 1
 --- !u!114 &-6568372008305276654
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -164,11 +164,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: -555
-    y: 150
+    x: -330
+    y: 105
     width: 150
     height: 62
-  positionRect: {x: -555, y: 150}
+  positionRect: {x: -330, y: 105}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -195,14 +195,14 @@ MonoBehaviour:
     parentState: {fileID: -6568372008305276654}
     trueRect:
       serializedVersion: 2
-      x: -405
-      y: 180
+      x: -180
+      y: 135
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -405
-      y: 190
+      x: -180
+      y: 145
       width: 10
       height: 10
     selectedTrue: 0
@@ -297,11 +297,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: -520
-    y: 290
+    x: -295
+    y: 245
     width: 150
     height: 106
-  positionRect: {x: -520, y: 290}
+  positionRect: {x: -295, y: 245}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -328,14 +328,14 @@ MonoBehaviour:
     parentState: {fileID: -6144582714324757854}
     trueRect:
       serializedVersion: 2
-      x: -370
-      y: 320
+      x: -145
+      y: 275
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -370
-      y: 330
+      x: -145
+      y: 285
       width: 10
       height: 10
     selectedTrue: 0
@@ -356,14 +356,14 @@ MonoBehaviour:
     parentState: {fileID: -6144582714324757854}
     trueRect:
       serializedVersion: 2
-      x: -370
-      y: 342
+      x: -145
+      y: 297
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -370
-      y: 352
+      x: -145
+      y: 307
       width: 10
       height: 10
     selectedTrue: 0
@@ -392,14 +392,14 @@ MonoBehaviour:
     parentState: {fileID: -6144582714324757854}
     trueRect:
       serializedVersion: 2
-      x: -370
-      y: 364
+      x: -145
+      y: 319
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -370
-      y: 374
+      x: -145
+      y: 329
       width: 10
       height: 10
     selectedTrue: 0
@@ -550,11 +550,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: -265
-    y: 155
+    x: -45
+    y: 110
     width: 150
     height: 62
-  positionRect: {x: -265, y: 155}
+  positionRect: {x: -45, y: 110}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -573,14 +573,14 @@ MonoBehaviour:
     parentState: {fileID: -3177478727897100882}
     trueRect:
       serializedVersion: 2
-      x: -115
-      y: 185
+      x: 105
+      y: 140
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -115
-      y: 195
+      x: 105
+      y: 150
       width: 10
       height: 10
     selectedTrue: 0
@@ -619,11 +619,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: 0
-    y: 115
+    x: 215
+    y: 75
     width: 150
     height: 62
-  positionRect: {x: 0, y: 115}
+  positionRect: {x: 215, y: 75}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -646,14 +646,14 @@ MonoBehaviour:
     parentState: {fileID: -2904979146780567904}
     trueRect:
       serializedVersion: 2
-      x: -10
-      y: 145
+      x: 205
+      y: 105
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 150
-      y: 155
+      x: 365
+      y: 115
       width: 10
       height: 10
     selectedTrue: 0
@@ -791,11 +791,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: -265
-    y: 105
+    x: -45
+    y: 65
     width: 150
     height: 30
-  positionRect: {x: -265, y: 105}
+  positionRect: {x: -45, y: 65}
   rectWidth: 150
   editingName: 0
   nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -867,11 +867,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: -445
-    y: 550
+    x: -225
+    y: 505
     width: 150
     height: 150
-  positionRect: {x: -445, y: 550}
+  positionRect: {x: -225, y: 505}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -898,14 +898,14 @@ MonoBehaviour:
     parentState: {fileID: -312774025800194259}
     trueRect:
       serializedVersion: 2
-      x: -295
-      y: 580
+      x: -75
+      y: 535
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -295
-      y: 590
+      x: -75
+      y: 545
       width: 10
       height: 10
     selectedTrue: 0
@@ -930,14 +930,14 @@ MonoBehaviour:
     parentState: {fileID: -312774025800194259}
     trueRect:
       serializedVersion: 2
-      x: -295
-      y: 602
+      x: -75
+      y: 557
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -295
-      y: 612
+      x: -75
+      y: 567
       width: 10
       height: 10
     selectedTrue: 0
@@ -970,14 +970,14 @@ MonoBehaviour:
     parentState: {fileID: -312774025800194259}
     trueRect:
       serializedVersion: 2
-      x: -455
-      y: 624
+      x: -235
+      y: 579
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -295
-      y: 634
+      x: -75
+      y: 589
       width: 10
       height: 10
     selectedTrue: 0
@@ -1006,14 +1006,14 @@ MonoBehaviour:
     parentState: {fileID: -312774025800194259}
     trueRect:
       serializedVersion: 2
-      x: -295
-      y: 646
+      x: -75
+      y: 601
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -295
-      y: 656
+      x: -75
+      y: 611
       width: 10
       height: 10
     selectedTrue: 0
@@ -1038,14 +1038,14 @@ MonoBehaviour:
     parentState: {fileID: -312774025800194259}
     trueRect:
       serializedVersion: 2
-      x: -295
-      y: 668
+      x: -75
+      y: 623
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: -295
-      y: 678
+      x: -75
+      y: 633
       width: 10
       height: 10
     selectedTrue: 0
@@ -1109,7 +1109,7 @@ MonoBehaviour:
   - {fileID: 9112689765763526057}
   - {fileID: 766956384951898899}
   - {fileID: 4162026404432437805}
-  panOffset: {x: -975, y: 90}
+  panOffset: {x: -745, y: 50}
   overNode: 0
   actions:
   - {fileID: 0}
@@ -1194,11 +1194,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: 515
-    y: 780
+    x: 730
+    y: 735
     width: 150
     height: 62
-  positionRect: {x: 515, y: 780}
+  positionRect: {x: 730, y: 735}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1217,14 +1217,14 @@ MonoBehaviour:
     parentState: {fileID: 762670965814380212}
     trueRect:
       serializedVersion: 2
-      x: 505
-      y: 810
+      x: 720
+      y: 765
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 665
-      y: 820
+      x: 880
+      y: 775
       width: 10
       height: 10
     selectedTrue: 0
@@ -1264,11 +1264,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: 580
-    y: 230
+    x: 790
+    y: 185
     width: 150
     height: 62
-  positionRect: {x: 580, y: 230}
+  positionRect: {x: 790, y: 185}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1287,14 +1287,14 @@ MonoBehaviour:
     parentState: {fileID: 766956384951898899}
     trueRect:
       serializedVersion: 2
-      x: 570
-      y: 260
+      x: 780
+      y: 215
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 730
-      y: 270
+      x: 940
+      y: 225
       width: 10
       height: 10
     selectedTrue: 0
@@ -1413,11 +1413,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: 305
-    y: 780
+    x: 520
+    y: 735
     width: 150
     height: 62
-  positionRect: {x: 305, y: 780}
+  positionRect: {x: 520, y: 735}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1436,14 +1436,14 @@ MonoBehaviour:
     parentState: {fileID: 2691300596403639167}
     trueRect:
       serializedVersion: 2
-      x: 295
-      y: 810
+      x: 510
+      y: 765
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 455
-      y: 820
+      x: 670
+      y: 775
       width: 10
       height: 10
     selectedTrue: 0
@@ -1483,11 +1483,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: 50
-    y: 500
+    x: 265
+    y: 455
     width: 150
     height: 150
-  positionRect: {x: 50, y: 500}
+  positionRect: {x: 265, y: 455}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1510,14 +1510,14 @@ MonoBehaviour:
     parentState: {fileID: 2986668563461644515}
     trueRect:
       serializedVersion: 2
-      x: 40
-      y: 530
+      x: 255
+      y: 485
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 200
-      y: 540
+      x: 415
+      y: 495
       width: 10
       height: 10
     selectedTrue: 0
@@ -1542,14 +1542,14 @@ MonoBehaviour:
     parentState: {fileID: 2986668563461644515}
     trueRect:
       serializedVersion: 2
-      x: 40
-      y: 552
+      x: 255
+      y: 507
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 200
-      y: 562
+      x: 415
+      y: 517
       width: 10
       height: 10
     selectedTrue: 0
@@ -1563,11 +1563,11 @@ MonoBehaviour:
   - decisions:
     - trueValue: 1
       decision: {fileID: -7938248970223304488}
-      isValid: 0
+      isValid: 1
       validated: 0
     - trueValue: 0
       decision: {fileID: 1848419507865303702}
-      isValid: 1
+      isValid: 0
       validated: 0
     trueState: {fileID: 766956384951898899}
     falseState: {fileID: 0}
@@ -1578,14 +1578,14 @@ MonoBehaviour:
     parentState: {fileID: 2986668563461644515}
     trueRect:
       serializedVersion: 2
-      x: 200
-      y: 574
+      x: 415
+      y: 529
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 200
-      y: 584
+      x: 415
+      y: 539
       width: 10
       height: 10
     selectedTrue: 0
@@ -1603,7 +1603,7 @@ MonoBehaviour:
       validated: 0
     - trueValue: 0
       decision: {fileID: 1848419507865303702}
-      isValid: 1
+      isValid: 0
       validated: 0
     trueState: {fileID: 9112689765763526057}
     falseState: {fileID: 0}
@@ -1614,14 +1614,14 @@ MonoBehaviour:
     parentState: {fileID: 2986668563461644515}
     trueRect:
       serializedVersion: 2
-      x: 200
-      y: 596
+      x: 415
+      y: 551
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 200
-      y: 606
+      x: 415
+      y: 561
       width: 10
       height: 10
     selectedTrue: 0
@@ -1650,14 +1650,14 @@ MonoBehaviour:
     parentState: {fileID: 2986668563461644515}
     trueRect:
       serializedVersion: 2
-      x: 200
-      y: 618
+      x: 415
+      y: 573
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 200
-      y: 628
+      x: 415
+      y: 583
       width: 10
       height: 10
     selectedTrue: 0
@@ -1703,7 +1703,7 @@ MonoBehaviour:
   selectedTrue: 0
   selectedFalse: 0
   cooldownKey: Meteor
-  cooldownTime: 80
+  cooldownTime: 60
   availableAtStart: 1
   enableDebug: 1
 --- !u!114 &4031404829621142413
@@ -1757,11 +1757,11 @@ MonoBehaviour:
   isSelected: 1
   nodeRect:
     serializedVersion: 2
-    x: 575
-    y: 445
+    x: 790
+    y: 395
     width: 150
     height: 30
-  positionRect: {x: 575, y: 445}
+  positionRect: {x: 790, y: 395}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1780,14 +1780,14 @@ MonoBehaviour:
     parentState: {fileID: 4162026404432437805}
     trueRect:
       serializedVersion: 2
-      x: 650
-      y: 460
+      x: 865
+      y: 410
       width: 0
       height: 0
     falseRect:
       serializedVersion: 2
-      x: 650
-      y: 460
+      x: 865
+      y: 410
       width: 0
       height: 0
     selectedTrue: 0
@@ -1909,7 +1909,7 @@ MonoBehaviour:
   selectedTrue: 0
   selectedFalse: 0
   cooldownKey: Shield
-  cooldownTime: 60
+  cooldownTime: 45
   availableAtStart: 1
   enableDebug: 1
 --- !u!114 &8860036500635384459
@@ -1953,11 +1953,11 @@ MonoBehaviour:
   isSelected: 0
   nodeRect:
     serializedVersion: 2
-    x: 580
-    y: 95
+    x: 790
+    y: 50
     width: 150
     height: 62
-  positionRect: {x: 580, y: 95}
+  positionRect: {x: 790, y: 50}
   rectWidth: 150
   editingName: 1
   nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1976,14 +1976,14 @@ MonoBehaviour:
     parentState: {fileID: 9112689765763526057}
     trueRect:
       serializedVersion: 2
-      x: 570
-      y: 125
+      x: 780
+      y: 80
       width: 10
       height: 10
     falseRect:
       serializedVersion: 2
-      x: 730
-      y: 135
+      x: 940
+      y: 90
       width: 10
       height: 10
     selectedTrue: 0
diff --git a/Assets/AI/GhostDemon.prefab b/Assets/AI/GhostDemon.prefab
index eaeefd524..0718fef53 100644
--- a/Assets/AI/GhostDemon.prefab
+++ b/Assets/AI/GhostDemon.prefab
@@ -1133,10 +1133,10 @@ MonoBehaviour:
   openCloseWindow: 1
   selectedToolbar: 0
   _isDead: 0
-  _currentHealth: 250
+  _currentHealth: 300
   isImmortal: 0
   fillHealthOnStart: 1
-  maxHealth: 250
+  maxHealth: 300
   healthRecovery: 0
   healthRecoveryDelay: 0
   currentHealthRecoveryDelay: 0
@@ -1346,8 +1346,8 @@ MonoBehaviour:
   moveToTarget: 0
   _minAttackTime: 0.5
   _maxAttackTime: 2
-  _minAttackCount: 1
-  _maxAttackCount: 3
+  _minAttackCount: 2
+  _maxAttackCount: 5
   _attackDistance: 3
   _combatBlockingChance: 0
   _onDamageBlockingChance: 0
diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity
index cf18efe3b..466153a57 100644
--- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity
+++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity
@@ -14538,21 +14538,6 @@ PrefabInstance:
       propertyPath: _waypointArea
       value: 
       objectReference: {fileID: 1625180723}
-    - target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
-        type: 3}
-      propertyPath: _maxAttackCount
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
-        type: 3}
-      propertyPath: _minAttackCount
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
-        type: 3}
-      propertyPath: selectedToolbar
-      value: 12
-      objectReference: {fileID: 0}
     - target: {fileID: 1564533674011589205, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
         type: 3}
       propertyPath: m_AnchorMax.x
@@ -16344,42 +16329,42 @@ PrefabInstance:
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -135
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210.00003
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -45
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 763034042805173548, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -17140,7 +17125,7 @@ PrefabInstance:
     - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -26.000122
+      value: -26.000183
       objectReference: {fileID: 0}
     - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -17220,22 +17205,22 @@ PrefabInstance:
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -225
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4310148345887150382, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -17400,22 +17385,22 @@ PrefabInstance:
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -315
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -18765,22 +18750,22 @@ PrefabInstance:
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -405
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -19309,9 +19294,7 @@ MonoBehaviour:
   m_sunLight: {fileID: 1976683114}
   m_moonLight: {fileID: 0}
   WeatherPresent: 0
-  WeatherSystem: {fileID: 0}
   m_sunLightExists: 1
-  m_moonLightExists: 0
 --- !u!4 &1013064392
 Transform:
   m_ObjectHideFlags: 10
@@ -22882,8 +22865,6 @@ MonoBehaviour:
       x: 250
       y: 250
       z: 250
-  m_allFloatingPointFixMembers: []
-  m_allWorldSpaceParticleSystems: []
   m_originTargetTileX: 0
   m_originTargetTileZ: 0
   m_terrainUnloadMemoryTreshold: 4294967296