diff --git a/server/matchserver/player/playermgr.go b/server/matchserver/player/playermgr.go index 7c3db6f9..c5ab58a9 100644 --- a/server/matchserver/player/playermgr.go +++ b/server/matchserver/player/playermgr.go @@ -95,7 +95,7 @@ func (this *playerMgr) CMLogin(hdr *f5.MsgHdr, msg *cs.CMLogin) { hdr: hdr, msg: msg, addTick: q5.GetTickCount(), - reqId: *reqId, + reqId: reqId, } } else { if pendingReq.msg.GetAccountId() == msg.GetAccountId() && @@ -106,7 +106,7 @@ func (this *playerMgr) CMLogin(hdr *f5.MsgHdr, msg *cs.CMLogin) { } else { pendingReq.hdr = hdr pendingReq.msg = msg - pendingReq.reqId = *reqId + pendingReq.reqId = reqId } } params := map[string]string{ @@ -125,9 +125,9 @@ func (this *playerMgr) CMLogin(hdr *f5.MsgHdr, msg *cs.CMLogin) { }) } -func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCliResponse, reqId *int64) { +func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCliResponse, reqId int64) { pendingReq := this.getPendingRequest(msg.GetAccountId()) - if pendingReq == nil || pendingReq.reqId != *reqId { + if pendingReq == nil || pendingReq.reqId != reqId { return } defer delete(this.pendingLoginHash, msg.GetAccountId()) @@ -287,10 +287,10 @@ func (this *playerMgr) getPendingRequest(accountId string) *pendingLoginRequest return nil } -func (this *playerMgr) genSeqId() *int64 { +func (this *playerMgr) genSeqId() int64 { this.currReqId++ reqId := this.currReqId - return &reqId + return reqId } func (this *playerMgr) SS_WSP_SocketDisconnect(hdr *f5.MsgHdr, msg *ss.SS_WSP_SocketDisconnect) {