From 853e7775f9ae24263ccae709f12a56ae15edb5bb Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=A5=B0=E5=A5=97=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Player.go        | 13 +++++++++++++
 src/server/game/mod/item/Item.go | 31 ++++++++++++++++---------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/server/game/Player.go b/src/server/game/Player.go
index 3eef267c..902e349b 100644
--- a/src/server/game/Player.go
+++ b/src/server/game/Player.go
@@ -671,6 +671,19 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 			Effect := itemCfg.GetItemEffect(v.Id)
 			PlayroomMod := p.PlayMod.getPlayroomMod()
 			PlayroomMod.AddDress(Effect)
+		case item.ITEM_TYPE_PLAYROOM_DECORATION_SET: // playroom装饰套装
+			Effect := itemCfg.GetItemEffectList(v.Id)
+			PlayroomMod := p.PlayMod.getPlayroomMod()
+			for _, v := range Effect {
+				if v == 0 {
+					continue
+				}
+				PlayroomMod.AddCollect(v)
+			}
+			p.TeLog("playroom_decoration_set", map[string]interface{}{
+				"decoration_set_id": Effect,
+				"income_from":       Label,
+			})
 		default:
 			err := ItemMod.AddItem(v.Id, v.Num)
 			p.TeLog("item_change", map[string]interface{}{
diff --git a/src/server/game/mod/item/Item.go b/src/server/game/mod/item/Item.go
index 5951a829..6e0f4f82 100644
--- a/src/server/game/mod/item/Item.go
+++ b/src/server/game/mod/item/Item.go
@@ -30,21 +30,22 @@ const (
 	ITEM_TYPE_DIAMOND = 3
 
 	// 物品类型
-	ITEM_TYPE_CARD                = 98  // 卡牌
-	ITEM_TYPE_BAG                 = 99  // 背包
-	ITEM_TYPE_CHESS               = 100 // 棋子
-	ITEM_TYPE_CARD_PACK           = 101 // 卡包
-	ITEM_TYPE_LIMIED_TIME_EVENT   = 102 //限时事件
-	ITEM_TYPE_PIGGY_BANK          = 103 // 猪猪银行
-	ITEM_TYPE_MASTER_CARD         = 104 // 万能卡
-	ITEM_TYPE_AVATAR              = 105 // 头像框
-	ITEM_TYPE_ACTIVITY            = 106 // 活动道具
-	ITEM_TYPE_ACTIVITY_RACE       = 107 // 竞赛活动道具
-	ITEM_TYPE_PLAYROOM_VISIT      = 108 // playroom拜访道具
-	ITEM_TYPE_EMOJI               = 109 // 表情
-	ITEM_TYPE_FACE                = 110 // 头像
-	ITEM_TYPE_PLAYROOM_DECORATION = 111 // playroom装饰
-	ITEM_TYPE_PLAYROOM_DRESS      = 112 // playroom服饰
+	ITEM_TYPE_CARD                    = 98  // 卡牌
+	ITEM_TYPE_BAG                     = 99  // 背包
+	ITEM_TYPE_CHESS                   = 100 // 棋子
+	ITEM_TYPE_CARD_PACK               = 101 // 卡包
+	ITEM_TYPE_LIMIED_TIME_EVENT       = 102 //限时事件
+	ITEM_TYPE_PIGGY_BANK              = 103 // 猪猪银行
+	ITEM_TYPE_MASTER_CARD             = 104 // 万能卡
+	ITEM_TYPE_AVATAR                  = 105 // 头像框
+	ITEM_TYPE_ACTIVITY                = 106 // 活动道具
+	ITEM_TYPE_ACTIVITY_RACE           = 107 // 竞赛活动道具
+	ITEM_TYPE_PLAYROOM_VISIT          = 108 // playroom拜访道具
+	ITEM_TYPE_EMOJI                   = 109 // 表情
+	ITEM_TYPE_FACE                    = 110 // 头像
+	ITEM_TYPE_PLAYROOM_DECORATION     = 111 // playroom装饰
+	ITEM_TYPE_PLAYROOM_DRESS          = 112 // playroom服饰
+	ITEM_TYPE_PLAYROOM_DECORATION_SET = 113 // playroom装饰套装
 )
 
 func (i *ItemMod) InitData() {