diff --git a/logic/service/fight/boss/NewSeIdx_10.go b/logic/service/fight/boss/NewSeIdx_10.go index 400da088..7bc77bb1 100644 --- a/logic/service/fight/boss/NewSeIdx_10.go +++ b/logic/service/fight/boss/NewSeIdx_10.go @@ -1,26 +1,36 @@ package effect import ( + "blazing/logic/service/fight/action" "blazing/logic/service/fight/input" - "math" ) // 10. 无限PP值; // TODO: 实现无限PP值;的核心逻辑 type NewSel10 struct { NewSel0 + can bool } +func (e *NewSel10) Turn_Start(fattack *action.SelectSkillAction, sattack *action.SelectSkillAction) { + if e.can { + e.Ctx().Our.HealPP(-1) + + } + +} func (e *NewSel10) OnSkill() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } - if e.Ctx().SkillEntity == nil { - return true - } - e.Ctx().SkillEntity.Info.PP = math.MaxInt32 + e.can = true + + // if e.Ctx().SkillEntity == nil { + // return true + // } + // e.Ctx().SkillEntity.Info.PP = math.MaxInt32 return true } diff --git a/logic/service/fight/effect/effect_46.go b/logic/service/fight/effect/effect_46.go index cc491b29..ae4849eb 100644 --- a/logic/service/fight/effect/effect_46.go +++ b/logic/service/fight/effect/effect_46.go @@ -16,9 +16,6 @@ type Effect46 struct { conut int64 } -func (e *Effect46) Turn_End() { - e.conut++ -} func (e *Effect46) Damage_DIV_ex(t *info.DamageZone) bool { if !e.Hit() { return true @@ -29,18 +26,17 @@ func (e *Effect46) Damage_DIV_ex(t *info.DamageZone) bool { if e.Ctx().SkillEntity.Category() == info.Category.STATUS { return true } + + //fmt.Println("Effect46_o", t.Damage) + if t.Type == info.DamageType.Red { + e.conut++ + t.Damage = alpacadecimal.NewFromInt(0) + + } if e.Args()[0].IntPart() == e.conut { e.Alive(false) return true } - - //fmt.Println("Effect46_o", t.Damage) - if t.Type == info.DamageType.Red { - - t.Damage = alpacadecimal.NewFromInt(0) - - } - //fmt.Println("Effect46_n", t.Damage) return true }