From 03d93a2fbade01991f7f3adadc6eca4b0fc93492 Mon Sep 17 00:00:00 2001 From: xinian Date: Thu, 5 Mar 2026 17:40:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic/service/fight/boss/NewSeIdx_16.go | 1 - logic/service/fight/effect/effect_119_123.go | 4 ++-- logic/service/fight/effect/effect_28.go | 2 +- modules/player/service/info.go | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/logic/service/fight/boss/NewSeIdx_16.go b/logic/service/fight/boss/NewSeIdx_16.go index 28fb2a9f4..9112fd080 100644 --- a/logic/service/fight/boss/NewSeIdx_16.go +++ b/logic/service/fight/boss/NewSeIdx_16.go @@ -37,7 +37,6 @@ func (e *NewSel16) TurnStart(fattack *action.SelectSkillAction, sattack *action. e.Ctx().Our.SetProp(e.Ctx().Our, int8(e.Args()[0].IntPart()), 1, info.AbilityOpType.ADD) } - return } func init() { input.InitEffect(input.EffectType.NewSel, 16, &NewSel16{}) diff --git a/logic/service/fight/effect/effect_119_123.go b/logic/service/fight/effect/effect_119_123.go index 51e1cb78f..ec2837e82 100644 --- a/logic/service/fight/effect/effect_119_123.go +++ b/logic/service/fight/effect/effect_119_123.go @@ -77,7 +77,7 @@ func (e *Effect120) OnSkill() bool { oppMaxHP := alpacadecimal.NewFromInt(int64(e.Ctx().Opp.CurrentPet.Info.MaxHp)) damage := oppMaxHP.Mul(percent).Div(alpacadecimal.NewFromInt(100)) e.Ctx().Opp.Damage(e.Ctx().Our, &info.DamageZone{ - Type: info.DamageType.Fixed, + Type: info.DamageType.Percent, Damage: damage, }) } else { @@ -85,7 +85,7 @@ func (e *Effect120) OnSkill() bool { ourMaxHP := alpacadecimal.NewFromInt(int64(e.Ctx().Our.CurrentPet.Info.MaxHp)) damage := ourMaxHP.Mul(percent).Div(alpacadecimal.NewFromInt(100)) e.Ctx().Our.Damage(e.Ctx().Opp, &info.DamageZone{ - Type: info.DamageType.Fixed, + Type: info.DamageType.Percent, Damage: damage, }) } diff --git a/logic/service/fight/effect/effect_28.go b/logic/service/fight/effect/effect_28.go index 1f101ce66..2d74df40b 100644 --- a/logic/service/fight/effect/effect_28.go +++ b/logic/service/fight/effect/effect_28.go @@ -24,7 +24,7 @@ type Effect28 struct { func (e *Effect28) OnSkill() bool { e.Ctx().Opp.Damage(e.Ctx().Our, &info.DamageZone{ - Type: info.DamageType.Fixed, + Type: info.DamageType.Percent, Damage: e.Ctx().Opp.CurrentPet.GetHP().Div(e.Args()[0]), }) return true diff --git a/modules/player/service/info.go b/modules/player/service/info.go index 9679d2083..05ba09031 100644 --- a/modules/player/service/info.go +++ b/modules/player/service/info.go @@ -104,7 +104,7 @@ func (s *InfoService) SetLogin() *model.PlayerInfo { //tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数 for _, v := range service.NewTaskService().GetDaily() { - if v.IsAcceptable == 0 { + if v.IsAcceptable == 1 { tt.Data.SetTask(int(v.TaskId), model.Unaccepted) } else { tt.Data.SetTask(int(v.TaskId), model.Reserved) @@ -127,7 +127,7 @@ func (s *InfoService) SetLogin() *model.PlayerInfo { tt.WeekLastResetTime = gtime.Now() for _, v := range service.NewTaskService().GetWeek() { - if v.IsAcceptable == 0 { + if v.IsAcceptable == 1 { tt.Data.SetTask(int(v.TaskId), model.Unaccepted) } else { tt.Data.SetTask(int(v.TaskId), model.Reserved)