diff --git a/logic/service/fight/boss/NewSeIdx_66.go b/logic/service/fight/boss/NewSeIdx_66.go index d69541641..5abdb4b5d 100644 --- a/logic/service/fight/boss/NewSeIdx_66.go +++ b/logic/service/fight/boss/NewSeIdx_66.go @@ -15,6 +15,9 @@ func (e *NewSel66) Skill_Use() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } + if e.Ctx().SkillEntity == nil { + return true + } if e.Ctx().SkillEntity.Category() != info.Category.PHYSICAL { return true } diff --git a/logic/service/fight/boss/NewSeIdx_67.go b/logic/service/fight/boss/NewSeIdx_67.go index 634cb49e3..579f7a40a 100644 --- a/logic/service/fight/boss/NewSeIdx_67.go +++ b/logic/service/fight/boss/NewSeIdx_67.go @@ -15,6 +15,9 @@ func (e *NewSel67) Skill_Use() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } + if e.Ctx().SkillEntity == nil { + return true + } if e.Ctx().SkillEntity.Category() != info.Category.SPECIAL { return true } diff --git a/logic/service/fight/effect/407.go b/logic/service/fight/effect/407.go index 1487a6480..ab6a828ec 100644 --- a/logic/service/fight/effect/407.go +++ b/logic/service/fight/effect/407.go @@ -37,6 +37,6 @@ func (e *Effect407_sub) ActionStart(fattack *action.SelectSkillAction, sattack * } func init() { - input.InitEffect(input.EffectType.Skill, 138, &Effect407{}) + input.InitEffect(input.EffectType.Skill, 407, &Effect407{}) } diff --git a/logic/service/fight/effect/440.go b/logic/service/fight/effect/440.go index 70c17d8e4..c275cc383 100644 --- a/logic/service/fight/effect/440.go +++ b/logic/service/fight/effect/440.go @@ -30,6 +30,6 @@ func (e *Effect440_sub) HookPP(count *int) bool { } func init() { - input.InitEffect(input.EffectType.Skill, 138, &Effect407{}) + input.InitEffect(input.EffectType.Skill, 440, &Effect440{}) } diff --git a/logic/service/fight/effect/523.go b/logic/service/fight/effect/523.go index 150620a79..e8dab8373 100644 --- a/logic/service/fight/effect/523.go +++ b/logic/service/fight/effect/523.go @@ -15,7 +15,7 @@ func (e *Effect523) Action_end() bool { if e.Ctx().Opp.CurrentPet.Info.Hp > 0 { // 提升自身的全部能力等级 for i := 0; i < 6; i++ { - e.Ctx().Opp.SetProp(e.Ctx().Our, int8(i), int8(e.SideEffectArgs[i])) + e.Ctx().Our.SetProp(e.Ctx().Our, int8(i), int8(e.SideEffectArgs[i])) } diff --git a/logic/service/fight/effect/effect_517.go b/logic/service/fight/effect/effect_517.go index ff81c78b9..75e51caeb 100644 --- a/logic/service/fight/effect/effect_517.go +++ b/logic/service/fight/effect/effect_517.go @@ -35,5 +35,5 @@ func (e *Effect517) OnSkill() bool { } func init() { - input.InitEffect(input.EffectType.Skill, 452, &Effect517{}) + input.InitEffect(input.EffectType.Skill, 517, &Effect517{}) } diff --git a/modules/player/controller/admin/pvp.go b/modules/player/controller/admin/pvp.go new file mode 100644 index 000000000..303c54934 --- /dev/null +++ b/modules/player/controller/admin/pvp.go @@ -0,0 +1,43 @@ +package admin + +import ( + "blazing/cool" + "blazing/modules/player/service" + "context" + + "github.com/gogf/gf/v2/frame/g" +) + +type PVPController struct { + *cool.Controller +} + +func init() { + var task_info_controller = &PVPController{ + &cool.Controller{ + Prefix: "/admin/game/pvp", + Api: []string{"Delete", "Update", "Info", "List", "Page"}, + Service: service.NewPVPService(0), //因为page已经过滤,所以这里需要改成0 + }, + } + // 注册路由 + cool.RegisterController(task_info_controller) +} + +type GetPVPReq struct { + g.Meta `path:"/get" method:"POST"` +} + +func (c *PVPController) Get(ctx context.Context, req *GetPVPReq) (res *cool.BaseRes, err error) { + res = &cool.BaseRes{} + //var ret []TitleRes + var ( + admin = cool.GetAdmin(ctx) + //r = g.RequestFromCtx(ctx) + ) + alltitile := service.NewPVPService(uint32(admin.UserId)).Get(uint32(admin.UserId)) + + res.Data = alltitile + return + +}