From 03562bb36fdcf9a9b9dd01bd5693cf84a9e9d90b Mon Sep 17 00:00:00 2001
From: "YZ\\249929363" <249929363@qq.com>
Date: Fri, 8 Aug 2025 18:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Script/GameManager.ts   |  1 +
 assets/Script/JiaZai.ts        |  2 +-
 assets/Script/Map.ts           | 11 +++++++----
 assets/shop/prefab/shop.prefab | 24 ++++++++++++------------
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts
index 9a722fa..caee1cf 100644
--- a/assets/Script/GameManager.ts
+++ b/assets/Script/GameManager.ts
@@ -806,6 +806,7 @@ export default class GameManager extends cc.Component {
         }
     }
     setmonth(data) {
+        console.log("得到的月卡信息:", data.data.monthCardTime);
         //如果给的时间戳大于当前时间hpmax=7,否则等于5  
         let nowTime = Math.floor(Date.now() / 1000);
         if (data.data.monthCardTime > nowTime) {
diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts
index f209d99..6e65744 100644
--- a/assets/Script/JiaZai.ts
+++ b/assets/Script/JiaZai.ts
@@ -263,7 +263,7 @@ export default class JiaZai extends cc.Component {
         //  this.openHeath();
         this.uploadToCloud(cc.fx.GameConfig.GM_INFO.level + 1);
         console.log("________________1");
-        this.getMonthlyCardValidityDays();
+        // this.getMonthlyCardValidityDays();
         this.rewarded();
 
         //判断过期
diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts
index ef2cab9..1cadaba 100644
--- a/assets/Script/Map.ts
+++ b/assets/Script/Map.ts
@@ -1531,12 +1531,12 @@ export default class MapConroler extends cc.Component {
                 this.blocks.splice(i, 1);
             }
         }
-         
+
         if (this.eliMinNUM == true) {
             this.changeState(true);
             this.eliMinNUM = false;
         }
-       
+
     }
 
     judgeWin(number) {
@@ -1696,6 +1696,9 @@ export default class MapConroler extends cc.Component {
         cc.fx.AudioManager._instance.playEffect("anniu_Big", null);
         if (cc.fx.GameConfig.GM_INFO.hp < 1) {
             MiniGameSdk.API.showToast("体力值不足");
+            setTimeout(() => {
+                this.openShop();
+            }, 200);
             return;
         }
         if (!this.againCanTouch) return;
@@ -2781,7 +2784,7 @@ export default class MapConroler extends cc.Component {
                     // }
                 }
                 else if (nomalArray.length == 1) {
-                      this.eliMinNUM = true;
+                    this.eliMinNUM = true;
                     nomalArray[0].getComponent("Block").eliminate(1);
                     let time = 0;
                     if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) {
@@ -2806,7 +2809,7 @@ export default class MapConroler extends cc.Component {
                     }, 200 + time);
                 }
                 else {
-                      this.eliMinNUM = true;
+                    this.eliMinNUM = true;
                     let count = 2;
                     if (this.loackArray.length != 0) {
                         for (let i = 0; i < this.loackArray.length; i++) {
diff --git a/assets/shop/prefab/shop.prefab b/assets/shop/prefab/shop.prefab
index a994cad..5231573 100644
--- a/assets/shop/prefab/shop.prefab
+++ b/assets/shop/prefab/shop.prefab
@@ -2108,7 +2108,7 @@
       "ctor": "Float64Array",
       "array": [
         -2.798,
-        -638.472,
+        -2158.941,
         0,
         0,
         0,
@@ -2345,7 +2345,7 @@
       "ctor": "Float64Array",
       "array": [
         -339.058,
-        -964.781,
+        -2485.25,
         0,
         0,
         0,
@@ -2929,7 +2929,7 @@
       "ctor": "Float64Array",
       "array": [
         12.942,
-        -964.781,
+        -2485.25,
         0,
         0,
         0,
@@ -3513,7 +3513,7 @@
       "ctor": "Float64Array",
       "array": [
         364.942,
-        -964.781,
+        -2485.25,
         0,
         0,
         0,
@@ -4097,7 +4097,7 @@
       "ctor": "Float64Array",
       "array": [
         -339.058,
-        -1458.781,
+        -2979.25,
         0,
         0,
         0,
@@ -4681,7 +4681,7 @@
       "ctor": "Float64Array",
       "array": [
         12.942,
-        -1458.781,
+        -2979.25,
         0,
         0,
         0,
@@ -5265,7 +5265,7 @@
       "ctor": "Float64Array",
       "array": [
         364.942,
-        -1458.781,
+        -2979.25,
         0,
         0,
         0,
@@ -5834,7 +5834,7 @@
       "ctor": "Float64Array",
       "array": [
         0.491,
-        -1775.766,
+        -599.734,
         0,
         0,
         0,
@@ -6056,7 +6056,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -2085.237,
+        -905.205,
         0,
         0,
         0,
@@ -6501,7 +6501,7 @@
       "ctor": "Float64Array",
       "array": [
         -2.3,
-        -2554.684,
+        -1389.652,
         0,
         0,
         0,
@@ -7058,7 +7058,7 @@
       "ctor": "Float64Array",
       "array": [
         -1.476,
-        -3026.889,
+        -1861.857,
         0,
         0,
         0,
@@ -7571,7 +7571,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -36.983,
+        1128.049,
         0,
         0,
         0,