From f1af9894cdd047f9302813433a4441185d6c349a Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Thu, 18 Dec 2025 03:54:45 +0000
Subject: [PATCH] =?UTF-8?q?"refactor(fight):=20=E9=87=8D=E6=9E=84=E6=88=98?=
 =?UTF-8?q?=E6=96=97=E6=95=88=E6=9E=9C=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=95=88=E6=9E=9C=E6=81=A2=E5=A4=8D=E5=92=8C?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94=E6=93=8D=E4=BD=9C=E5=B0=81=E8=A3=85=E5=88=B0?=
 =?UTF-8?q?Input=E7=BB=93=E6=9E=84=E4=BD=93"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/service/fight/fightc.go      | 21 ++++-----------------
 logic/service/fight/input/input.go | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go
index 50cb81eab..4709dd37b 100644
--- a/logic/service/fight/fightc.go
+++ b/logic/service/fight/fightc.go
@@ -223,11 +223,12 @@ func (f *FightC) enterturn(fattack, sattack *action.SelectSkillAction) {
 		if i == 0 {                        //
 			attacker, defender = f.First, f.Second
 			oldskill = f.copyskill(fattack)
-
+			//先手阶段，先修复后手效果
+			f.Second.RecoverEffect()
 		} else {
 			attacker, defender = f.Second, f.First
 			oldskill = f.copyskill(sattack)
-
+			f.Second.ReactvieEffect()
 		}
 
 		currentskill = oldskill
@@ -251,26 +252,12 @@ func (f *FightC) enterturn(fattack, sattack *action.SelectSkillAction) {
 			attacker.CurrentPet.Info.Hp > 0
 
 		if !canuse {
-			//根本没释放技能,这些效果全部失效
-			for _, e := range attacker.EffectCache {
-				e.Alive(false)
-
-			}
-
-			//这时候将被覆盖的效果全部装回来enterturn
-			for _, e := range attacker.Effect_Lost {
-				e.Alive(true)
-
-			}
+			attacker.RecoverEffect()
 			currentskill = nil
 		} else {
 
 			f.processSkillAttack(attacker, defender, currentskill)
 			currentskill = oldskill //还原技能
-			// if oldskill != nil {
-			// 	fmt.Println("结束攻击_old", oldskill.Power)
-			// 	fmt.Println("结束攻击_new", currentskill.Power)
-			// }
 
 			_, skill, ok := utils.FindWithIndex(attacker.CurrentPet.Info.SkillList, func(item model.SkillInfo) bool {
 				return item.ID == currentskill.Info.ID
diff --git a/logic/service/fight/input/input.go b/logic/service/fight/input/input.go
index d194996ae..f6cffe591 100644
--- a/logic/service/fight/input/input.go
+++ b/logic/service/fight/input/input.go
@@ -104,7 +104,36 @@ func (our *Input) SetOPP(t *Input) {
 	our.Opp = t
 
 }
+func (our *Input) RecoverEffect() {
 
+	//根本没释放技能,这些效果全部失效
+	for _, e := range our.EffectCache {
+		e.Alive(false)
+
+	}
+
+	//这时候将被覆盖的效果全部装回来enterturn
+	for _, e := range our.Effect_Lost {
+		e.Alive(true)
+
+	}
+
+}
+func (our *Input) ReactvieEffect() {
+
+	//根本没释放技能,这些效果全部失效
+	for _, e := range our.Effect_Lost {
+		e.Alive(false)
+
+	}
+
+	//这时候将被覆盖的效果全部装回来enterturn
+	for _, e := range our.Effect_Lost {
+		e.Alive(true)
+
+	}
+
+}
 func (our *Input) GenSataus() {
 	our.Status = [20]int8{}
 	for i := 0; i < 20; i++ { //堆叠状态剩余回合