From 051a3a62caa7b17471602f4481875e00c71f19dd Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 12 Mar 2024 15:54:38 +0800
Subject: [PATCH] 1

---
 server/matchserver/player/player.go | 13 ++++++++++++-
 server/matchserver/team/team.go     |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/server/matchserver/player/player.go b/server/matchserver/player/player.go
index 64a44680..a448c8e8 100644
--- a/server/matchserver/player/player.go
+++ b/server/matchserver/player/player.go
@@ -8,6 +8,12 @@ import (
 	. "main/global"
 )
 
+type hero struct {
+	heroUniId string
+	heroId int32
+	quality int32
+}
+
 type player struct {
 	cs.MsgHandlerImpl
 	socket f5.WspCliConn
@@ -25,6 +31,7 @@ type player struct {
 	state int32
 	isReady int32
 	permission int32
+	hero *hero
 	team common.Team
 }
 
@@ -139,7 +146,11 @@ func (this *player) FillMFTeamMember(member_pb *cs.MFTeamMember) {
 	member_pb.Name = proto.String(this.name)
 	member_pb.IsLeader = proto.Int32(this.isLeader)
 	member_pb.SpecSkill = proto.Int32(this.specSkill)
-	//hero
+	{
+		member_pb.Hero = &cs.MFHero{}
+		member_pb.Hero.HeroId = proto.Int32(this.hero.heroId)
+		member_pb.Hero.Quality = proto.Int32(this.hero.quality)
+	}
 	member_pb.State = proto.Int32(this.state)
 	if this.IsOnline() {
 		member_pb.Online = proto.Int32(1)
diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go
index d3ce6b00..c1284eac 100644
--- a/server/matchserver/team/team.go
+++ b/server/matchserver/team/team.go
@@ -71,6 +71,7 @@ func (this *team) OnPlayerOnline(hum common.Player) {
 }
 
 func (this *team) Join(hum common.Player) bool {
+	hum.SetTeam(this)
 	this.accountIdHash[hum.GetAccountId()] = hum
 	return true
 }