From 0a4b895e14e56067b641ce19e604478964cb0004 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=95=B0=E6=89=93=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Player.go              | 28 +++++++++++++++-----------
 src/server/game/RegisterNetworkFunc.go |  2 +-
 src/server/game/external.go            |  1 +
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/server/game/Player.go b/src/server/game/Player.go
index 99ca1490..0a536bbf 100644
--- a/src/server/game/Player.go
+++ b/src/server/game/Player.go
@@ -8,6 +8,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"errors"
+	"math"
 	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	cardCfg "server/conf/card"
@@ -464,10 +465,11 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 		case item.ITEM_TYPE_ENERGY: // 能量
 			err := p.GetPlayerBaseMod().AddEnergy(p, v.Num)
 			p.TeLog("asset_change", map[string]interface{}{
-				"item_id":      v.Id,
-				"change_type":  change_type,
-				"change_num":   v.Num,
-				"change_after": p.GetPlayerBaseMod().GetEnergy(),
+				"item_id":       v.Id,
+				"change_type":   change_type,
+				"change_num":    math.Abs(float64(v.Num)),
+				"change_after":  p.GetPlayerBaseMod().GetEnergy(),
+				"change_reason": p.args["func"],
 			})
 			is_update = true
 			if err != nil {
@@ -480,10 +482,11 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 				return err
 			}
 			p.TeLog("asset_change", map[string]interface{}{
-				"item_id":      v.Id,
-				"change_type":  change_type,
-				"change_num":   v.Num,
-				"change_after": p.GetPlayerBaseMod().GetStar(),
+				"item_id":       v.Id,
+				"change_type":   change_type,
+				"change_num":    math.Abs(float64(v.Num)),
+				"change_after":  p.GetPlayerBaseMod().GetStar(),
+				"change_reason": p.args["func"],
 			})
 		case item.ITEM_TYPE_DIAMOND: // 钻石
 			err := p.GetPlayerBaseMod().AddDiamond(v.Num)
@@ -492,10 +495,11 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 				return err
 			}
 			p.TeLog("asset_change", map[string]interface{}{
-				"item_id":      v.Id,
-				"change_type":  change_type,
-				"change_num":   v.Num,
-				"change_after": p.GetPlayerBaseMod().GetDiamond(),
+				"item_id":       v.Id,
+				"change_type":   change_type,
+				"change_num":    math.Abs(float64(v.Num)),
+				"change_after":  p.GetPlayerBaseMod().GetDiamond(),
+				"change_reason": p.args["func"],
 			})
 		case item.ITEM_TYPE_CARD: // 卡牌
 			CardMod := p.PlayMod.getCardMod()
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index dd827d91..4ead5707 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -394,7 +394,7 @@ func ReqDecorate(args []interface{}) error {
 	}
 	if AddItem != nil {
 		player.TeLog("scene_reward", map[string]interface{}{
-			"deco_step_id": DecorateId,
+			"deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress),
 			"item_list":    AddItem,
 		})
 	}
diff --git a/src/server/game/external.go b/src/server/game/external.go
index ea5e0dfb..556693d6 100644
--- a/src/server/game/external.go
+++ b/src/server/game/external.go
@@ -165,6 +165,7 @@ func HandleClientReq(args []interface{}) {
 				p.(*Player).lock.Unlock() //解锁
 			}()
 			p.(*Player).args = make(map[string]interface{})
+			p.(*Player).args["func"] = m
 			err := RunNetProcessByKey(m.GetFunc(), []interface{}{a, buf})
 			if err != nil {
 				log.Debug("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err)