From aee3fbb10cda6b28a3c70fb0e89e91cd9012b5f2 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Thu, 12 Dec 2024 14:19:27 +0800 Subject: [PATCH] =?UTF-8?q?modify:=E6=B8=B8=E6=88=8F=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=B4=A6=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbproxy/svc/u_player.go | 4 ++-- gamesrv/base/gamedetail.go | 1 + gamesrv/tienlen/scenepolicy_tienlen.go | 7 +++++++ model/gamelogtype.go | 1 + model/gameplayerlistlog.go | 1 + model/player.go | 4 +++- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dbproxy/svc/u_player.go b/dbproxy/svc/u_player.go index 21efae5..6c364c5 100644 --- a/dbproxy/svc/u_player.go +++ b/dbproxy/svc/u_player.go @@ -118,7 +118,7 @@ func (svc *PlayerDataSvc) InsertPlayerData(args *model.InsertPlayerDataParam, re } var dataParams model.PlayerParams json.Unmarshal([]byte(a.Params), &dataParams) - pd = model.NewPlayerData(acc, name, args.HeadUrl, id, a.Channel, a.Platform, a.Params, + pd = model.NewPlayerData(acc, a.UserName, name, args.HeadUrl, id, a.Channel, a.Platform, a.Params, a.Tel, a.PackegeTag, dataParams.Ip, a.TagKey, a.AccountType, a.DeviceOs, a.ChannelId, a.ClientVer) if pd != nil { if pd.ICode == "" { @@ -203,7 +203,7 @@ func (svc *PlayerDataSvc) GetPlayerDataBySnId(args *model.GetPlayerDataBySnIdArg if name == "" { name = "Guest" } - pd := model.NewPlayerData(a.AccountId.Hex(), name, "", a.SnId, a.Channel, a.Platform, a.Params, + pd := model.NewPlayerData(a.AccountId.Hex(), a.UserName, name, "", a.SnId, a.Channel, a.Platform, a.Params, a.Tel, a.PackegeTag, dataParams.Ip, a.TagKey, a.AccountType, a.DeviceOs, a.ChannelId, a.ClientVer) if pd != nil { if pd.ICode == "" { diff --git a/gamesrv/base/gamedetail.go b/gamesrv/base/gamedetail.go index 9b43209..b86fbff 100644 --- a/gamesrv/base/gamedetail.go +++ b/gamesrv/base/gamedetail.go @@ -182,6 +182,7 @@ func (this *Scene) SaveGamePlayerListLog(param *SaveGamePlayerListLogParam) *Sav WinSmallGame: param.WinSmallGame, WinTotal: param.WinTotal, CycleId: this.CycleID, + Username: p.Username, } if param.OnlyLog { ret.Log = append(ret.Log, log) diff --git a/gamesrv/tienlen/scenepolicy_tienlen.go b/gamesrv/tienlen/scenepolicy_tienlen.go index ca1c504..2b75678 100644 --- a/gamesrv/tienlen/scenepolicy_tienlen.go +++ b/gamesrv/tienlen/scenepolicy_tienlen.go @@ -1782,6 +1782,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { playerEx.CurIsWin = int64(0) tienlenPerson := model.TienLenPerson{ UserId: playerEx.SnId, + Username: playerEx.Username, UserIcon: playerEx.Head, Platform: playerEx.Platform, Channel: playerEx.Channel, @@ -1934,6 +1935,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { losePlayer.CurIsWin = int64(isWin) tienlenPerson := model.TienLenPerson{ UserId: losePlayer.SnId, + Username: losePlayer.Username, UserIcon: losePlayer.Head, Platform: losePlayer.Platform, Channel: losePlayer.Channel, @@ -2077,6 +2079,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { lastWinPlayer.CurIsWin = int64(isWin) tienlenPerson := model.TienLenPerson{ UserId: lastWinPlayer.SnId, + Username: lastWinPlayer.Username, UserIcon: lastWinPlayer.Head, Platform: lastWinPlayer.Platform, Channel: lastWinPlayer.Channel, @@ -2189,6 +2192,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { playerEx.CurIsWin = int64(isWin) tienlenPerson := model.TienLenPerson{ UserId: playerEx.SnId, + Username: playerEx.Username, UserIcon: playerEx.Head, Platform: playerEx.Platform, Channel: playerEx.Channel, @@ -2295,6 +2299,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { playerEx.CurIsWin = int64(isWin) tienlenPerson := model.TienLenPerson{ UserId: playerEx.SnId, + Username: playerEx.Username, UserIcon: playerEx.Head, Platform: playerEx.Platform, Channel: playerEx.Channel, @@ -2447,6 +2452,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { playerEx.CurIsWin = int64(isWin) tienlenPerson := model.TienLenPerson{ UserId: playerEx.SnId, + Username: playerEx.Username, UserIcon: playerEx.Head, Platform: playerEx.Platform, Channel: playerEx.Channel, @@ -2578,6 +2584,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) { playerEx.CurIsWin = int64(isWin) tienlenPerson := model.TienLenPerson{ UserId: playerEx.SnId, + Username: playerEx.Username, UserIcon: playerEx.Head, Platform: playerEx.Platform, Channel: playerEx.Channel, diff --git a/model/gamelogtype.go b/model/gamelogtype.go index d9f4185..6eda1da 100644 --- a/model/gamelogtype.go +++ b/model/gamelogtype.go @@ -1533,6 +1533,7 @@ type TienLenAddItem struct { type TienLenPerson struct { UserId int32 //玩家ID + Username string // 用户名 UserIcon int32 //玩家头像 Platform string `json:"-"` Channel string `json:"-"` diff --git a/model/gameplayerlistlog.go b/model/gameplayerlistlog.go index 9d06b23..6142892 100644 --- a/model/gameplayerlistlog.go +++ b/model/gameplayerlistlog.go @@ -56,6 +56,7 @@ type GamePlayerListLog struct { WinSmallGame int64 //拉霸专用 小游戏奖励 WinTotal int64 //拉霸专用 输赢 CycleId string // 本轮id，打一轮有多局 + Username string } func NewGamePlayerListLog() *GamePlayerListLog { diff --git a/model/player.go b/model/player.go index 9175873..5aabce1 100644 --- a/model/player.go +++ b/model/player.go @@ -365,6 +365,7 @@ type WGPlayerInfo struct { type PlayerData struct { Id bson.ObjectId `bson:"_id"` AccountId string //账号id + Username string // 用户名 AccountType int32 //账号类型 SnId int32 //数字唯一id NiceId int32 //靓号 @@ -923,7 +924,7 @@ func (this *PlayerData) UpdateParams(params string) *PlayerParams { return &pp } -func NewPlayerData(acc string, name, headUrl string, id int32, channel, platform string, params, tel string, +func NewPlayerData(acc string, username, name, headUrl string, id int32, channel, platform string, params, tel string, packTag, ip string, tagkey, accountType int32, deviceOS, channelId string, clientVer int32) *PlayerData { if len(name) == 0 { logger.Logger.Trace("New player name is empty.") @@ -939,6 +940,7 @@ func NewPlayerData(acc string, name, headUrl string, id int32, channel, platform pd := &PlayerData{ Id: bson.NewObjectId(), AccountId: acc, + Username: username, Name: name, Channel: channel, ChannelId: channelId,