diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go index b2ece9c2e..1d5b355c6 100644 --- a/logic/service/fight/loop.go +++ b/logic/service/fight/loop.go @@ -310,7 +310,7 @@ func (f *FightC) resolveRound(p1Action, p2Action action.BattleActionI) { } // handleActiveSwitchAction 处理主动切换精灵动作 -func (f *FightC) handleActiveSwitchAction(switchAction *action.ActiveSwitchAction, otherAction action.BattleActionI) { +func (f *FightC) handleActiveSwitchAction(_ *action.ActiveSwitchAction, otherAction action.BattleActionI) { if skillAction, ok := otherAction.(*action.SelectSkillAction); ok { if skillAction.SkillEntity != nil && skillAction.CD != nil { diff --git a/modules/base/controller/admin/base_sys_user.go b/modules/base/controller/admin/base_sys_user.go index fdb95897e..79e13f20b 100644 --- a/modules/base/controller/admin/base_sys_user.go +++ b/modules/base/controller/admin/base_sys_user.go @@ -61,16 +61,16 @@ func (c *BaseSysUserController) GetSession(ctx context.Context, req *SessionReq) } res = &SessionRes{} - + t1 := service.NewBaseSysUserService().GetPerson(uint32(t.UserId)) res.UserID = int(t1.ID) - playerinfo := blazing.NewUserService(uint32(t1.ID)) - if playerinfo.Info.IsReg() { + playerinfo := blazing.NewUserService(uint32(t1.ID)).Info.Person(uint32(t1.ID)) + if playerinfo != nil { res.IsReg = 1 if t1.DepartmentID == 35 { ///抢先服玩家,3天没登录衰退 - r := playerinfo.Info.Person(uint32(t1.ID)) - if r.UpdateTime.AddDate(0, 0, 3).Before(gtime.Now()) { + + if playerinfo.UpdateTime.AddDate(0, 0, 3).Before(gtime.Now()) { t1.DepartmentID = 1 service.NewBaseSysUserService().SetdepartmentId(uint32(t1.ID), 1) } diff --git a/modules/player/service/info.go b/modules/player/service/info.go index a2f141cc8..9b73d54e9 100644 --- a/modules/player/service/info.go +++ b/modules/player/service/info.go @@ -20,15 +20,6 @@ import ( csmap "github.com/mhmtszr/concurrent-swiss-map" ) -func (s *InfoService) IsReg() bool { - - m := s.dbm_fix(s.Model) - - record, _ := m.Exist() - - return record -} - // 是否注册,如果注册过,那么就会产生用户player信息 // 实现注册,id+昵称+颜色