更新ios充值

assets/Script/Map.ts

@@ -3143,6 +3143,12 @@ export default class MapConroler extends cc.Component {
         NumberToImage.getTimeMargi3(20, 45, "company_", this.timeLabel)
         this.blockNum = this.blocks.length;
         if (this.blockNum == 0) this.nextLevel(1);
+        else {
+            this.changeLockWall();
+            this.changeRevolvingWall();
+            this.changeJumpWall();
+            this.changeLongAndShortWall();
+        }
         this.node.parent.parent.getChildByName("Lose").active = false;
         setTimeout(() => {
             this.reviewState = false;

assets/Script/Revive.ts

@@ -92,7 +92,7 @@ export default class Revive extends cc.Component {
                             this.closeLoad();
                             this.btn_Touch = true;
                             console.log("轮训超时");
-                            MiniGameSdk.API.showToast("请检查网络,如充值成功，请重新登录领取", 4);
+                            MiniGameSdk.API.showToast("请检查网络链接后, 再次领取奖励", 4);
                             const dataFail = {
                                 outTradeNo: iosReviveOrder,
                                 pay_amount: iosAmount,

assets/Script/monthlyCard.ts

@@ -107,7 +107,7 @@ export default class NewClass extends cc.Component {
                             this.closeLoad();
                             this.btn_Touch = true;
                             console.log("轮训超时");
-                            MiniGameSdk.API.showToast("请检查网络,如充值成功，请重新登录领取", 4);
+                            MiniGameSdk.API.showToast("请检查网络链接后, 再次领取奖励", 4);
                             // MiniGameSdk.API.showToast("订单已关闭");
                             const dataFail = {
                                 outTradeNo: iosMonthOrder,
@@ -260,6 +260,11 @@ export default class NewClass extends cc.Component {
         }
     }
 
+    againGet() {
+        this.closeConfirmBox();
+        this.onShow();
+    }
+
     buyProduct(event, customData) {
         if (!this.btn_Touch) {
             return;
@@ -472,6 +477,10 @@ export default class NewClass extends cc.Component {
         this.node.getChildByName("ConfirmBox").active = true;
     }
 
+    closeConfirmBox() {
+        this.node.getChildByName("ConfirmBox").active = false;
+    }
+
     closeLoad() {
         this.node.getChildByName("Loading").active = false;
     }

assets/action_bundle/script/NewbieGift.ts

@@ -100,7 +100,8 @@ export default class NewbieGift extends cc.Component {
                             this.closeLoad();
                             this.btn_Touch = true;
                             console.log("轮训超时");
-                            MiniGameSdk.API.showToast("请检查网络,如充值成功，请重新登录领取", 4);
+
+                            MiniGameSdk.API.showToast("请检查网络链接后, 再次领取奖励", 4);
                             const dataFail = {
                                 outTradeNo: iosStarterOrder,
                                 pay_amount: iosAmount,

assets/custom/Json/level372.json

@@ -274,7 +274,7 @@
           "y": -300,
           "z": 0
         },
-        "boomTime": 18,
+        "boomTime": 28,
         "id": 420
       },
       {
@@ -286,7 +286,7 @@
           "y": -300,
           "z": 0
         },
-        "boomTime": 15,
+        "boomTime": 25,
         "id": 430
       }
     ]

assets/custom/Json/level90.json

@@ -154,7 +154,7 @@
                     "y": 60,
                     "z": 0
                 },
-                "boomTime": 18,
+                "boomTime": 23,
                 "id": 330
             },
             {

assets/shop/prefab/monthlyCard.prefab

@@ -36,14 +36,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 92
       },
       {
-        "__id__": 90
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -2393,16 +2393,19 @@
       },
       {
         "__id__": 79
+      },
+      {
+        "__id__": 82
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 91
     },
     "_opacity": 255,
     "_color": {
@@ -2757,8 +2760,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "月卡充值",
+    "_string": "商城充值",
-    "_N$string": "月卡充值",
+    "_N$string": "商城充值",
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2794,7 +2797,7 @@
       "__id__": 65
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 77
@@ -2865,8 +2868,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "网络异常\n请重新登录小游戏\n领取月卡奖励",
+    "_string": "网络异常\n请重新登录小游戏\n领取充值奖励",
-    "_N$string": "网络异常\n请重新登录小游戏\n领取月卡奖励",
+    "_N$string": "网络异常\n请重新登录小游戏\n领取充值奖励",
     "_fontSize": 40,
     "_lineHeight": 60,
     "_enableWrapText": true,
@@ -2894,6 +2897,114 @@
     "fileId": "9149ix6q1AZ4VyIjmSGbdM",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 65
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 80
+      }
+    ],
+    "_prefab": {
+      "__id__": 81
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 320,
+      "height": 195.6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        89.865,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 79
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "网络异常\n请检查网络连接后\n再次领取",
+    "_N$string": "网络异常\n请检查网络连接后\n再次领取",
+    "_fontSize": 40,
+    "_lineHeight": 60,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 65
+    },
+    "asset": {
+      "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488"
+    },
+    "fileId": "63uT2CDhpI+LZj3A3c1PII",
+    "sync": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "New Sprite",
@@ -2903,20 +3014,20 @@
     },
     "_children": [
       {
-        "__id__": 80
+        "__id__": 83
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 86
       },
       {
-        "__id__": 84
+        "__id__": 87
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 89
     },
     "_opacity": 255,
     "_color": {
@@ -2970,17 +3081,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 79
+      "__id__": 82
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 85
     },
     "_opacity": 255,
     "_color": {
@@ -3034,7 +3145,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_materials": [
@@ -3078,7 +3189,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -3110,7 +3221,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 79
+      "__id__": 82
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3119,7 +3230,7 @@
     "zoomScale": 1.1,
     "clickEvents": [
       {
-        "__id__": 85
+        "__id__": 88
       }
     ],
     "_N$interactable": true,
@@ -3175,7 +3286,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 79
+      "__id__": 82
     },
     "_id": ""
   },
@@ -3186,7 +3297,7 @@
     },
     "component": "",
     "_componentId": "191edqNaKdPtJiA4/cSsB1N",
-    "handler": "closeMonthCard",
+    "handler": "againGet",
     "customEventData": ""
   },
   {
@@ -3235,7 +3346,7 @@
     "asset": {
       "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488"
     },
-    "fileId": "c59E21W4dAgZdQulz+5vqy",
+    "fileId": "e8OIoWrfxD6aACe8BPD9SD",
     "sync": false
   },
   {

assets/shop/prefab/shop.prefab

@@ -45,14 +45,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 538
+        "__id__": 541
       },
       {
-        "__id__": 539
+        "__id__": 542
       }
     ],
     "_prefab": {
-      "__id__": 540
+      "__id__": 543
     },
     "_opacity": 255,
     "_color": {
@@ -9414,7 +9414,7 @@
       "ctor": "Float64Array",
       "array": [
         -145.75,
-        -2185.145,
+        -2170.932,
         0,
         0,
         0,
@@ -9489,7 +9489,7 @@
       "ctor": "Float64Array",
       "array": [
         -228.34,
-        -2182.017,
+        -2167.804,
         0,
         0,
         0,
@@ -9598,7 +9598,7 @@
       "ctor": "Float64Array",
       "array": [
         -199.204,
-        -2182.017,
+        -2167.804,
         0,
         0,
         0,
@@ -9707,7 +9707,7 @@
       "ctor": "Float64Array",
       "array": [
         -168.931,
-        -2182.017,
+        -2167.804,
         0,
         0,
         0,
@@ -9816,7 +9816,7 @@
       "ctor": "Float64Array",
       "array": [
         -136.386,
-        -2182.017,
+        -2167.804,
         0,
         0,
         0,
@@ -19095,16 +19095,19 @@
       },
       {
         "__id__": 528
+      },
+      {
+        "__id__": 531
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 536
+        "__id__": 539
       }
     ],
     "_prefab": {
-      "__id__": 537
+      "__id__": 540
     },
     "_opacity": 255,
     "_color": {
@@ -19496,7 +19499,7 @@
       "__id__": 514
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 526
@@ -19596,6 +19599,114 @@
     "fileId": "9149ix6q1AZ4VyIjmSGbdM",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 514
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 529
+      }
+    ],
+    "_prefab": {
+      "__id__": 530
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 320,
+      "height": 195.6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        89.865,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 528
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "网络异常\n请检查网络连接后\n再次领取",
+    "_N$string": "网络异常\n请检查网络连接后\n再次领取",
+    "_fontSize": 40,
+    "_lineHeight": 60,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 514
+    },
+    "asset": {
+      "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488"
+    },
+    "fileId": "63uT2CDhpI+LZj3A3c1PII",
+    "sync": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "New Sprite",
@@ -19605,20 +19716,20 @@
     },
     "_children": [
       {
-        "__id__": 529
+        "__id__": 532
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 532
+        "__id__": 535
       },
       {
-        "__id__": 533
+        "__id__": 536
       }
     ],
     "_prefab": {
-      "__id__": 535
+      "__id__": 538
     },
     "_opacity": 255,
     "_color": {
@@ -19672,17 +19783,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 528
+      "__id__": 531
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 530
+        "__id__": 533
       }
     ],
     "_prefab": {
-      "__id__": 531
+      "__id__": 534
     },
     "_opacity": 255,
     "_color": {
@@ -19736,7 +19847,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 529
+      "__id__": 532
     },
     "_enabled": true,
     "_materials": [
@@ -19780,7 +19891,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 528
+      "__id__": 531
     },
     "_enabled": true,
     "_materials": [
@@ -19812,7 +19923,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 528
+      "__id__": 531
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -19821,7 +19932,7 @@
     "zoomScale": 1.1,
     "clickEvents": [
       {
-        "__id__": 534
+        "__id__": 537
       }
     ],
     "_N$interactable": true,
@@ -19877,7 +19988,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 528
+      "__id__": 531
     },
     "_id": ""
   },
@@ -19888,7 +19999,7 @@
     },
     "component": "",
     "_componentId": "48bfeZuYFZE2qmgxbW2IigB",
-    "handler": "closeConfirmBox",
+    "handler": "againGet",
     "customEventData": ""
   },
   {
@@ -19937,7 +20048,7 @@
     "asset": {
       "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488"
     },
-    "fileId": "0bIt32pkVJWp47546cV3sp",
+    "fileId": "f7M89MuI5NZorSJOXCw2zB",
     "sync": false
   },
   {

assets/shop/script/passCheck.ts

@@ -519,7 +519,7 @@ export default class passCheck extends cc.Component {
                             this.closeLoad();
                             this.btn_Touch = true;
                             console.log("轮训超时");
-                            MiniGameSdk.API.showToast("请检查网络,如充值成功，请重新登录领取", 4);
+                            MiniGameSdk.API.showToast("请检查网络链接后, 再次领取奖励", 4);
                             const dataFail = {
                                 outTradeNo: iosPassCheckOrder,
                                 pay_amount: iosAmount,

assets/shop/script/shop.ts

@@ -278,7 +278,7 @@ export default class NewClass extends cc.Component {
                console.log("有苹果订单号，开始轮训");
                const iosShopOrder = cc.fx.GameConfig.GM_INFO.iosShopOrder;
                // this.closeLoad();
-               // this.openLoad();
+               this.openLoad();
                this.btn_Touch = true;
 
                Utils.getIosPayInfo(iosShopOrder,
@@ -349,7 +349,7 @@ export default class NewClass extends cc.Component {
                         this.closeLoad();
                         this.btn_Touch = true;
                         console.log("轮训超时");
-                        MiniGameSdk.API.showToast("请检查网络,如充值成功，请重新登录领取", 4);
+                        MiniGameSdk.API.showToast("请检查网络链接后, 再次领取奖励", 4);
                         const dataFail = {
                            outTradeNo: iosShopOrder,
                            pay_amount: iosAmount,
@@ -368,8 +368,12 @@ export default class NewClass extends cc.Component {
             }
          }
       }
+   }
 
-
+   //重新获取充值结果
+   againGet() {
+      this.closeConfirmBox();
+      this.onShow();
    }
 
    openLoad() {