From 85a5273c10d3f56df6f46cfc076099a6aa6c6f3b Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 15 Apr 2026 17:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=AB=E7=8C=AB=E5=9B=9E=E7=A4=BC=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E8=81=9A=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/activity_func.go | 4 ++-- src/server/game/register_network_func.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go index 68ad6240..a29735d5 100644 --- a/src/server/game/activity_func.go +++ b/src/server/game/activity_func.go @@ -202,9 +202,9 @@ func (p *Player) CatReturnGiftZeroUpdate() { if cfg != nil { for _, v := range cfg.RewardList { if oldScore >= int(v.Total) && oldReward < int(v.Id) { - items = append(items, item.MsgToItem(v.Reward)...) + items = item.Merge(items, item.MsgToItem(v.Reward)) if v.StarReward > 0 { - items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor()))) + items = item.Merge(items, []*item.Item{item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor()))}) } } } diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index 8d272464..56214f73 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -5016,10 +5016,10 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err var maxRewardId int for _, v := range cfg.RewardList { if score >= int(v.Total) && reward < int(v.Id) { - items = append(items, item.MsgToItem(v.Reward)...) + items = item.Merge(items, item.MsgToItem(v.Reward)) maxRewardId = max(maxRewardId, int(v.Id)) if v.StarReward > 0 { - items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor()))) + items = item.Merge(items, []*item.Item{item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor()))}) } } }