From 61b4fe2c4e1ccfa21551c397d7c245e204627e14 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 10 Jun 2025 09:58:09 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Player.go                     |  8 ++++++
 src/server/game/mod/item/Item.go              | 28 ++++++++++---------
 .../mod/limitedTimeEvent/LimitedTimeEvent.go  |  1 +
 src/server/game/mod/playroom/playroom.go      |  8 ++++++
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/server/game/Player.go b/src/server/game/Player.go
index 58902f5d..e03dda4e 100644
--- a/src/server/game/Player.go
+++ b/src/server/game/Player.go
@@ -660,6 +660,14 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 			playroomMod.Status = playroom.STATUS_VISIT
 			// PlayroomVisit(p, Target)
 			PlayroomBackData(p)
+		case item.ITEM_TYPE_PLAYROOM_DECORATION: // playroom装饰
+			Effect := itemCfg.GetItemEffect(v.Id)
+			PlayroomMod := p.PlayMod.getPlayroomMod()
+			PlayroomMod.AddCollect(Effect)
+		case item.ITEM_TYPE_PLAYROOM_DRESS: // playroom服饰
+			Effect := itemCfg.GetItemEffect(v.Id)
+			PlayroomMod := p.PlayMod.getPlayroomMod()
+			PlayroomMod.AddDress(Effect)
 		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 0713dbfe..5951a829 100644
--- a/src/server/game/mod/item/Item.go
+++ b/src/server/game/mod/item/Item.go
@@ -30,19 +30,21 @@ 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_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服饰
 )
 
 func (i *ItemMod) InitData() {
diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
index cf0caba1..3d0ab95f 100644
--- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
+++ b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
@@ -98,6 +98,7 @@ func (l *LimitedTimeEventMod) InitData(Lv int) {
 	if !l.First {
 		l.First = true
 		EventId := limitedTimeEventCfg.GetFirstEvent()
+		l.ProgressMax = 0
 		l.ProgressReward = map[int]int{
 			1: EventId,
 		}
diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go
index 7a0da167..1b990a92 100644
--- a/src/server/game/mod/playroom/playroom.go
+++ b/src/server/game/mod/playroom/playroom.go
@@ -444,6 +444,14 @@ func (p *PlayroomMod) AddCollect(Id int) {
 	p.Collect[Id]++
 }
 
+func (p *PlayroomMod) AddDress(Id int) {
+	Part := playroomCfg.GetDressPart(Id)
+	if _, ok := p.Dress[Part]; !ok {
+		p.Dress[Part] = make([]int, 0)
+	}
+	p.Dress[Part] = append(p.Dress[Part], Id)
+}
+
 func (p *PlayroomMod) ResetGame() {
 	p.Target = 0
 	p.Status = STATUS_IDLE