五张牌！

Assets/Mods/Basic/Characters/CombatBuffs/General/Burn.cs

@@ -21,6 +21,7 @@ namespace Continentis.Mods.Basic.Buffs
             this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
             
             this.eventSubmodule = new EventSubmodule(this);
+            this.eventSubmodule.onActionStart.Add("Burn", new EventUnit(OnActionStart));
             this.eventSubmodule.onAfterPlayCard.Add("Burn", new EventUnit<CardInstance, List<CharacterBase>>(OnAfterPlayCard));
         }
 
@@ -36,13 +37,16 @@ namespace Continentis.Mods.Basic.Buffs
             
             return true;
         }
+        
+        private void OnActionStart()
+        {
+            unitedStackSubmodule.ReduceStack(1);
+            iconSubmodule.Update();
+        }
 
         private void OnAfterPlayCard(CardInstance card, List<CharacterBase> targets)
         {
-            int reducedStack = Mathf.Max(1, Mathf.FloorToInt(unitedStackSubmodule.stackAmount * 0.3f));
-            sourceCharacter.Attack(attachedCharacter, reducedStack, true);
-            unitedStackSubmodule.ReduceStack(reducedStack);
-            iconSubmodule.Update();
+            sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, true);
         }
     }
 }

Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs

@@ -0,0 +1,37 @@
+using Continentis.MainGame;
+using Continentis.MainGame.Character;
+using UnityEngine;
+
+namespace Continentis.Mods.Basic.Buffs
+{
+    public class Consolidate : CharacterCombatBuffBase
+    {
+        public Consolidate(int roundCount)
+        {
+            Initialize(BuffType.Positive, BuffDispelLevel.Strong);
+            
+            this.contentSubmodule = new ContentSubmodule(this, false)
+                .AddParameterGetter("Count", () => roundCountSubmodule.remainingCount.ToString());
+            
+            this.iconSubmodule = new IconSubmodule(this);
+            
+            this.roundCountSubmodule = new CountSubmodule(this, roundCount);
+            
+            this.generalAttributeSubmodule = new GeneralAttributeSubmodule(this);
+            this.generalAttributeSubmodule.numericChange.Add("KeepBlockOnActionStart", 1);
+        }
+        
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff) 
+        {
+            MainGameManager.Instance.basePrefabs.GenerateInfoText("Consolidate", attachedCharacter.characterView);
+            
+            if (FindExistingSameBuff(out existingBuff))
+            {
+                existingBuff.roundCountSubmodule.AddCount(this.roundCountSubmodule.remainingCount);
+                return false;
+            }
+            
+            return true;
+        }
+    }
+}

Assets/Mods/Basic/Characters/CombatBuffs/General/Consolidate.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2e519d542ada508448e92e5dce768770

Assets/Mods/Basic/Characters/CombatBuffs/General/Corrosion.cs

@@ -22,6 +22,20 @@ namespace Continentis.Mods.Basic.Buffs
             this.eventSubmodule.onActionStart.Add("Corrosion", new EventUnit(OnActionStart));
         }
         
+        public override bool OnBuffApply(out CharacterCombatBuffBase existingBuff)
+        {
+            MainGameManager.Instance.basePrefabs.GenerateInfoText("Corrosion", attachedCharacter.characterView);
+            
+            if (FindExistingSameBuff(out existingBuff))
+            {
+                existingBuff.unitedStackSubmodule.AddStack(this.unitedStackSubmodule.stackAmount);
+                return false;
+            }
+            
+            return true;
+        }
+
+        
         private void OnActionStart()
         {
             sourceCharacter.Attack(attachedCharacter, unitedStackSubmodule.stackAmount, true);

Assets/Mods/Basic/Characters/CombatBuffs/General/Heavy.cs

@@ -32,7 +32,7 @@ namespace Continentis.Mods.Basic.Buffs
             {
                 if (this.isAdditive) //可叠加型状态
                 {
-                    existingBuff.actionCountSubmodule.AddMaxCount(this.actionCountSubmodule.maximumCount);
+                    existingBuff.actionCountSubmodule.AddCount(this.actionCountSubmodule.maximumCount);
                 }
                 
                 return false;

Assets/Mods/Basic/Characters/CombatBuffs/General/Protecting.cs

@@ -21,12 +21,12 @@ namespace Continentis.Mods.Basic.Buffs
             }
             
             this.contentSubmodule = new ContentSubmodule(this)
-                .AddParameterGetter("Count", () => combatRoundTimeSubmodule.remainingCount.ToString())
+                .AddParameterGetter("Count", () => roundCountSubmodule.remainingCount.ToString())
                 .AddParameterGetter("Target", () => target.data.displayName);//TODO: 以后增加角色的ContentSubmodule
 
             this.iconSubmodule = new IconSubmodule(this).SetTextFunctions("Count");
             
-            this.combatRoundTimeSubmodule = new CountSubmodule(this, actionCount);
+            this.roundCountSubmodule = new CountSubmodule(this, actionCount);
             
             this.eventSubmodule = new EventSubmodule(this);
         }

Assets/Mods/Basic/Characters/CombatBuffs/General/Vulnerable.cs

@@ -28,7 +28,7 @@ namespace Continentis.Mods.Basic.Buffs
             
             if (FindExistingSameBuff(out existingBuff))
             {
-                existingBuff.actionCountSubmodule.AddMaxCount(this.combatRoundTimeSubmodule.maximumCount);
+                existingBuff.actionCountSubmodule.AddCount(this.roundCountSubmodule.maximumCount);
                 return false;
             }
             

Assets/Mods/Basic/Characters/CombatBuffs/General/Weak.cs

@@ -27,7 +27,7 @@ namespace Continentis.Mods.Basic.Buffs
             
             if (FindExistingSameBuff(out existingBuff))
             {
-                existingBuff.actionCountSubmodule.AddMaxCount(this.actionCountSubmodule.maximumCount);
+                existingBuff.actionCountSubmodule.AddCount(this.actionCountSubmodule.maximumCount);
                 return false;
             }