From f7b1e6ce081c632d13228260f8cbe4fdcd70783d Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Tue, 4 Nov 2025 14:16:52 +0000
Subject: [PATCH] =?UTF-8?q?refactor(fight):=20=E4=BC=98=E5=8C=96=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=95=88=E6=9E=9C=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AD=98=E6=B4=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/service/fight/fightc.go     | 2 ++
 logic/service/fight/input/node.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go
index f5748090..15cbbedb 100644
--- a/logic/service/fight/fightc.go
+++ b/logic/service/fight/fightc.go
@@ -565,7 +565,9 @@ func (f *FightC) enterturn(fattack, sattack *action.SelectSkillAction) {
 		t := f.First.GetEffect(input.EffectType.Status, i)
 
 		if t != nil { //状态都是叠层类的
+
 			ret.FAttack.Status[i] = int8(t.Duration()) + 1
+
 		}
 		t = f.Second.GetEffect(input.EffectType.Status, i)
 		if t != nil {
diff --git a/logic/service/fight/input/node.go b/logic/service/fight/input/node.go
index f76f3d9c..9b0089ef 100644
--- a/logic/service/fight/input/node.go
+++ b/logic/service/fight/input/node.go
@@ -70,7 +70,7 @@ func (c *Input) GetProp(id int, istue bool) int {
 func (c *Input) GetEffect(etype EnumEffectType, id int) Effect {
 	var ret []Effect
 	for _, v := range c.Effects {
-		if v.ID() == id {
+		if v.ID() == id &&v.Alive(){
 			ret = append(ret, v)
 		}