From 85f336accab12931173014bca16afdb80fd3236b Mon Sep 17 00:00:00 2001
From: "COMPUTER\\EDY" <249929363@qq.com>
Date: Sat, 11 Oct 2025 18:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Script/GameManager.ts | 37 +++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts
index c5ce791..1f31acb 100644
--- a/assets/Script/GameManager.ts
+++ b/assets/Script/GameManager.ts
@@ -312,9 +312,23 @@ export default class GameManager extends cc.Component {
     //#region  老用户，读取数据
     /** 老用户，有本地缓存数据，与服务器数据做比对，哪边关卡等级高以哪边为主 */
     getUserDataToLocal(data) {
+        const timestamp = Date.now();
         let levelInfo = cc.fx.StorageMessage.getStorage("level");
         let coinInfo = cc.fx.StorageMessage.getStorage("coin");
-        let propInfo = cc.fx.StorageMessage.getStorage("prop");
+        let propInfo = {
+            "freezeAmount": 0,
+            "hammerAmount": 0,
+            "magicAmount": 0,
+            "timestamp": timestamp,
+        }
+        cc.fx.GameConfig.GM_INFO.freezeAmount = propInfo.freezeAmount;
+        cc.fx.GameConfig.GM_INFO.hammerAmount = propInfo.hammerAmount;
+        cc.fx.GameConfig.GM_INFO.magicAmount = propInfo.magicAmount;
+        cc.fx.GameConfig.GM_INFO.level = data.levelAmount;
+        //// cc.fx.GameConfig.GM_INFO.coin = data.coinAmount;
+
+        cc.fx.StorageMessage.setStorage("prop", propInfo);
+        console.log("____________存储道具信息", propInfo);
         if (data.levelAmount == null || data.levelAmount == undefined) {
             data.levelAmount = 0;
         }
@@ -419,18 +433,19 @@ export default class GameManager extends cc.Component {
             cc.fx.StorageMessage.setStorage("level", levelInfo);
             //// let coinInfo = { "coin": data.coinAmount, "timestamp": timestamp };
             //// cc.fx.StorageMessage.setStorage("coin", coinInfo);
-            // let propInfo = {
-            //     "freezeAmount": data.freezeAmount,
-            //     "hammerAmount": data.hammerAmount,
-            //     "magicAmount": data.magicAmount,
-            //     "timestamp": timestamp,
-            // }
-            // cc.fx.GameConfig.GM_INFO.freezeAmount = data.freezeAmount;
-            // cc.fx.GameConfig.GM_INFO.hammerAmount = data.hammerAmount;
-            // cc.fx.GameConfig.GM_INFO.magicAmount = data.magicAmount;
+            let propInfo = {
+                "freezeAmount": 0,
+                "hammerAmount": 0,
+                "magicAmount": 0,
+                "timestamp": timestamp,
+            }
+            cc.fx.GameConfig.GM_INFO.freezeAmount = propInfo.freezeAmount;
+            cc.fx.GameConfig.GM_INFO.hammerAmount = propInfo.hammerAmount;
+            cc.fx.GameConfig.GM_INFO.magicAmount = propInfo.magicAmount;
             cc.fx.GameConfig.GM_INFO.level = data.levelAmount;
             //// cc.fx.GameConfig.GM_INFO.coin = data.coinAmount;
-            // cc.fx.StorageMessage.setStorage("prop", propInfo);
+            cc.fx.StorageMessage.setStorage("prop", propInfo);
+            console.log("____________存储道具信息", propInfo);
         }
     }
     /** 倒计时，保证进度在1秒内不进入游戏 */