From fe69c0bfbe5d76360fe7c481897fb2de27cd740a Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 17 Aug 2022 17:15:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=BC=82=E5=B8=B8=E4=BF=9D=E6=8A=A4?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_upgrade.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 5ad01df3a..b3beab476 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -122,6 +122,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade this.module.Errorf("Upgrade code:%d", code) return } + if conf.Pos >= 6 { + code = pb.ErrorCode_ConfigurationException + this.module.Errorf("Upgrade equipment Pos:%d", conf.Pos) + return + } hero.EquipID[conf.Pos] = equipment.Id //拆分后的装备是一个新的 for i, v := range hero.EquipID { if v != "" { From 5dc57b66c87250a65fd0b89f40647c96f82c7ebc Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 17 Aug 2022 17:20:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E7=A9=BF=E6=88=B4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_equip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 953b995b2..2c46db421 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -95,7 +95,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) subsit := true for i, v := range equipments { //校验装备位置 if v != nil { - if i+1 != int(confs[i].Pos) { + if i != int(confs[i].Pos) { log.Errorf("Equip conf:%+v Target:%d Incorrect range!", confs[i], i) code = pb.ErrorCode_SystemError return From 416341cbd621df8ab65d35f0606f1425aa82984a Mon Sep 17 00:00:00 2001 From: liwei Date: Thu, 18 Aug 2022 11:29:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=AF=B9=E8=B1=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/comp_gateroute.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index 466266e84..54cc89389 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -186,7 +186,7 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag //RPC_NoticeUserClose 接收用户登录通知 func (this *SCompGateRoute) NoticeUserLogin(ctx context.Context, args *pb.NoticeUserLoginReq, reply *pb.RPCMessageReply) error { model := db.NewDBModel(comm.TableSession, db.Local()) - model.Change(args.UserId, map[string]interface{}{ + model.AddList("online", args.UserId, map[string]interface{}{ "uid": args.UserId, "sessionId": args.UserSessionId, "serviceTag": args.ServiceTag, From e3d177e47616f7a77a005dbccc0573fef32f958a Mon Sep 17 00:00:00 2001 From: liwei Date: Thu, 18 Aug 2022 11:34:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=BC=82=E5=B8=B8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/module.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/user/module.go b/modules/user/module.go index 66ded5750..7fbe5cfa7 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -60,11 +60,7 @@ func (this *User) GetUser(uid string) *pb.DBUser { //获取用户会话 func (this *User) GetUserSession(uid string) *pb.CacheUser { - cuser := this.modelSession.getUserSession(uid) - if cuser.Uid == "" { - return nil - } - return cuser + return this.modelSession.getUserSession(uid) } // 清除session