文本显示和Command大修

Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs

@@ -20,7 +20,7 @@ namespace Continentis.Mods.Basic.Cards
             SetAttribute("DisplayHellfireStack", GetAttribute("HellfireStack"));
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -33,7 +33,7 @@ namespace Continentis.Mods.Basic.Cards
                     buff.Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_ArmyOfTheDead/ArmyOfTheDead.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class ArmyOfTheDead : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -19,8 +19,8 @@ namespace Continentis.Mods.Basic.Cards
                 CharacterData minion = cardData.GetDerivativeCharacterData(0);
                 CombatMainManager.Instance.characterController.AddCombatNPCs((minion, Fraction.Enemy), (minion, Fraction.Enemy));
             }));
-            
-            return mainGroup;
+
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_HellfireBlast/HellfireBlast.cs

@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Cards
             SetAttribute("DisplayHellfireStack", GetAttribute("HellfireStack"));
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -37,7 +37,7 @@ namespace Continentis.Mods.Basic.Cards
                     buff.Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_NecromanticInfusion/NecromanticInfusion.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class NecromanticInfusion : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -21,7 +21,7 @@ namespace Continentis.Mods.Basic.Cards
                     buff.Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_SoulCleave/SoulCleave.cs

@@ -16,7 +16,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_LifeSteal>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -30,7 +30,7 @@ namespace Continentis.Mods.Basic.Cards
                     hellfireBuff?.unitedStackSubmodule.ClearAllStacks();
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override int GetFinalDamage(CharacterBase target, List<string> elementalTags = null)

Assets/Mods/Basic/Cards/Data/MarshalOfTheUnderworld/Basic_WrathOfTheUnderworld/WrathOfTheUnderworld.cs

@@ -17,7 +17,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_LifeSteal>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -33,7 +33,7 @@ namespace Continentis.Mods.Basic.Cards
             CommandGroup mainGroup = TargetListCommandGroup(targetList, ExecutionMode.Parallel, ExecutionMode.Sequential,
                 singleTargetGroup, singleTargetGroup, singleTargetGroup);
     
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Assassin/CompoundPoison.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class CompoundPoison : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_ParamFunction<CharacterBase>(0.05f, target =>
@@ -31,7 +31,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Corrosion>(GetAttribute("BuffStack_Corrosion") * debuffCount).Apply(target, user, this);
                 })
                 );
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Assassin/Torture.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class Torture : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandQueueManager.Instance.AddCommand(user.deckSubmodule.DrawCards(GetAttribute("DrawCardAmount")));
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
@@ -21,7 +21,7 @@ namespace Continentis.Mods.Basic.Cards
                         CreateCharacterBuff<Corrosion>(GetAttribute("BuffStack_Corrosion")).Apply(target, user, this);
                     }
                 }));
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Assassin/WoundDeterioration.cs

@@ -9,14 +9,14 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class WoundDeterioration : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_ParamFunction<CharacterBase>(0.05f, target =>
                 {
                     CreateCharacterBuff<Buffs.WoundDeterioration>(GetAttribute("BuffStack_WD")).Apply(target, user, this);
                 }));
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Cleric/LessRestoration.cs

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class LessRestoration : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -19,7 +19,7 @@ namespace Continentis.Mods.Basic.Cards
                     target.combatBuffSubmodule.Dispel(BuffDispelLevel.Basic, user);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/General/Rouse.cs

@@ -9,13 +9,13 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class Rouse : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_Function(() => user.ModifyStamina(1)));
-            
-            return mainGroup;
+
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/General/Tactic.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_SelectHandCards>().SetEffect(SelectEffect);
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"));
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Cards
 
             mainGroup.AddCommand(new Cmd_DrawCards(user.deckSubmodule, 1));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         private void SelectEffect(CardInstance card)

Assets/Mods/Basic/Cards/Scripts/General/Whimsy.cs

@@ -9,13 +9,13 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class Whimsy : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_Function(() => user.ModifyMana(1)));
-            
-            return mainGroup;
+
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/BattlefieldExperience.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_GenerateCards>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
@@ -23,8 +23,8 @@ namespace Continentis.Mods.Basic.Cards
                 CardData holyWaterCardData = GetDerivativeCardData(0);
                 CardInstance.GenerateCardInstance(holyWaterCardData, user.team, "Hand");
             }));
-            
-            return mainGroup;
+
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/BodyAsShield.cs

@@ -15,14 +15,14 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Protect>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_ParamFunction<CharacterBase>((target) => 
                     LogicComponent<CardLogicComponent_Protect>().GenerateProtection(user, target, GetAttribute("BuffCount_Protecting"))));
-            
-            return mainGroup;
+
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/Cover.cs

@@ -16,7 +16,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Protect>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -24,7 +24,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_ParamFunction<CharacterBase>((target) => 
                     LogicComponent<CardLogicComponent_Protect>().GenerateProtection(user, target, GetAttribute("BuffCount_Protecting"))));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/DivineSmite.cs

@@ -17,7 +17,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Protect>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -35,7 +35,7 @@ namespace Continentis.Mods.Basic.Cards
                 mainGroup.AddCommand(protectCommand);
             }
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/EchoOfHonor.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_GenerateCards>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
@@ -31,7 +31,7 @@ namespace Continentis.Mods.Basic.Cards
                     Debug.LogWarning("EchoOfHonor: No other cards in hand to copy.");
                 }
             }));
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/EstablishFormation.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Defense>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Buffs.EstablishFormation>(stack, count).Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/FirmBelief.cs

@@ -21,14 +21,14 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Defense>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = SingleCommandGroup(
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_Function(() => user.AddBlock(GetAttribute("Block"))),
                 new Cmd_Function(() => user.deckSubmodule.DrawCards(GetAttribute("DrawCardAmount"))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/GuardianAura.cs

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class GuardianAura : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -18,7 +18,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Buffs.GuardianAura>(GetAttribute("GuardianAuraCount")).Apply(user, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/HeavySlash.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -31,7 +31,7 @@ namespace Continentis.Mods.Basic.Cards
                 CreateCharacterBuff<Heavy>(false, 1).Apply(user, user, this);
             })); //对使用者施加沉重状态
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/IronWall.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class IronWall : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -19,7 +19,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Withstand>(GetAttribute("BuffCount_Withstand")).Apply(user, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/OathOfCourage.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Defense>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Consolidate>(GetAttribute("BuffCount_Consolidate")).Apply(user, user, this);
                 }));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/OathOfHonor.cs

@@ -9,13 +9,13 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class OathOfHonor : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_Function(() => user.ModifyStamina(GetAttribute("StaminaRestore"))));
-            
-            return mainGroup;
+
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Knight/Smite.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Weak>(GetAttribute("WeakCount")).Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Knight/UtmostStrike.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_SelectHandCards>().SetCondition(SelectCondition).SetEffect(SelectEffect);
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Cards
             
             LogicComponent<CardLogicComponent_SelectHandCards>().AddSelectionCommands(ref mainGroup);
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Mage/Abundant.cs

@@ -18,13 +18,13 @@ namespace Continentis.Mods.Basic
                 AddLogicComponent<CardLogicComponent_SelectHandCards>().SetCondition(SelectCondition).SetEffect(SelectEffect);
             }
 
-            protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+            protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
             {
                 CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                     new Cmd_PlayAnimation(user.characterView, "Skill"));
                 LogicComponent<CardLogicComponent_SelectHandCards>().AddSelectionCommands(ref mainGroup);
 
-                return mainGroup;
+                return new List<CommandBase> { mainGroup };
             }
 
             private bool SelectCondition(CardInstance card)

Assets/Mods/Basic/Cards/Scripts/Mage/ArcaneMissiles.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -22,12 +22,28 @@ namespace Continentis.Mods.Basic.Cards
             templates.Add(new Cmd_PlayAnimation(user.characterView, "Attack"));
             for (int i = 0; i < GetAttribute("AttackCount"); i++) //多段攻击（段数可变）情况的处理
             {
-                templates.Add(new Cmd_ParamFunction<CharacterBase>(0.4f, target => user.Attack(target, GetFinalDamage(target))));
+                templates.Add(new Cmd_ParamFunction<CharacterBase>(0.4f, target =>
+                {
+                    user.Attack(target, GetFinalDamage(target));
+                    Debug.Log("攻击命令触发");
+                }));
             }
-
+            CommandGroup occupiedGroup = new CommandGroup(ExecutionMode.Sequential, new Cmd_Function(1, ()=>
+            {
+                Debug.Log("不插队指令，先于攻击触发，如果先执行抽牌说明插队成功");
+            }));
             CommandGroup mainGroup = TargetListCommandGroup(targetList, ExecutionMode.Sequential, ExecutionMode.Sequential, templates.ToArray());
-
-            return mainGroup;
+            CommandGroup finalGroup = new CommandGroup(ExecutionMode.Sequential, new Cmd_Function(()=>
+            {
+                Debug.Log("不插队指令");
+            }));
+            CommandGroup firstGroup = new CommandGroup(ExecutionMode.Sequential, new Cmd_Function(()=>
+            {
+                Debug.Log("插队指令，先抽牌");
+            }), new Cmd_DrawCards(user.deckSubmodule, 1));
+            firstGroup.insertAtFirst = true;
+            
+            return new List<CommandBase> { occupiedGroup, mainGroup, finalGroup, firstGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Mage/ConcentratedSpellcasting.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class ConcentratedSpellcasting : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -19,7 +19,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Buffs.ConcentratedSpellcasting>(GetAttribute("BuffStack_ConcentratedSpellcasting")).Apply(user, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Mage/ElectricClaw.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Cards
             {
                 CreateCharacterBuff<Resonance>(GetAttribute("BuffStack_Resonance")).Apply(user, user, this);
             }));
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Mage/FarSighted.cs

@@ -15,22 +15,21 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_SelectHandCards>().SetEffect(SelectEffect);
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
             LogicComponent<CardLogicComponent_SelectHandCards>()
                 .AddSelectionCommands(ref mainGroup, "Card_Basic_FarSighted_SelectionCommandTitle".Localize(), 1);
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         private void SelectEffect(CardInstance card)
         {
             card.cardLogic.contentSubmodule.keywords.Add("Retain");
             card.cardLogic.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
-            CardTextInterpreter.InterpretText(card.cardLogic, true);
-            card.handCardView.Setup();
+            card.cardLogic.contentSubmodule.dirtyMark = true;
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Mage/FireBall.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Burn>(GetAttribute("BuffStack_Burn")).Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/Mage/FlameInscription.cs

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class FlameInscription : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -18,7 +18,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Buffs.FlameInscription>(GetAttribute("BuffStack_FlameInscription")).Apply(user, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Mage/Haste.cs

@@ -9,7 +9,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class Haste : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -18,7 +18,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Buffs.Haste>().Apply(user, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Mage/IdentifyWeakness.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class IdentifyWeakness : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -19,7 +19,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Vulnerable>(GetAttribute("BuffCount_Vulnerable")).Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Mage/Scorch.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class Scorch : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
                     }
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/Mage/WitchcraftRay.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -25,7 +25,7 @@ namespace Continentis.Mods.Basic.Cards
                     user.Attack(target, GetFinalDamage(target));
                 }));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Bludgeon.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList, 
                 ExecutionMode.Sequential, 
@@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Cards
                     CreateCharacterBuff<Weak>().Apply(target, user, this);
                 }));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Cohesion.cs

@@ -16,14 +16,14 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_SelectHandCards>().SetCondition(SelectCondition).SetEffect(SelectEffect);
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
             LogicComponent<CardLogicComponent_SelectHandCards>()
                 .AddSelectionCommands(ref mainGroup, "Card_Basic_Cohesion_SelectionCommandTitle".Localize(), 1);
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         private bool SelectCondition(CardInstance card)
@@ -37,8 +37,7 @@ namespace Continentis.Mods.Basic.Cards
             card.cardLogic.ModifyAttribute("StaminaCost", -1);
             card.cardLogic.contentSubmodule.keywords.Add("Retain");
             card.cardLogic.contentSubmodule.originalFunctionText += " + $Keyword(\"Retain\")";
-            CardTextInterpreter.InterpretText(card.cardLogic, true);
-            card.handCardView.Setup();
+            card.cardLogic.contentSubmodule.dirtyMark = true;
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/CommonHolyWater.cs

@@ -17,14 +17,14 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_SelectHandCards>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
             LogicComponent<CardLogicComponent_SelectHandCards>().AddSelectionCommands(ref mainGroup, "Select at most 3 Status or Curse cards to be exhausted.", 3);
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public bool SelectCondition(CardInstance card)

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Defense>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_Function(0.2f, () => user.AddBlock(GetAttribute("Block"))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/DualStrike.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Cards
                     new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target)))
                 ));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FightingInspiration.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_GenerateCards>().SetFilter(CardFilter);
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -29,7 +29,7 @@ namespace Continentis.Mods.Basic.Cards
                 }
             }));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         private bool CardFilter(CardData cardData)

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/FireBolt.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Cards
                     new Burn(GetAttribute("BuffLayer_Burn")).Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Guard.cs

@@ -10,7 +10,7 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class Guard : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                     protectingBuff.Apply(user, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HiddenBlade.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
                 new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetFinalDamage(target))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/HolyWaterPreparation.cs

@@ -16,7 +16,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_GenerateCards>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Cards
                 CardInstance.GenerateCardInstance(holyWaterCardData, user.team, "Hand");
             }));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/MudBarrier.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Defense>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Skill"),
                 new Cmd_Function(0.2f, () => user.AddBlock(GetAttribute("Block"))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Prick.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
                 new Cmd_ParamFunction<CharacterBase>(0.1f, target => user.Attack(target, GetFinalDamage(target))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RadiantBolt.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Cards
                     new Blind(GetAttribute("BuffLayer_Blind")).Apply(target, user, this);
                 }));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RayOfFrost.cs

@@ -15,7 +15,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -23,7 +23,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
                 new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetFinalDamage(target))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/RecklessAssault.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
                 new Cmd_ParamFunction<CharacterBase>(0.1f, target => user.Attack(target, GetFinalDamage(target))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Recollection.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_SelectCustomCards>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
             LogicComponent<CardLogicComponent_SelectCustomCards>()
                 .AddSelectionCommands(ref mainGroup, discardedCards, "Select a non-status or non-curse card.", 1);
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
        
         public void SelectEffect(CardInstance card)

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs

@@ -14,7 +14,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
 
@@ -22,7 +22,7 @@ namespace Continentis.Mods.Basic.Cards
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
                 new Cmd_ParamFunction<CharacterBase>(target => user.Attack(target, GetFinalDamage(target))));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
         
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Strike.cs

@@ -16,7 +16,7 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
 
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Cards
                 cmd.AddAction<CharacterBase>(0.7f, "Target", target => user.Attack(target, GetFinalDamage(target)));
             }
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/ThinkingCountermeasures.cs

@@ -10,12 +10,12 @@ namespace Continentis.Mods.Basic.Cards
 {
     public class ThinkingCountermeasures : CardLogicBase
     {
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential,
                 user.deckSubmodule.DrawCards(GetAttribute("DrawCardAmount")));
 
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
     }
 }

Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/WindBlade.cs

@@ -14,14 +14,14 @@ namespace Continentis.Mods.Basic.Cards
             AddLogicComponent<CardLogicComponent_Attack>();
         }
         
-        protected override CommandBase PlayEffect(List<CharacterBase> targetList)
+        protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
             base.PlayEffect(targetList);
             CommandGroup mainGroup = TargetListCommandGroup(targetList,
                 new Cmd_PlayAnimation(user.characterView, "Attack"),
                 new Cmd_ParamFunction<CharacterBase>(0.2f, target => user.Attack(target, GetFinalDamage(target))));
             
-            return mainGroup;
+            return new List<CommandBase> { mainGroup };
         }
 
         public override void ApplyAttributeChangesByCard()