From 331a46e5cec345e37be9b3ce5eb5f1013939eaf0 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=95=B0=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/RegisterNetworkFunc.go        | 40 +++++--------------
 .../mod/limitedTimeEvent/LimitedTimeEvent.go  |  8 ++--
 2 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index 142f1ba0..ef6f3448 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -642,6 +642,9 @@ func ReqSeparateChess(args []interface{}) error {
 	player.PushClientRes(&msg.ResSeparateChess{
 		Code: msg.RES_CODE_SUCCESS,
 	})
+	player.TeLog("scissors_use", map[string]interface{}{
+		"scissors_item_id": int(req.ChessId),
+	})
 	player.UpdateUserInfo()
 	return nil
 }
@@ -2300,36 +2303,6 @@ func ReqChampshipReward(args []interface{}) error {
 	return nil
 }
 
-// 选取限时事件进度奖励
-func ReqLimitEventReward(args []interface{}) error {
-	_, player, buf := ParseArgs(args)
-	req := &msg.ReqLimitEventReward{}
-	proto.Unmarshal(buf, req)
-	LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
-	itemList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id))
-	if err != nil {
-		player.SendErrClienRes(&msg.ResLimitEventReward{
-			Code: msg.RES_CODE_FAIL,
-			Msg:  err.Error(),
-		})
-		return err
-	}
-	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_LimitEventReward.String())
-	if err != nil {
-		player.SendErrClienRes(&msg.ResLimitEventReward{
-			Code: msg.RES_CODE_FAIL,
-			Msg:  err.Error(),
-		})
-		return err
-	}
-	player.PlayMod.save()
-	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
-	player.PushClientRes(&msg.ResLimitEventReward{
-		Code: msg.RES_CODE_SUCCESS,
-	})
-	return nil
-}
-
 func ReqLimitEvent(args []interface{}) error {
 	_, player, _ := ParseArgs(args)
 	LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
@@ -2639,7 +2612,7 @@ func ReqSelectLimitEvent(args []interface{}) error {
 	req := &msg.ReqSelectLimitEvent{}
 	proto.Unmarshal(buf, req)
 	LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
-	Items, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id))
+	Items, slot_reward, slot_order_number, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
 			Code: msg.RES_CODE_FAIL,
@@ -2655,6 +2628,11 @@ func ReqSelectLimitEvent(args []interface{}) error {
 		})
 		return err
 	}
+	player.TeLog("time_limited_slot", map[string]interface{}{
+		"slot_order_number": slot_order_number,
+		"slot_reward_list":  slot_reward,
+		"slot_reward":       req.Id,
+	})
 	player.PlayMod.save()
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
index 9edce72f..34c7254b 100644
--- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
+++ b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
@@ -270,18 +270,20 @@ func (l *LimitedTimeEventMod) AddProgress(Lv int) {
 }
 
 // 选择进度奖励
-func (l *LimitedTimeEventMod) SelectProgressReward(Id int) ([]*item.Item, error) {
+func (l *LimitedTimeEventMod) SelectProgressReward(Id int) ([]*item.Item, map[int]int, int, error) {
 	RewardId, ok := l.ProgressReward[Id]
 	if !ok {
-		return nil, fmt.Errorf("RewardId not exist")
+		return nil, nil, 0, fmt.Errorf("RewardId not exist")
 	}
+	r1 := l.ProgressReward
+	r2 := l.ProgressMax
 	Item := limitedTimeEventCfg.GetProgressReward(RewardId)
 	l.LastSelect = RewardId
 	l.ProgressReward = make(map[int]int)
 	l.Progress = 0
 	l.BonusNum++
 	l.ProgressMax = limitedTimeEventCfg.GetProgressMax(l.Lv, l.BonusNum)
-	return Item, nil
+	return Item, r1, r2, nil
 }
 
 func (l *LimitedTimeEventMod) RemoveSuperOrder() bool {