From aef4ac3f355620f6f962cc502f9f29e0db6e67f2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 7 Apr 2024 21:11:21 +0800
Subject: [PATCH] 1

---
 server/imserver_new/common/types.go  |  1 +
 server/imserver_new/guild/guild.go   | 17 +++++++++++++++++
 server/imserver_new/player/player.go |  6 ++++++
 3 files changed, 24 insertions(+)

diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go
index 783e04c4..aa204711 100644
--- a/server/imserver_new/common/types.go
+++ b/server/imserver_new/common/types.go
@@ -70,6 +70,7 @@ type FriendMgr interface {
 type Guild interface {
 	GetGuildId() string
 	GetGuildName() string
+	FillMFGuild(*cs.MFGuild)
 }
 
 type GuildMember interface {
diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index dcf8bb89..36bb213c 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -3,6 +3,8 @@ package guild
 import (
 	"q5"
 	"f5"
+	"cs"
+	"github.com/golang/protobuf/proto"
 )
 
 type guild struct {
@@ -60,6 +62,21 @@ func (this *guild) isOwner(accountId string) bool {
 	return this.ownerId == accountId
 }
 
+func (this *guild) FillMFGuild(pbGuild *cs.MFGuild) {
+	pbGuild.AutoId = proto.Int64(0)
+	pbGuild.GuildId = proto.Int64(q5.ToInt64(this.guildId))
+	pbGuild.Name = proto.String(this.guildName)
+	pbGuild.LeaderId = proto.String(this.ownerId)
+	pbGuild.Avatar = proto.Int32(this.badge)
+	pbGuild.Notice = proto.String(this.notice)
+	pbGuild.JoinCond = proto.Int32(this.joinCondType)
+	pbGuild.JoinCondValue = proto.Int32(this.joinCondVal)
+	pbGuild.TotalStars = proto.Int32(0)
+	pbGuild.TotalKills = proto.Int32(0)
+	pbGuild.ChickenDinners = proto.Int32(0)
+	pbGuild.MaxMembers = proto.Int32(this.maxMemberNum)
+}
+
 func newGuild() *guild {
 	p := new(guild)
 	p.idHash = make(map[string]*member)
diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go
index e9dd870e..cf3eb205 100644
--- a/server/imserver_new/player/player.go
+++ b/server/imserver_new/player/player.go
@@ -352,6 +352,12 @@ func (this *player) CMSetCurrPrivateChatTarget(hdr *f5.MsgHdr, msg *cs.CMSetCurr
 }
 
 func (this *player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) {
+	rspMsg := new(cs.SMGuildInfo)
+	guild := GetGuildMgr().GetGuildByAccountId(msg.GetAccountId())
+	if guild == nil {
+		this.SendMsg(rspMsg.Err(1, "guild not exists"))
+		return
+	}
 }
 
 func (this *player) CMRecommendGuildList(hdr *f5.MsgHdr, msg *cs.CMRecommendGuildList) {