diff --git a/logic/service/fight/boss/NewSeIdx_144.go b/logic/service/fight/boss/NewSeIdx_144.go index 6410bbcf..520c11e7 100644 --- a/logic/service/fight/boss/NewSeIdx_144.go +++ b/logic/service/fight/boss/NewSeIdx_144.go @@ -12,7 +12,7 @@ type NewSel144 struct { count int } -func (e *NewSel144) ActionEndEx() bool { +func (e *NewSel144) Action_end_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/logic/service/fight/boss/NewSeIdx_25.go b/logic/service/fight/boss/NewSeIdx_25.go index 4a50d107..e7028453 100644 --- a/logic/service/fight/boss/NewSeIdx_25.go +++ b/logic/service/fight/boss/NewSeIdx_25.go @@ -12,7 +12,7 @@ type NewSel25 struct { NewSel0 } -func (e *NewSel25) ActionEndEx() bool { +func (e *NewSel25) Action_end_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/logic/service/fight/boss/NewSeIdx_31.go b/logic/service/fight/boss/NewSeIdx_31.go index 29719841..aaa0780b 100644 --- a/logic/service/fight/boss/NewSeIdx_31.go +++ b/logic/service/fight/boss/NewSeIdx_31.go @@ -10,7 +10,7 @@ type NewSel31 struct { NewSel0 } -func (e *NewSel31) ActionEndEx() bool { +func (e *NewSel31) Action_end_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/logic/service/fight/boss/NewSeIdx_33.go b/logic/service/fight/boss/NewSeIdx_33.go index eb62fd18..f7d03207 100644 --- a/logic/service/fight/boss/NewSeIdx_33.go +++ b/logic/service/fight/boss/NewSeIdx_33.go @@ -10,7 +10,7 @@ type NewSel33 struct { NewSel0 } -func (e *NewSel33) ActionEndEx() bool { +func (e *NewSel33) Action_end_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/logic/service/fight/boss/NewSeIdx_403.go b/logic/service/fight/boss/NewSeIdx_403.go index c43b4f9b..db0ceb1c 100644 --- a/logic/service/fight/boss/NewSeIdx_403.go +++ b/logic/service/fight/boss/NewSeIdx_403.go @@ -13,7 +13,7 @@ type NewSel403 struct { remainingTurns int } -func (e *NewSel403) ActionEndEx() bool { +func (e *NewSel403) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_408.go b/logic/service/fight/boss/NewSeIdx_408.go index 0720ea30..708916be 100644 --- a/logic/service/fight/boss/NewSeIdx_408.go +++ b/logic/service/fight/boss/NewSeIdx_408.go @@ -10,8 +10,8 @@ type NewSel408 struct { NewSel0 } -// ActionEndEx 实现消除能力强化效果的核心逻辑 -func (e *NewSel408) ActionEndEx() bool { +// Action_end_ex 实现消除能力强化效果的核心逻辑 +func (e *NewSel408) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if !e.IsOwner() { return true diff --git a/logic/service/fight/boss/NewSeIdx_409.go b/logic/service/fight/boss/NewSeIdx_409.go index 47be18cf..f855a9e7 100644 --- a/logic/service/fight/boss/NewSeIdx_409.go +++ b/logic/service/fight/boss/NewSeIdx_409.go @@ -10,7 +10,7 @@ type NewSel409 struct { NewSel0 } -func (e *NewSel409) ActionEndEx() bool { +func (e *NewSel409) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_44.go b/logic/service/fight/boss/NewSeIdx_44.go index 7c75e716..01845cbc 100644 --- a/logic/service/fight/boss/NewSeIdx_44.go +++ b/logic/service/fight/boss/NewSeIdx_44.go @@ -11,7 +11,7 @@ type NewSel44 struct { count int } -func (e *NewSel44) ActionEndEx() bool { +func (e *NewSel44) Action_end_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/logic/service/fight/boss/NewSeIdx_46.go b/logic/service/fight/boss/NewSeIdx_46.go index 785fc796..4afd3e30 100644 --- a/logic/service/fight/boss/NewSeIdx_46.go +++ b/logic/service/fight/boss/NewSeIdx_46.go @@ -15,7 +15,7 @@ type NewSel46 struct { lastRecoveryRound uint32 } -func (e *NewSel46) ActionEndEx() bool { +func (e *NewSel46) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_49.go b/logic/service/fight/boss/NewSeIdx_49.go index 0d4e39d3..10a07f0f 100644 --- a/logic/service/fight/boss/NewSeIdx_49.go +++ b/logic/service/fight/boss/NewSeIdx_49.go @@ -18,7 +18,7 @@ type NewSel49 struct { remainingTurns int } -func (e *NewSel49) ActionEndEx() bool { +func (e *NewSel49) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_59.go b/logic/service/fight/boss/NewSeIdx_59.go index 979b5828..60b3f288 100644 --- a/logic/service/fight/boss/NewSeIdx_59.go +++ b/logic/service/fight/boss/NewSeIdx_59.go @@ -16,7 +16,7 @@ type NewSel59 struct { } // TODO: 需要了解魔王的附身触发条件 -func (e *NewSel59) ActionEndEx() bool { +func (e *NewSel59) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_6.go b/logic/service/fight/boss/NewSeIdx_6.go index 48ab5074..2ee2ef35 100644 --- a/logic/service/fight/boss/NewSeIdx_6.go +++ b/logic/service/fight/boss/NewSeIdx_6.go @@ -11,7 +11,7 @@ type NewSel6 struct { NewSel0 } -func (e *NewSel6) ActionEndEx() bool { +func (e *NewSel6) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_74.go b/logic/service/fight/boss/NewSeIdx_74.go index e6a48e58..64b8b798 100644 --- a/logic/service/fight/boss/NewSeIdx_74.go +++ b/logic/service/fight/boss/NewSeIdx_74.go @@ -10,7 +10,7 @@ type NewSel74 struct { NewSel0 } -func (e *NewSel74) ActionEndEx() bool { +func (e *NewSel74) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_78.go b/logic/service/fight/boss/NewSeIdx_78.go index c322ab2a..e5a6cc16 100644 --- a/logic/service/fight/boss/NewSeIdx_78.go +++ b/logic/service/fight/boss/NewSeIdx_78.go @@ -10,7 +10,7 @@ type NewSel78 struct { NewSel0 } -func (e *NewSel78) ActionEndEx() bool { +func (e *NewSel78) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/boss/NewSeIdx_9.go b/logic/service/fight/boss/NewSeIdx_9.go index b008ca55..a56abb01 100644 --- a/logic/service/fight/boss/NewSeIdx_9.go +++ b/logic/service/fight/boss/NewSeIdx_9.go @@ -10,7 +10,7 @@ type NewSel9 struct { NewSel0 } -func (e *NewSel9) ActionEndEx() bool { +func (e *NewSel9) Action_end_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/logic/service/fight/effect/561.go b/logic/service/fight/effect/561.go index 4500f435..e310dc1e 100644 --- a/logic/service/fight/effect/561.go +++ b/logic/service/fight/effect/561.go @@ -11,7 +11,7 @@ type Effect561 struct { can bool } -func (e *Effect561) ActionEndEx() bool { +func (e *Effect561) Action_end_ex() bool { if e.Input.FightC.IsFirst(e.Input.Player) { if e.Ctx().Our.CurrentPet.GetHP().IntPart() == 0 { e.Ctx().Our.CurrentPet.Info.Hp = e.Ctx().Our.CurrentPet.Info.MaxHp diff --git a/logic/service/fight/effect/effect_164.go b/logic/service/fight/effect/effect_164.go index 0ef5a758..b629457d 100644 --- a/logic/service/fight/effect/effect_164.go +++ b/logic/service/fight/effect/effect_164.go @@ -15,7 +15,7 @@ func (e *Effect164) SetArgs(t *input.Input, a ...int) { e.EffectNode.Duration(e.EffectNode.SideEffectArgs[0]) } -func (e *Effect164) ActionEndEx() bool { +func (e *Effect164) Action_end_ex() bool { //魂印特性有不在场的情况,绑定时候将精灵和特性绑定 if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true diff --git a/logic/service/fight/effect/effect_73.go b/logic/service/fight/effect/effect_73.go index 8066e847..53291c91 100644 --- a/logic/service/fight/effect/effect_73.go +++ b/logic/service/fight/effect/effect_73.go @@ -32,7 +32,7 @@ func (e *Effect73) SetArgs(t *input.Input, a ...int) { e.EffectNode.Duration(e.EffectNode.SideEffectArgs[0] - 1) } -func (e *Effect73) ActionEndEx() bool { +func (e *Effect73) Action_end_ex() bool { if !e.Input.FightC.IsFirst(e.Ctx().Our.Player) { return true diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index de1e6e30..6eb8f210 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -248,26 +248,26 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction) } } - if defender.CurrentPet.Info.Hp > 0 { - //技能使用后 - defender.Exec(func(effect input.Effect) bool { - effect.Ctx().SkillEntity = currentSkill - effect.Skill_Use_ex() - return true - }) - } + // if defender.CurrentPet.Info.Hp > 0 { + // //技能使用后 + // defender.Exec(func(effect input.Effect) bool { + // effect.Ctx().SkillEntity = currentSkill + // effect.Skill_Use_ex() + // return true + // }) + // } - //技能使用后 - attacker.Exec(func(effect input.Effect) bool { //技能使用后的我方效果 - effect.Ctx().SkillEntity = currentSkill - effect.SkillUseed() - return true - }) - defender.Exec(func(effect input.Effect) bool { - effect.Ctx().SkillEntity = currentSkill - effect.ActionEndEx() - return true - }) + // //技能使用后 + // attacker.Exec(func(effect input.Effect) bool { //技能使用后的我方效果 + // effect.Ctx().SkillEntity = currentSkill + // effect.SkillUseed() + // return true + // }) + // defender.Exec(func(effect input.Effect) bool { + // effect.Ctx().SkillEntity = currentSkill + // effect.Action_end_ex() + // return true + // }) if defender.CurrentPet.Info.Hp <= 0 && attacker.CurrentPet.Info.Hp <= 0 { //先手方死亡,触发反同归于尽 attacker.CurrentPet.Info.Hp = 1 diff --git a/logic/service/fight/input/interface.go b/logic/service/fight/input/interface.go index c12cc94a..597f0372 100644 --- a/logic/service/fight/input/interface.go +++ b/logic/service/fight/input/interface.go @@ -34,9 +34,9 @@ type Effect interface { DamageLockEx(*info.DamageZone) bool //被动方锁定伤害 Damage_Shield(*info.DamageZone) bool // 护盾值变化时触发 //Damage_Use() bool // 伤害作用 - Skill_Use_ex() bool //技能PP减少节点 - SkillUseed() bool //技能PP减少节点 - ActionEndEx() bool + //Skill_Use_ex() bool //技能PP减少节点 + //Action_end() bool //技能PP减少节点 + //Action_end_ex() bool Action_end() bool Action_end_ex() bool //OnDefeat(opp *Input) bool // 精灵被击败时触发 diff --git a/logic/service/fight/node/fight.go b/logic/service/fight/node/fight.go index 1d52daab..d00a79d2 100644 --- a/logic/service/fight/node/fight.go +++ b/logic/service/fight/node/fight.go @@ -18,7 +18,7 @@ func (e *EffectNode) OnBattleEnd() bool { func (e *EffectNode) EFFect_Befer(in *input.Input, effEffect input.Effect) bool { return true } -func (e *EffectNode) ActionEndEx() bool { +func (e *EffectNode) Action_end_ex() bool { // panic("not implemented") // TODO: Implement return true } diff --git a/logic/service/fight/node/skill.go b/logic/service/fight/node/skill.go index 1ef026c8..f4c705b6 100644 --- a/logic/service/fight/node/skill.go +++ b/logic/service/fight/node/skill.go @@ -19,10 +19,7 @@ func (e *EffectNode) SkillHit() bool { func (e *EffectNode) SkillHit_ex() bool { return true } -func (e *EffectNode) Action_end_ex() bool { - return true -} - + func (e *EffectNode) CalculatePre() bool { return true } @@ -43,22 +40,23 @@ func (e *EffectNode) Skill_Can() bool { return e.Input.CurrentPet.HP != 0 } -func (e *EffectNode) Skill_Use_ex() bool { - return true -} -func (e *EffectNode) SkillUseed() bool { - // if e.Effect != nil { - // if e.Input.CurrentPet.Info.Hp == 0 { - // e.OnDefeat(ctx.Input, ctx.SkillEntity) //死亡 +// func (e *EffectNode) Skill_Use_ex() bool { +// return true +// } - // } else { - // e.OnAlive(ctx.Input, ctx.SkillEntity) //存活 - // } +// func (e *EffectNode) SkillUseed() bool { +// // if e.Effect != nil { +// // if e.Input.CurrentPet.Info.Hp == 0 { +// // e.OnDefeat(ctx.Input, ctx.SkillEntity) //死亡 - // } - // return true - return true -} +// // } else { +// // e.OnAlive(ctx.Input, ctx.SkillEntity) //存活 +// // } + +// // } +// // return true +// return true +// } type Effect interface { OnMiss(opp *input.Input, skill *info.SkillEntity)