Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb

# Conflicts:
#	assets/Scene/GameScene.fire
#	assets/UI/UI/pop/gameui.plist.meta

assets/Script/JiaZai.ts

@@ -21,6 +21,11 @@ export default class JiaZai extends cc.Component {
     // 缓存 shop 节点
     private shopNode: cc.Node | null = null;
 
+    // 缓存 reward 预制体
+    private static cachedRewardPrefab: cc.Prefab | null = null;
+    // 缓存 reward 奖励窗口 节点
+    private RewardNode: cc.Node | null = null;
+
     @property(cc.Node)
     node1: cc.Node = null;
 
@@ -92,6 +97,15 @@ export default class JiaZai extends cc.Component {
                 });
             });
         }
+        // 预加载 reward 预制体
+        if (!JiaZai.cachedRewardPrefab) {
+            cc.assetManager.loadBundle('reward', (err: Error, bundle: cc.AssetManager.Bundle) => {
+                if (err) {
+                    cc.error(err.message || err);
+                    return;
+                }
+            })
+        }
 
 
         if (cc.fx.GameConfig.GM_INFO.first) {
@@ -117,7 +131,7 @@ export default class JiaZai extends cc.Component {
                     register_time: time, // 注册时间
                 }
                 cc.fx.GameTool.shushu_Track("register", data);
-                MiniGameSdk.API.shushu_SetSuperProperties(time);
+                MiniGameSdk.API.shushu_SetSuperProperties(time, false);
             }
             cc.fx.AudioManager._instance.playEffect("zhuan1", null);
             this.node.getChildByName("zhuanchang").active = true;
@@ -378,6 +392,7 @@ export default class JiaZai extends cc.Component {
         } else {
             // 非第一次使用，直接激活节点
             this.shopNode.active = true;
+            this.shopNode.getComponent("shop").init();
         }
         // //console.log("shopNode parent:", this.shopNode.parent);
     }
@@ -493,7 +508,8 @@ export default class JiaZai extends cc.Component {
                         this.openLoad();
                         console.log("补发名称:", order.itemid);
                         let productId = order.itemid;
-                        Utils.setPayInfo((res) => {
+                        Utils.setPayInfo(
+                            (res) => {
                                 console.log("设置轮训结果:", res);
                                 this.closeLoad();
                                 if (res.code === 1) {

assets/Script/Reward.ts

@@ -0,0 +1,19 @@
+
+
+const { ccclass, property, requireComponent } = cc._decorator;
+
+@ccclass
+export default class Reward extends cc.Component {
+
+
+    @property(cc.Prefab)
+    rewardNode: cc.Prefab = null;
+
+
+    onLoad() {
+
+    }
+
+    start() {
+    }
+}

assets/Script/Reward.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "f30d38a9-33b7-4fe8-9b9b-4ed6fd2f6c99",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/SceneManager.ts

@@ -340,6 +340,7 @@ export default class SceneManager extends cc.Component {
         } else {
             // 非第一次使用，直接激活节点
             this.shopNode.active = true;
+            this.shopNode.getComponent("shop").init();
         }
         // console.log("shopNode parent:", this.shopNode.parent);
     }

assets/Script/Sdk/MiniGameSdk.ts

@@ -1127,7 +1127,7 @@ export namespace MiniGameSdk {
                     },
                     // 根据环境变量设置 debug 模式
                     debug: !isProduction,
-                    enableLog: false
+                    enableLog: true
                 };
                 // 创建 TA 实例
                 API._ta = new ThinkingAnalyticsAPI(config);
@@ -1159,7 +1159,7 @@ export namespace MiniGameSdk {
                 cc.fx.GameConfig.GM_INFO.shushu_AccountId = cc.fx.GameConfig.GM_INFO.openid;
                 const result = "success";
                 API.shushu_Track("login", result);
-                API.shushu_SetSuperProperties(null);
+                API.shushu_SetSuperProperties(null, null);
             }
         }
 
@@ -1182,7 +1182,7 @@ export namespace MiniGameSdk {
         * 数数平台设置动态公共属性
         */
 
-        static shushu_SetSuperProperties(register_time) {
+        static shushu_SetSuperProperties(register_time, pay_user) {
             if (typeof wx !== 'undefined' && wx !== null && API._ta) {
                 var superProperties = {};
                 superProperties = {
@@ -1192,14 +1192,26 @@ export namespace MiniGameSdk {
                     version: cc.fx.GameConfig.GM_INFO.version.toString(),//当前版本号
                 };
                 if (register_time != null) {
+                    console.log("设置用户公共属性注册：————————————", register_time);
                     superProperties = {
                         current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级  number
                         current_health: cc.fx.GameConfig.GM_INFO.hp,        //当前体力值
                         tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币
                         version: cc.fx.GameConfig.GM_INFO.version.toString(),
-                        register_time: register_time
+                        register_time: register_time,
+                        pay_user: pay_user
                     };
                 }
+                if (pay_user != null) {
+                    console.log("设置用户公共属性支付：————————————", pay_user);
+                    superProperties = {
+                        current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级  number
+                        current_health: cc.fx.GameConfig.GM_INFO.hp,        //当前体力值
+                        tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 
+                        version: cc.fx.GameConfig.GM_INFO.version.toString(),
+                        pay_user: pay_user
+                    }
+                }
                 API._ta.setSuperProperties(superProperties);//设置公共事件属性
                 API.updateCoinAndLevel();
             }

assets/Script/module/Pay/Utils.ts

@@ -135,7 +135,7 @@ export default class Utils {
     //#region  ios支付
 
     /**跳转客服*/
-    static GoKEFu(iosPayInfo) {
+    static GoKEFu(iosPayInfo, callBack) {
         cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null;
         cc.fx.GameConfig.GM_INFO.iosOutTradeNo = `wcx_` + Math.round(Math.random() * 10 ** 13) + Date.now();
         const data = {
@@ -158,7 +158,11 @@ export default class Utils {
             sessionFrom: JSON.stringify(data), // 会话来源（可选）
             showMessageCard: false, // 是否展示消息卡片
             success() {
+                callBack();
                 console.log('客服会话已打开');
+            },
+            fail() {
+                callBack();
             }
         });
     }
@@ -464,4 +468,21 @@ export default class Utils {
         }
         return xhr;
     }
+
+
+    // const propName={
+    //   gold_1: "金币包1",
+    //   gold_2: "金币包2",
+    //   gold_3: "金币包3",
+    //   gold_4: "金币包4",
+    //   gold_5: "金币包5",
+    //   gold_6: "金币包6",
+    //   unlimited_health_bundle_1:"无限体力组合包1",
+    //   unlimited_health_bundle_2:"无限体力组合包2",
+    //   unlimited_health_bundle_3:"无限体力组合包3",
+    //   freeze_in_game:"局内购买冻结",
+    //   hammer_in_game:"局内购买锤子",
+    //   wand_in_gamerefill:"局内购买魔棒", 
+    //   health:"补满体力"
+    // };
 }

assets/Script/module/Tool/GameTool.ts

@@ -354,7 +354,7 @@ var GameTool = {
                 result: "success"
             }
             cc.fx.GameTool.shushu_Track("finish_stage", data);
-            MiniGameSdk.API.shushu_SetSuperProperties(null);
+            MiniGameSdk.API.shushu_SetSuperProperties(null, null);
         }
 
         cc.fx.GameTool.setUserLevel((data) => {
@@ -390,7 +390,7 @@ var GameTool = {
             coin: cc.fx.GameConfig.GM_INFO.coin,
             timestamp: timestamp,
         }
-        MiniGameSdk.API.shushu_SetSuperProperties(null);
+        MiniGameSdk.API.shushu_SetSuperProperties(null, null);
         cc.fx.StorageMessage.setStorage("coin", coinInfo);
         // console.log("存储金币数据:",cc.fx.GameConfig.GM_INFO.coin,coinInfo);
         cc.fx.GameTool.setUserCoin((data) => {
@@ -502,7 +502,7 @@ var GameTool = {
                         "health": cc.fx.GameConfig.GM_INFO.hp,
                         "timestamp": data.result.timestamp
                     }
-                    MiniGameSdk.API.shushu_SetSuperProperties(null);
+                    MiniGameSdk.API.shushu_SetSuperProperties(null, null);
                     cc.fx.StorageMessage.setStorage("health", healthInfo);
                 }
                 else if (data.result.code == 404 && data.result.message == "未找到体力数据") {
@@ -596,7 +596,7 @@ var GameTool = {
             }
         }
         cc.fx.StorageMessage.setStorage("health", healthInfo);
-        MiniGameSdk.API.shushu_SetSuperProperties(null);
+        MiniGameSdk.API.shushu_SetSuperProperties(null, null);
         //@ts-ignore
         if (typeof wx !== 'undefined' && wx !== null) {
             //@ts-ignore
@@ -889,6 +889,7 @@ var GameTool = {
             cost_type: "cash"
         }
         cc.fx.GameTool.shushu_Track("shop_buy", buyData);
+        MiniGameSdk.API.shushu_SetSuperProperties(null, true);
     },
 
     formatDate(date: Date): string {

assets/UI/UI/pop/gameui.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 2025,
+  "width": 2039,
-  "height": 1420,
+  "height": 1970,
   "platformSettings": {},
   "subMetas": {}
 }

assets/effect/getSpine.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "10250af3-a286-4ebd-9da6-ffafce376a46",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/effect/getSpine/goldbi.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "f7f69fb1-46b8-4416-af75-9f3768be5796",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 109,
+  "height": 112,
+  "platformSettings": {},
+  "subMetas": {
+    "goldbi": {
+      "ver": "1.0.6",
+      "uuid": "09f6acb6-4313-4a5a-9510-de00b16901be",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "f7f69fb1-46b8-4416-af75-9f3768be5796",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 109,
+      "height": 112,
+      "rawWidth": 109,
+      "rawHeight": 112,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/effect/getSpine/starzha.atlas

@@ -0,0 +1,27 @@
+
+starzha.png
+size: 740,740
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+light
+  rotate: false
+  xy: 0, 41
+  size: 697, 697
+  orig: 697, 697
+  offset: 0, 0
+  index: -1
+star1
+  rotate: false
+  xy: 699, 698
+  size: 39, 40
+  orig: 53, 52
+  offset: 7, 6
+  index: -1
+star2
+  rotate: false
+  xy: 699, 658
+  size: 38, 38
+  orig: 51, 52
+  offset: 6, 7
+  index: -1

assets/effect/getSpine/starzha.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "8ee6d148-c5c8-49f6-a884-c06b2a12935a",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/effect/getSpine/starzha.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "62ae7eaa-1552-4465-9696-f6220311642a",
+  "importer": "spine",
+  "textures": [
+    "43fc1dbb-dacd-442f-9818-f0da7a5f6e98"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/effect/getSpine/starzha.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "43fc1dbb-dacd-442f-9818-f0da7a5f6e98",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 740,
+  "height": 740,
+  "platformSettings": {},
+  "subMetas": {
+    "starzha": {
+      "ver": "1.0.6",
+      "uuid": "5163d43f-6fb8-4eb1-a961-981be52a1fa3",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "43fc1dbb-dacd-442f-9818-f0da7a5f6e98",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -19.5,
+      "trimX": 0,
+      "trimY": 41,
+      "width": 738,
+      "height": 697,
+      "rawWidth": 740,
+      "rawHeight": 740,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/effect/getSpine/starzha.spine.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "1c20dc53-6c05-4919-9cd8-55838568b25d",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/prefab/pop/Rward.prefab

@@ -0,0 +1,284 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Rward",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1080,
+      "height": 1920
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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.Node",
+    "_name": "New Sprite(Splash)",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 150,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1080,
+      "height": 1920
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "bcCjyvB1tKmZrkzvzwccI3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "f30d3ipM7dP6JubTtb9L2yZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "rewardNode": {
+      "__uuid__": "50bf5efc-889c-4eed-985a-4e204247a251"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/prefab/pop/Rward.prefab.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "42afc6d4-1976-49c6-9595-91e157447e82",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/prefab/pop/rewardNode.prefab

@@ -0,0 +1,652 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "rewardNode",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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.Node",
+    "_name": "starzha",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 763.62,
+      "height": 763.62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": true,
+    "premultipliedAlpha": false,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "animation",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 0,
+    "_isAniComplete": true,
+    "_N$skeletonData": {
+      "__uuid__": "62ae7eaa-1552-4465-9696-f6220311642a"
+    },
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3246SrjZtDCqJjcNjLJoSJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "coin",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 86,
+      "height": 98
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.5,
+        1.5,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "b94c323b-3d26-4684-ba64-0f00a13438d2"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "40yFZaE/dBDrxorfDNFUMC",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "freeze",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 238,
+      "height": 284
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.6,
+        0.6,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a8496263-a191-44c8-b3d8-d1e7cd275fdf"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c5266WhWxF3plZF/PuHtKD",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "hammer",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 306,
+      "height": 316
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.6,
+        0.6,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "bca46f6f-1c18-46c4-b7ee-2b28d311a5ae"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "72MartNEJAL6ekj/G4vmuw",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "magic",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 286,
+      "height": 300
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        5.527,
+        -7.6,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.6,
+        0.6,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "7ddd5001-543c-4725-ba8d-4e97668eb297"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "12il4hk6JFpoeVFTlRc+fT",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/prefab/pop/rewardNode.prefab.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "50bf5efc-889c-4eed-985a-4e204247a251",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/shop/script/shop.ts

@@ -13,7 +13,6 @@ export default class NewClass extends cc.Component {
     //商品列表
     @property(cc.Node)
     itemList: cc.Node = null;
-    // onLoad () {}
 
     //金币数量
     @property(cc.Node)
@@ -57,7 +56,10 @@ export default class NewClass extends cc.Component {
         this.btn_Touch = true;
         this.openShop();
         this.setHealthInfo();
+    }
 
+    init() {
+        this.btn_Touch = true;
     }
     //打开商店界面
     openShop() {
@@ -148,10 +150,12 @@ export default class NewClass extends cc.Component {
 
     onShow() {
         if (cc.sys.platform === cc.sys.WECHAT_GAME) {
+            console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosOutTradeNo);
             if (cc.fx.GameConfig.GM_INFO.iosOutTradeNo != null && cc.fx.GameConfig.GM_INFO.iosOutTradeNo != "") {
-                //console.log("有苹果订单号，开始轮训");
+                console.log("有苹果订单号，开始轮训");
                 const iosOutTradeNo = cc.fx.GameConfig.GM_INFO.iosOutTradeNo;
                 cc.fx.GameConfig.GM_INFO.iosOutTradeNo = "";
+                this.openLoad();
                 Utils.getIosPayInfo(iosOutTradeNo,
                     (data) => {
                         console.log("获得轮训结果:", data);
@@ -167,7 +171,8 @@ export default class NewClass extends cc.Component {
                             cc.fx.GameTool.shushu_Track("payment", dataSuccess);
                             let name = "购买金币道具:" + this.iosProductId;
                             MiniGameSdk.API.yinli_Pay(this.iosPrice, iosOutTradeNo, name)
-                            Utils.setPayInfo((res) => {
+                            Utils.setPayInfo(
+                                (res) => {
                                     this.closeLoad();
                                     //console.log("设置轮训结果:", res);
                                     if (res.code === 1) {
@@ -194,12 +199,13 @@ export default class NewClass extends cc.Component {
                                     else if (this.node.parent.getComponent("SceneManager")) {
                                         this.node.parent.getComponent("SceneManager").updateCoin();
                                     }
-                            }, null)
+                                }, iosOutTradeNo)
                         }
                         else if (data.code == 0) {
                             console.log("用户自己取消充值");
                             MiniGameSdk.API.showToast("充值失败");
                             this.closeLoad();
+                            this.btn_Touch = true;
                             const dataFail = {
                                 outTradeNo: iosOutTradeNo,
                                 price: this.iosPrice,
@@ -356,7 +362,9 @@ export default class NewClass extends cc.Component {
             this.iosPrice = price;
             this.iosProductId = productId;
             this.iosCount = 1;
-            Utils.GoKEFu(iosPayInfo);
+            Utils.GoKEFu(iosPayInfo, (res) => {
+                this.closeLoad();
+            });
         }
         else {
             const data = {
@@ -437,7 +445,8 @@ export default class NewClass extends cc.Component {
                             let name = "购买金币道具:" + productId;
                             MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name)
                             //console.log("7.14_______________充值成功，轮训成功，准备发货");
-                            Utils.setPayInfo((res) => {
+                            Utils.setPayInfo(
+                                (res) => {
                                     //console.log("设置轮训结果:", res);
                                     if (res.code === 1) {
                                         //console.log("7.14_________正式发货");