From 5435ffbed5ce0931414eac1980f264526699dec2 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 10 Mar 2025 14:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/RegisterNetworkFunc.go | 4 ++++
 src/server/game/mod/avatar/Avatar.go   | 4 ++++
 src/server/game/mod/collect/Collect.go | 4 +++-
 src/server/game/mod/face/Face.go       | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index c83e4f80..af260a2c 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -3666,6 +3666,10 @@ func ReqCollect(player *Player, buf []byte) error {
 	switch Type {
 	case collect.COLLECT_TYPE_EMOJI:
 		Num = player.PlayMod.getEmojiMod().GetEmojiNum()
+	case collect.COLLECT_TYPE_FACE:
+		Num = player.PlayMod.getFaceMod().GetFaceNum()
+	case collect.COLLECT_TYPE_AVATAR:
+		Num = player.PlayMod.getAvatarMod().GetAvatarNum()
 	}
 	Items, err := CollectMod.GetReward(int(req.Id), Num)
 	if err != nil {
diff --git a/src/server/game/mod/avatar/Avatar.go b/src/server/game/mod/avatar/Avatar.go
index a26c7b4f..cf0a0b6b 100644
--- a/src/server/game/mod/avatar/Avatar.go
+++ b/src/server/game/mod/avatar/Avatar.go
@@ -39,6 +39,10 @@ func (a *AvatarMod) InitData() {
 	}
 }
 
+func (a *AvatarMod) GetAvatarNum() int {
+	return len(a.List)
+}
+
 func (a *AvatarMod) SetAvatar(Id int) error {
 	if _, ok := a.List[Id]; !ok {
 		return fmt.Errorf("avatar id not exist")
diff --git a/src/server/game/mod/collect/Collect.go b/src/server/game/mod/collect/Collect.go
index d0f46e57..04ea159c 100644
--- a/src/server/game/mod/collect/Collect.go
+++ b/src/server/game/mod/collect/Collect.go
@@ -18,7 +18,9 @@ type CollectInfo struct {
 }
 
 const (
-	COLLECT_TYPE_EMOJI = 1
+	COLLECT_TYPE_EMOJI  = 1
+	COLLECT_TYPE_FACE   = 2
+	COLLECT_TYPE_AVATAR = 3
 )
 
 func (c *Collect) InitData() {
diff --git a/src/server/game/mod/face/Face.go b/src/server/game/mod/face/Face.go
index 6d3f3569..8101741c 100644
--- a/src/server/game/mod/face/Face.go
+++ b/src/server/game/mod/face/Face.go
@@ -40,6 +40,10 @@ func (f *FaceMod) InitData() {
 	}
 }
 
+func (f *FaceMod) GetFaceNum() int {
+	return len(f.List)
+}
+
 func (f *FaceMod) SetFace(Id int) error {
 	if Id == 0 {
 		f.SetId = Id