From be61be703958b18c314b1aa0f3eacd4b986aabbf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 25 Sep 2023 19:29:54 +0800
Subject: [PATCH] 1

---
 server/hallserver/common/types.go      | 2 +-
 server/hallserver/player/player.go     | 8 +++++---
 server/hallserver/player/playermgr.go  | 3 ++-
 server/hallserver/proto/cs_proto.proto | 4 ++--
 server/hallserver/room/member.go       | 2 ++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/server/hallserver/common/types.go b/server/hallserver/common/types.go
index 8211a7e7..b8f27459 100644
--- a/server/hallserver/common/types.go
+++ b/server/hallserver/common/types.go
@@ -28,7 +28,7 @@ type Player interface {
 	GetName() string
 	GetAvatarUrl() string
 	GetHeroId() string
-	GetHeadFrame() int32
+	GetHeadFrame() string
 	GetPing() int32
 	SendMsg(proto.Message)
 	IsOnline() bool
diff --git a/server/hallserver/player/player.go b/server/hallserver/player/player.go
index 66e8e444..fa31e85d 100644
--- a/server/hallserver/player/player.go
+++ b/server/hallserver/player/player.go
@@ -19,7 +19,7 @@ type player struct {
 	name string
 	avatarUrl string
 	heroId string
-	headFrame int32
+	headFrame string
 	ping int32
 }
 
@@ -37,7 +37,8 @@ func (this *player) SetRoom(room common.Room) {
 	this.room = room
 }
 
-func (this *player) init(req *pendingLoginRequest, name string, avatarUrl string, heroId string){
+func (this *player) init(req *pendingLoginRequest, name string, avatarUrl string, heroId string,
+	headFrame string){
 	this.socket = req.hdr.GetSocket()
 	this.accountId = req.msg.GetAccountId()
 	this.sessionId = req.msg.GetSessionId()
@@ -46,6 +47,7 @@ func (this *player) init(req *pendingLoginRequest, name string, avatarUrl string
 	this.name = name
 	this.avatarUrl = avatarUrl
 	this.heroId = heroId
+	this.headFrame = headFrame
 	this.internalSetPing(req.msg.GetPing())
 }
 
@@ -87,7 +89,7 @@ func (this *player) GetHeroId() string {
 	return this.heroId
 }
 
-func (this *player) GetHeadFrame() int32 {
+func (this *player) GetHeadFrame() string {
 	return this.headFrame
 }
 
diff --git a/server/hallserver/player/playermgr.go b/server/hallserver/player/playermgr.go
index b13f908e..03b3f52e 100644
--- a/server/hallserver/player/playermgr.go
+++ b/server/hallserver/player/playermgr.go
@@ -151,6 +151,7 @@ func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCli
 			Name        string `json:"name"`
 			HeadId      string `json:"head_id"`
 			HeroId      string `json:"hero_id"`
+			HeadFrame      string `json:"head_frame"`
 		} `json:"info"`
 	}{}
 	{
@@ -172,7 +173,7 @@ func (this *playerMgr) apiAuthCb(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.HttpCli
 	}
 
 	hum := new(player)
-	hum.init(pendingReq, rspObj.Info.Name, rspObj.Info.HeadId, rspObj.Info.HeroId)
+	hum.init(pendingReq, rspObj.Info.Name, rspObj.Info.HeadId, rspObj.Info.HeroId, rspObj.Info.HeadFrame)
 	this.accountIdHash[hum.GetAccountId()] = hum
 	this.socketHash[pendingReq.hdr.GetSocket()] = hum
 
diff --git a/server/hallserver/proto/cs_proto.proto b/server/hallserver/proto/cs_proto.proto
index 00a25c5b..fe40d268 100644
--- a/server/hallserver/proto/cs_proto.proto
+++ b/server/hallserver/proto/cs_proto.proto
@@ -112,8 +112,8 @@ message MFMember
     optional string account_id = 1; //账号id
     optional string name = 2; //
     optional string avatar_url = 3; //头像
-    optional int32 hero_id = 4; //英雄id
-    optional int32 head_frame = 5; //头像框
+    optional string hero_id = 4; //英雄id
+    optional string head_frame = 5; //头像框
     optional int32 state = 9; //0:准备 1:已准备
     optional int32 ping = 20; //ping值(单位毫秒)
 }
diff --git a/server/hallserver/room/member.go b/server/hallserver/room/member.go
index 9e04392e..10dc3423 100644
--- a/server/hallserver/room/member.go
+++ b/server/hallserver/room/member.go
@@ -39,6 +39,8 @@ func (this *member) fillMFMember(pb *cs.MFMember) {
 	pb.AccountId = proto.String(this.hum.GetAccountId())
 	pb.Name = proto.String(this.hum.GetName())
 	pb.AvatarUrl = proto.String(this.hum.GetAvatarUrl())
+	pb.HeroId = proto.String(this.hum.GetHeroId())
+	pb.HeadFrame = proto.String(this.hum.GetHeadFrame())
 	pb.State = proto.Int32(this.state)
 	pb.Ping = proto.Int32(this.hum.GetPing())
 }