切换主武器

Assets/Scripts/MainGame/Items/MainWeapons/FutureWand.cs

@@ -23,6 +23,10 @@ namespace Cielonos.MainGame.Inventory
                 {
                     PlayTargetedAnimation("LightAttack" + comboSm.GetCurrentNodeName(), currentTarget, 5f);
                 }
+                else
+                {
+                    PlayTargetedAnimation("LightAttack" + comboSm.GetCurrentNodeName(), null, 5f);
+                }
             }
         }
         
@@ -37,6 +41,10 @@ namespace Cielonos.MainGame.Inventory
                 {
                     PlayTargetedAnimation("HeavyAttack", currentTarget, 3f);
                 }
+                else
+                {
+                    PlayTargetedAnimation("HeavyAttack", null, 3f);
+                }
             }
         }
     }
@@ -50,6 +58,11 @@ namespace Cielonos.MainGame.Inventory
         private void LightAttack3() => GenerateProjectile("HeavyProjectile", currentTarget, 10f);
         private void HeavyAttack() => GenerateGroundArea("GroundArea");
     }
+
+    public partial class FutureWand : MainWeaponBase
+    {
+        private Transform muzzle => viewObjects["Wand"].functionalParts["Muzzle"].transform;
+    }
     
     public partial class FutureWand
     {

Assets/Scripts/MainGame/Items/MainWeapons/Polychrome.cs

@@ -12,12 +12,16 @@ namespace Cielonos.MainGame.Inventory
 
         protected override void Update()
         {
-            base.Update();
-            perfectBlockedTimer -= player.selfTimeSm.DeltaTime;
+            if (player.inventorySc.equipmentSm.currentMainWeapon == this)
+            {
+                functionSm?.Update(player.selfTimeSm.DeltaTime);
+                perfectBlockedTimer -= player.selfTimeSm.DeltaTime;
+            }
         }
 
         public override void OnEquipped()
         {
+            base.OnEquipped();
             RegisterFunctionsToAnimSc(
                 LightAttack0, LightAttack1, LightAttack2, LightAttack3, 
                 TripleAttack_0, TripleAttack_1, TripleAttack_2,