From a1dd6527f3356bee5fe30116fe1dfb00f928e220 Mon Sep 17 00:00:00 2001
From: "COMPUTER\\EDY" <249929363@qq.com>
Date: Wed, 22 Jul 2026 19:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E8=83=9C=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Scene/GameScene.fire           | 2 +-
 assets/Script/GameManager.ts          | 4 ++--
 assets/Script/Map.ts                  | 8 +++++++-
 assets/Script/module/Tool/GameTool.ts | 9 +++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire
index 704cbe2..aa4b28e 100644
--- a/assets/Scene/GameScene.fire
+++ b/assets/Scene/GameScene.fire
@@ -62774,7 +62774,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        340.483,
+        340.583,
         21.918,
         0,
         0,
diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts
index cb2e639..9e1e0d3 100644
--- a/assets/Script/GameManager.ts
+++ b/assets/Script/GameManager.ts
@@ -326,8 +326,8 @@ export default class GameManager extends cc.Component {
                         if (data.data.token) {
                             cc.fx.GameConfig.GM_INFO.token = data.data.token;
                         }
-			if (data.data.abTests)
-                        	this.setABTests(data.data.abTests);
+                        if (data.data.abTests)
+                            this.setABTests(data.data.abTests);
 
                         if (data.data.forcedUpdate) {
                             const timestamp = Date.now();
diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts
index e308c9b..d6f126e 100644
--- a/assets/Script/Map.ts
+++ b/assets/Script/Map.ts
@@ -568,6 +568,7 @@ export default class MapConroler extends cc.Component {
             let data = {
                 "is_frenzy": this.is_frenzy,
                 "infinity": endLevel,
+                "win_streak": cc.fx.GameConfig.GM_INFO.winStreak,
             }
             if (cc.fx.GameConfig.GM_INFO.winStreak >= 10 && cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
                 cc.fx.GameConfig.GM_INFO.winState = false;
@@ -3873,7 +3874,7 @@ export default class MapConroler extends cc.Component {
         //     }
         // });
         setTimeout(() => {
-
+            this.node.parent.parent.parent.getChildByName("Pause").active = false;
             if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) {
                 cc.fx.GameConfig.LEVEL_INFO_init(true, 0, false, true);
             } else {
@@ -4123,6 +4124,7 @@ export default class MapConroler extends cc.Component {
             is_frenzy: this.is_frenzy,
             result: name + "reason: " + customEventData,
             infinity: endLevel,
+            win_streak: cc.fx.GameConfig.GM_INFO.winStreak,
         }
 
         cc.fx.GameTool.shushu_Track("finish_stage", data);
@@ -6751,6 +6753,10 @@ export default class MapConroler extends cc.Component {
             if (this.winStreakBtn.node)
                 this.winStreakBtn.node.active = false;
             this.destroyBtn.node.getChildByName("mul10").opacity = 255;
+            cc.fx.GameTool.shushu_Track("win_streak_tool_use", {
+                item_id: "2002",
+                count_down: this.timeNumber,
+            });
         }
         else MiniGameSdk.API.showToast("道具使用中，请稍后再试");
     }
diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts
index 16d3639..f6ee854 100644
--- a/assets/Script/module/Tool/GameTool.ts
+++ b/assets/Script/module/Tool/GameTool.ts
@@ -1,4 +1,5 @@
 
+import WinStreak from "../../../action_bundle/script/WinStreak";
 import JiaZai from "../../JiaZai";
 import MapConroler from "../../Map";
 import Freeze from "../../prop/Freeze";
@@ -1319,6 +1320,7 @@ var GameTool = {
                     stage_id: userLevel,
                     is_frenzy: data.is_frenzy,
                     infinity: data.infinity,
+                    win_streak: data.win_streak,
                 }
                 if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) {
                     eventData = {
@@ -1338,6 +1340,7 @@ var GameTool = {
                     is_frenzy: data.is_frenzy,
                     result: data.result,
                     infinity: data.infinity,
+                    win_streak: data.win_streak,
                 }
                 if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) {
                     eventData = {
@@ -1459,6 +1462,12 @@ var GameTool = {
                     is_paid_bp_usr: data.is_paid_bp_usr,//是否是战令付费档位, boolean
                 }
                 break;
+            case "win_streak_tool_use":
+                eventData = {
+                    item_id: data.item_id,          //使用的道具种类, 目前只有锤子
+                    count_down: data.count_down     //局内倒计时, int
+                }
+                break;
         }
         if (name == "stage_help") {
             console.log("准备上报完成", data);