fix(socket): 玩家断开连接时增加保存锁，避免重复保存
在玩家断开连接时，使用 sync.Once 确保只保存一次玩家数据， 防止因并发或多次触发导致的数据异常。 feat(fight): 增加战斗资格判断与邀请取消功能 - 新增 Player.CanFight() 方法用于统一判断是否可以参与战斗 - 在多个战斗相关接口中加入 CanFight 检查 - 添加“取消战斗邀请”指令及处理逻辑（cmd: 2402） - 修复部分错误码不准确的问题，提升提示一致性 refactor(login): 优化登录流程并增强健壮性 - 提前校验 session 合法性 - 增强获取玩家信息后的空指针检查 - 调整挖矿数据重置方式为 defer 执行 - 优化日志输出内容，便于调试追踪 docs(model): 更新部门、菜单等模型字段命名规范 将 orderNum 字段改为 ordernum，保持数据库列名风格一致， 同时更新了 base_sys_role 中 userId 为 userid。 perf(rate-limit): 提高登录接口的限流 Burst 容量 调整限流器配置，将请求 burst 容量从 2 提升至 5， 以应对短时间高频访问场景，改善用户体验。 chore(build): 忽略新增编译产物和临时文件 在 .gitignore 中添加 logic/logic2、login/login 等新生成文件路径， 避免误提交二进制文件到版本控制。
This commit is contained in:
@@ -14,8 +14,8 @@ import (
|
||||
|
||||
// 挑战地图boss
|
||||
func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
if c.FightC != nil {
|
||||
return nil, errorcode.ErrorCodes.ErrOnlineOver6HoursCannotFight
|
||||
if !c.CanFight() {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
||||
}
|
||||
|
||||
var petid int
|
||||
@@ -49,6 +49,9 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *pla
|
||||
if !ok {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
||||
}
|
||||
if len(mdata.Bosses) == 0 {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
||||
}
|
||||
for _, bc := range mdata.Bosses {
|
||||
if bc.Id == nil {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
||||
@@ -85,7 +88,9 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *pla
|
||||
|
||||
// 战斗野怪
|
||||
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
|
||||
if !c.CanFight() {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
||||
}
|
||||
refpet := c.OgreInfo.Data[data.Number]
|
||||
if refpet.Id == 0 {
|
||||
|
||||
@@ -120,7 +125,9 @@ func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *playe
|
||||
|
||||
// 接收战斗或者取消战斗的包
|
||||
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
|
||||
if !c.CanFight() {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
||||
}
|
||||
if ok, p1 := c.AgreeBattle(data.UserID, data.Flag, data.Mode); ok {
|
||||
fight.NewFight(data.Mode, info.BattleStatus.FIGHT_WITH_PLAYER, c, p1) ///开始对战,房主方以及被邀请方
|
||||
}
|
||||
@@ -129,14 +136,28 @@ func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInbou
|
||||
|
||||
// 邀请其他人进行战斗
|
||||
func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
if !c.CanFight() {
|
||||
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
||||
}
|
||||
|
||||
c.InvitePlayerToBattle(&info.PVPinfo{PlayerID: data.UserID, Mode: data.Mode})
|
||||
|
||||
return nil, 0
|
||||
}
|
||||
|
||||
// 取消和他人战斗
|
||||
func (h Controller) OnPlayerCanceledOtherInviteFight(data *fight.InviteFightCancelInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
c.CancelBattle()
|
||||
|
||||
return nil, 0
|
||||
}
|
||||
|
||||
// 使用技能包
|
||||
func (h Controller) UseSkill(data *fight.UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
c.FightC.UseSkill(c, int32(data.SkillId))
|
||||
if c.FightC != nil {
|
||||
c.FightC.UseSkill(c, int32(data.SkillId))
|
||||
}
|
||||
|
||||
return nil, 0
|
||||
}
|
||||
|
||||
|
||||
@@ -35,77 +35,80 @@ func IsToday(t time.Time) bool {
|
||||
|
||||
// 处理命令: 1001
|
||||
func (h *Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.LoginMSInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
|
||||
|
||||
if tt := data.CheakSession(); tt { //说明sid正确
|
||||
cool.Loger.Info(context.TODO(), "准备踢人")
|
||||
err := h.RPCClient.Kick(data.Head.UserID) //先踢人
|
||||
if err != nil {
|
||||
fmt.Println("踢人失败", err)
|
||||
}
|
||||
//player.KickPlayer(data.Head.UserID)
|
||||
cool.Loger.Info(context.TODO(), "踢人请求完成，继续登录流程")
|
||||
|
||||
// <-time.After(time.Millisecond * 3000)
|
||||
share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器
|
||||
t := player.GetPlayer(c, data.Head.UserID)
|
||||
t.Service = blservice.NewUserService(data.Head.UserID)
|
||||
t.Info = t.Service.Person(data.Head.UserID)
|
||||
t.Info.UserID = data.Head.UserID
|
||||
t.Onlinetime = uint32(time.Now().Unix()) //保存时间戳
|
||||
t.Changemap = true
|
||||
cool.Loger.Info(context.Background(), "用户上次重置日期", t.Info.LastResetTime.String())
|
||||
if !IsToday(t.Info.LastResetTime) { //判断是否是今天
|
||||
t.Info.LastResetTime = gtime.Now().Time
|
||||
//每天login时候检查重置时间，然后把电池，任务，挖矿重置
|
||||
//挖矿需要单独存，因为防止多开挖矿
|
||||
t.Info.TimeToday = 0 //重置电池
|
||||
|
||||
for i := 400; i < 500; i++ { //每日任务区段
|
||||
|
||||
tttL, ok := xmlres.TaskMap[i]
|
||||
if ok {
|
||||
if tttL.Type == 1 { //日常任务
|
||||
t.Info.TaskList[i-1] = 0 //重置每日任务
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
for i := 0; i < 50; i++ { //每日任务区段
|
||||
t.Info.DailyResArr[i] = 0 //重置每日任务
|
||||
|
||||
}
|
||||
go t.Service.Talk(func(m map[uint32]uint32) bool { //挖矿
|
||||
m = map[uint32]uint32{}
|
||||
return true
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
t.CompleteLogin() //通知客户端登录成功
|
||||
|
||||
result = user.NewOutInfo() //设置登录消息
|
||||
|
||||
result.PlayerInfo = *t.Info
|
||||
|
||||
defer func() {
|
||||
tt := maps.NewOutInfo()
|
||||
copier.CopyWithOption(tt, t.Info, copier.Option{DeepCopy: true})
|
||||
//copier.Copy(t.Info, tt)
|
||||
t1 := player.NewTomeeHeader(2001, t.Info.UserID)
|
||||
|
||||
space.GetSpace(t.Info.MapID).User.IterCb(func(playerID uint32, player common.PlayerI) {
|
||||
player.SendPack(t1.Pack(tt))
|
||||
|
||||
})
|
||||
space.GetSpace(t.Info.MapID).User.Set(t.Info.UserID, t)
|
||||
}()
|
||||
|
||||
return result, 0
|
||||
|
||||
} else {
|
||||
tt := data.CheakSession()
|
||||
if !tt {
|
||||
err = errorcode.ErrorCodes.ErrLoginServerError
|
||||
return
|
||||
}
|
||||
|
||||
cool.Loger.Info(context.TODO(), "准备踢人")
|
||||
err1 := h.RPCClient.Kick(data.Head.UserID) //先踢人
|
||||
if err1 != nil {
|
||||
fmt.Println("踢人失败", err)
|
||||
}
|
||||
//player.KickPlayer(data.Head.UserID)
|
||||
cool.Loger.Info(context.TODO(), "踢人请求完成，继续登录流程")
|
||||
|
||||
// <-time.After(time.Millisecond * 3000)
|
||||
share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器
|
||||
t := player.GetPlayer(c, data.Head.UserID)
|
||||
t.Service = blservice.NewUserService(data.Head.UserID)
|
||||
t.Info = t.Service.Person(data.Head.UserID)
|
||||
if t.Info == nil {
|
||||
err = errorcode.ErrorCodes.ErrLoginServerError
|
||||
return
|
||||
}
|
||||
t.Info.UserID = data.Head.UserID
|
||||
t.Onlinetime = uint32(time.Now().Unix()) //保存时间戳
|
||||
t.Changemap = true
|
||||
cool.Loger.Info(context.Background(), "用户上次重置日期", t.Info.LastResetTime.String())
|
||||
if !IsToday(t.Info.LastResetTime) { //判断是否是今天
|
||||
t.Info.LastResetTime = gtime.Now().Time
|
||||
//每天login时候检查重置时间，然后把电池，任务，挖矿重置
|
||||
//挖矿需要单独存，因为防止多开挖矿
|
||||
t.Info.TimeToday = 0 //重置电池
|
||||
|
||||
for i := 400; i < 500; i++ { //每日任务区段
|
||||
|
||||
tttL, ok := xmlres.TaskMap[i]
|
||||
if ok {
|
||||
if tttL.Type == 1 { //日常任务
|
||||
t.Info.TaskList[i-1] = 0 //重置每日任务
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
for i := 0; i < 50; i++ { //每日任务区段
|
||||
t.Info.DailyResArr[i] = 0 //重置每日任务
|
||||
|
||||
}
|
||||
defer t.Service.Talk(func(m map[uint32]uint32) bool { //挖矿
|
||||
m = map[uint32]uint32{}
|
||||
return true
|
||||
})
|
||||
|
||||
}
|
||||
return
|
||||
|
||||
t.CompleteLogin() //通知客户端登录成功
|
||||
|
||||
result = user.NewOutInfo() //设置登录消息
|
||||
|
||||
result.PlayerInfo = *t.Info
|
||||
|
||||
defer func() {
|
||||
tt := maps.NewOutInfo()
|
||||
copier.CopyWithOption(tt, t.Info, copier.Option{DeepCopy: true})
|
||||
//copier.Copy(t.Info, tt)
|
||||
t1 := player.NewTomeeHeader(2001, t.Info.UserID)
|
||||
|
||||
space.GetSpace(t.Info.MapID).User.IterCb(func(playerID uint32, player common.PlayerI) {
|
||||
player.SendPack(t1.Pack(tt))
|
||||
|
||||
})
|
||||
space.GetSpace(t.Info.MapID).User.Set(t.Info.UserID, t)
|
||||
}()
|
||||
|
||||
return result, 0
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user