diff --git a/logic/service/fight/effect/effect_43.go b/logic/service/fight/effect/effect_43.go index 848d6ed11..bc97c01fe 100644 --- a/logic/service/fight/effect/effect_43.go +++ b/logic/service/fight/effect/effect_43.go @@ -4,8 +4,6 @@ import ( "blazing/logic/service/fight/action" "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - - "github.com/alpacahq/alpacadecimal" ) /** @@ -23,9 +21,8 @@ type Effect43 struct { func (e *Effect43) OnSkill() bool { - tt := alpacadecimal.NewFromInt(int64(e.Ctx().Our.CurrentPet.Info.MaxHp)).Div(alpacadecimal.NewFromInt(int64(e.SideEffectArgs[0]))) //fmt.Println("恢复自身最大体量的1/n", tt.IntPart()) - e.Ctx().Our.Heal(e.Ctx().Our, &action.SelectSkillAction{}, tt) + e.Ctx().Our.Heal(e.Ctx().Our, &action.SelectSkillAction{}, e.Ctx().Our.CurrentPet.GetMaxHP().Div(e.Args()[0])) return true } diff --git a/logic/service/fight/effect/effect_4_5.go b/logic/service/fight/effect/effect_4_5.go index 1f9ca6c9a..8939b3966 100644 --- a/logic/service/fight/effect/effect_4_5.go +++ b/logic/service/fight/effect/effect_4_5.go @@ -28,12 +28,12 @@ type Effect4 struct { // 技能触发时调用 // ----------------------------------------------------------- func (e *Effect4) Skill_Use() bool { - ok, _, _ := e.Input.Player.Roll(e.SideEffectArgs[0], 100) + ok, _, _ := e.Input.Player.Roll(e.SideEffectArgs[1], 100) if !ok { return true } - e.Ctx().Our.SetProp(e.Ctx().Our, int8(e.SideEffectArgs[1]), int8(e.SideEffectArgs[2])) + e.Ctx().Our.SetProp(e.Ctx().Our, int8(e.SideEffectArgs[0]), int8(e.SideEffectArgs[2])) return true } @@ -48,12 +48,12 @@ type Effect5 struct { func (e *Effect5) Skill_Use() bool { // 概率判定 - ok, _, _ := e.Input.Player.Roll(e.SideEffectArgs[0], 100) + ok, _, _ := e.Input.Player.Roll(e.SideEffectArgs[1], 100) if !ok { return true } - e.Ctx().Opp.SetProp(e.Ctx().Our, int8(e.SideEffectArgs[1]), int8(e.SideEffectArgs[2])) + e.Ctx().Opp.SetProp(e.Ctx().Our, int8(e.SideEffectArgs[0]), int8(e.SideEffectArgs[2])) return true } diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index 816a0d562..9a953dac5 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -330,12 +330,12 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction) }) f.Switch = make(map[uint32]*action.ActiveSwitchAction) if f.closefight && f.Info.Mode == info.BattleMode.PET_MELEE { - // f.Broadcast(func(fighter *input.Input) { - // if fighter.UserID != f.WinnerId { - // fighter.Player.SendPackCmd(2505, &attackValueResult) - // } + f.Broadcast(func(fighter *input.Input) { + if fighter.UserID != f.WinnerId { + fighter.Player.SendPackCmd(2505, &attackValueResult) + } - // }) + }) return } f.Broadcast(func(fighter *input.Input) {