From 273d32d65868a5a6ec0d0b414444351964ab54f6 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 8 Sep 2025 15:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Gm.go | 2 +- src/server/game/Player.go | 6 +++--- src/server/game/mod/playroom/playroom.go | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go index ba7c3a30..d7a59a1e 100644 --- a/src/server/game/Gm.go +++ b/src/server/game/Gm.go @@ -296,7 +296,7 @@ func ReqGmCommand_(player *Player, Command string) error { PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod.NewCollect = make(map[int]*playroom.CollectInfo, 0) for _, v := range CollectList { - PlayroomMod.AddCollect(v) + PlayroomMod.AddCollect(v, "Gm") } case "playroomDress": PlayroomMod := player.PlayMod.getPlayroomMod() diff --git a/src/server/game/Player.go b/src/server/game/Player.go index 17c1da5f..b36def55 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -699,7 +699,7 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { case item.ITEM_TYPE_PLAYROOM_DECORATION: // playroom装饰 Effect := itemCfg.GetItemEffect(v.Id) PlayroomMod := p.PlayMod.getPlayroomMod() - PlayroomMod.AddCollect(Effect) + PlayroomMod.AddCollect(Effect, Label) BackDataType[item.ITEM_TYPE_PLAYROOM_DECORATION] = struct{}{} Type, Name := playroomCfg.GetDecoInfo(Effect) p.TeLog("room_deco_get", map[string]interface{}{ @@ -710,7 +710,7 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { case item.ITEM_TYPE_PLAYROOM_DRESS: // playroom服饰 Effect := itemCfg.GetItemEffect(v.Id) PlayroomMod := p.PlayMod.getPlayroomMod() - PlayroomMod.AddDress(Effect) + PlayroomMod.AddDress(Effect, Label) BackDataType[item.ITEM_TYPE_PLAYROOM_DRESS] = struct{}{} Type := playroomCfg.GetDressPart(Effect) Name := playroomCfg.GetDressName(Effect) @@ -726,7 +726,7 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { if v == 0 { continue } - PlayroomMod.AddCollect(v) + PlayroomMod.AddCollect(v, Label) Type, Name := playroomCfg.GetDecoInfo(v) p.TeLog("room_deco_get", map[string]interface{}{ "room_deco_type": Type, diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go index ecc09762..4f197312 100644 --- a/src/server/game/mod/playroom/playroom.go +++ b/src/server/game/mod/playroom/playroom.go @@ -581,14 +581,15 @@ func (p *PlayroomMod) SetRoom(Room map[int]int) (map[int]int, error) { return diff, nil } -func (p *PlayroomMod) AddCollect(Id int) { +func (p *PlayroomMod) AddCollect(Id int, Label string) { p.NewCollect[Id] = &CollectInfo{ Id: Id, AddTime: GoUtil.Now(), + Label: Label, } } -func (p *PlayroomMod) AddDress(Id int) { +func (p *PlayroomMod) AddDress(Id int, Label string) { Part := playroomCfg.GetDressPart(Id) if _, ok := p.NewDress[Id]; !ok { p.NewDress[Id] = &DressInfo{ @@ -596,7 +597,7 @@ func (p *PlayroomMod) AddDress(Id int) { Part: Part, AddTime: GoUtil.Now(), EndTime: 0, - Label: "", + Label: Label, Num: 1, } } else {