优化UI图片资源

assets/Script/JiaZai.ts

@@ -97,6 +97,19 @@ export default class JiaZai extends cc.Component {
         if (cc.fx.GameConfig.GM_INFO.first) {
             console.log("————————准备注册事件", cc.fx.GameConfig.GM_INFO.openid);
             const group = cc.fx.GameTool.setWechatGameGroup(2);
+            if (group == 0) {
+                cc.fx.GameConfig.GM_INFO.musicOpen = true;
+            }
+            else if (group == 1) {
+                cc.fx.GameConfig.GM_INFO.musicOpen = false;
+            }
+            const audioInfo = {
+                "musicOpen": cc.fx.GameConfig.GM_INFO.musicOpen,             //音乐
+                "effectOpen": cc.fx.GameConfig.GM_INFO.effectOpen,            //音效
+                "vibrateOpen": cc.fx.GameConfig.GM_INFO.vibrateOpen,           //震动
+            }
+            cc.fx.StorageMessage.setStorage("music", audioInfo);
+
             if (cc.fx.GameConfig.GM_INFO.openid != "") {
                 console.log("————————发送注册事件");
                 const time = cc.fx.GameTool.formatDate(new Date());
@@ -126,7 +139,7 @@ export default class JiaZai extends cc.Component {
         // console.log("关卡",cc.fx.GameConfig.GM_INFO.level+1);
 
         cc.fx.GameTool.getHealth(null);
-        // cc.fx.GameConfig.LEVEL_INFO_init(false,0);s
+        // cc.fx.GameConfig.LEVEL_INFO_init(false,0);
         setTimeout(() => {
             NumberToImage.numberToImageNodes((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "level_", this.level, true);
             NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true);

assets/Script/Map.ts

@@ -1369,6 +1369,12 @@ export default class MapConroler extends cc.Component {
             // console.log("即将上报成功________________________:",this.add_Time);
             // console.log("成功消除一个",this.add_Time);
             cc.fx.GameTool.changeCoin(40);
+            const data = {
+                change_reason: "闯关成功获得金币",
+                id: (1001 + ""),
+                num: 40
+            }
+            cc.fx.GameTool.shushu_Track("resource_get", data);
             let overTime = Date.now();
             this.count_Time = overTime - this.count_Time;
             cc.fx.GameTool.addLevel(this.count_Time, this.add_Time);
@@ -1507,6 +1513,12 @@ export default class MapConroler extends cc.Component {
     runRewive(data) {
         console.log("复活回调函数内", data);
         cc.fx.GameTool.changeCoin(data.coin);
+        const dataTemp = {
+            change_reason: "游戏内复活消耗金币",
+            id: (1001 + ""),
+            num: data.coin
+        }
+        cc.fx.GameTool.shushu_Track("resource_cost", dataTemp);
         MiniGameSdk.API.showToast("继续游戏");
         NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true);
         if (data.type == "time") {
@@ -1751,6 +1763,7 @@ export default class MapConroler extends cc.Component {
                     cc.fx.GameTool.setUserProp(2001, cc.fx.GameConfig.GM_INFO.freezeAmount, (data) => {
                     })
                     let data = {
+                        change_reason: "使用道具",
                         id: "2001",
                         num: -1
                     }
@@ -1870,6 +1883,7 @@ export default class MapConroler extends cc.Component {
                     cc.fx.GameTool.setUserProp(2002, cc.fx.GameConfig.GM_INFO.hammerAmount, (data) => {
                     })
                     let data = {
+                        change_reason: "使用道具",
                         id: "2002",
                         num: -1
                     }
@@ -1983,6 +1997,7 @@ export default class MapConroler extends cc.Component {
                     cc.fx.GameTool.setUserProp(2003, cc.fx.GameConfig.GM_INFO.magicAmount, (data) => {
                     })
                     let data = {
+                        change_reason: "使用道具",
                         id: "2003",
                         num: -1
                     }

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);

assets/Script/heathnum.ts

@@ -70,6 +70,12 @@ export default class NewClass extends cc.Component {
         if (curCoin >= 1000) {
             this.switchButtons[1].active = false;
             cc.fx.GameTool.changeCoin(-1000);
+            const data = {
+                change_reason: "首页购买体力",
+                id: (1001 + ""),
+                num: -1000
+            }
+            cc.fx.GameTool.shushu_Track("resource_cost", data);
             cc.fx.GameConfig.GM_INFO.hp = 5;
             const parentNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点
             if (parentNode) {
@@ -83,6 +89,15 @@ export default class NewClass extends cc.Component {
             cc.fx.GameTool.setUserHealth(0, (data) => {
                 cc.fx.GameTool.getHealth(null);
             })
+            const buyData = {
+                item_id: "refill_health",
+                item_num: 3,
+                item_price: 1000,
+                cost_type: "gold"
+            }
+            console.log("____________即将上传Shop_buy", buyData);
+            cc.fx.GameTool.shushu_Track("shop_buy", buyData);
+
         }
         else {
             MiniGameSdk.API.showToast("金币不足，无法购买体力");

assets/Script/module/Config/GameConfig.ts

@@ -83,7 +83,7 @@ export class GameConfig {
         first: boolean; //是否首次进入游戏
         score: number; //总得分
         scale: number; //玩家总计成功点火数
-        iosOutTradeNo: number; //ios订单号
+        iosOutTradeNo: string; //ios订单号
         min_Time: number; //体力恢复的剩余时间
         freezeAmount: number; //冻结道具次数
         hammerAmount: number; //锤子道具次数
@@ -220,7 +220,7 @@ export class GameConfig {
             first: false,                      //是否首次进入游戏
             score: 0,                    //总得分
             scale: 1,             //玩家总计成功点火数
-            iosOutTradeNo: 0,                //ios订单号
+            iosOutTradeNo: "",                //ios订单号
             min_Time: 0,                  //体力恢复的剩余时间
             freezeAmount: 0,              //冻结道具次数
             hammerAmount: 0,              //锤子道具次数

assets/Script/module/Pay/Utils.ts

@@ -134,22 +134,35 @@ export default class Utils {
         });
     }
     static getIosPayInfo(callBack) {
+        const delays = [1000, 10000, 30000, 60000, 60000]; // 延迟时间数组
+        let attempt = 0; // 轮询次数
+
+        const poll = () => {
+            if (attempt >= delays.length) {
+                callBack({ code: 0, data: null, message: '轮询超时' });
+                return;
+            }
+
             console.log("请求uid:" + Utils.uid);
-        console.log("outTradeNo:"+this.outTradeNo);
+            console.log("outTradeNo:" + cc.fx.GameConfig.GM_INFO.iosOutTradeNo);
-        Utils.POST("wx/iosgetPayInfo",{outTradeNo:Utils.outTradeNo},res=>{
+            Utils.POST("wx/iosgetPayInfo", { outTradeNo: cc.fx.GameConfig.GM_INFO.iosOutTradeNo }, res => {
-            console.log("查询字符结果");
+                console.log("查询字符结果IOS");
                 console.log(res);
-            if(res.code==1){
+                if (res.code === 1) {
-                if(res.data){
+                    callBack(res);
-                    callBack("充值取消");
                     cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null;
-                }else{
+                } else if (res.code === 0) {
-                    callBack("充值成功");
+                    callBack(res);
                     cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null;
                 }
+                else {
+                    attempt++;
+                    setTimeout(poll, delays[attempt - 1]);
                 }
             });
+        };
 
+        poll();
     }
 
 

assets/Script/module/Tool/GameTool.ts

@@ -644,9 +644,16 @@ var GameTool = {
                 num = 1;
             }
             cc.fx.GameTool.changeCoin(-cost);
+            const dataTemp = {
+                change_reason: "商城购买道具消耗",
+                id: (1001 + ""),
+                num: -cost
+            }
+            cc.fx.GameTool.shushu_Track("resource_cost", dataTemp);
             cc.fx.GameTool.setUserProp(propid, num, (data) => {
             })
             const data = {
+                change_reason: "商城购买道具",
                 id: (propid + ""),
                 num: 3
             }
@@ -828,6 +835,7 @@ var GameTool = {
     shopBuy(productId) {
         let coin = 0;
         let price = 0;
+        let getCoin = 0;
         switch (productId) {
             case "gold_1":
                 cc.fx.GameTool.changeCoin(1200);
@@ -866,6 +874,13 @@ var GameTool = {
                 MiniGameSdk.API.showToast("充值成功，获得240000金币");
                 break;
         }
+        const dataTemp = {
+            change_reason: "商城RMB购买金币",
+            id: (1001 + ""),
+            num: coin
+        }
+        cc.fx.GameTool.shushu_Track("resource_get", dataTemp);
+
         const buyData = {
             item_id: productId,
             item_num: coin,
@@ -927,14 +942,14 @@ var GameTool = {
                 break;
             case "resource_get":
                 eventData = {
-                    change_reason: "购买道具",   //获得来源
+                    change_reason: data.change_reason,   //获得来源
                     change_num: data.num,       //获得数量
                     resource_id: data.id        //道具id
                 }
                 break;
             case "resource_cost":
                 eventData = {
-                    change_reason: "使用道具",   //获得来源
+                    change_reason: data.change_reason,   //获得来源
                     change_num: data.num,       //获得数量
                     resource_id: data.id        //道具id
                 }

assets/TextureBg/pop_Bg/tanchuang1.png.meta

@@ -1,38 +0,0 @@
-{
-  "ver": "2.3.7",
-  "uuid": "8ac53103-5eab-4857-b56c-2d055f0be6e3",
-  "importer": "texture",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 1071,
-  "height": 1257,
-  "platformSettings": {},
-  "subMetas": {
-    "tanchuang1": {
-      "ver": "1.0.6",
-      "uuid": "f2dcf5a7-9beb-4773-ad55-45a2f827a912",
-      "importer": "sprite-frame",
-      "rawTextureUuid": "8ac53103-5eab-4857-b56c-2d055f0be6e3",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 1071,
-      "height": 1257,
-      "rawWidth": 1071,
-      "rawHeight": 1257,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/prefab/pop/heathpop.prefab

@@ -992,8 +992,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 98,
+      "width": 94,
-      "height": 98
+      "height": 90
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/shop/img/shop_1.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "d0d3a854-9f5c-486f-8a9e-ebd1c96b68b5",
+  "uuid": "9c710aa3-45b5-43fb-b76f-8d6af41a21d5",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -12,11 +12,11 @@
   "height": 2340,
   "platformSettings": {},
   "subMetas": {
-    "shop_2": {
+    "shop_1": {
       "ver": "1.0.6",
-      "uuid": "1880f261-dd18-4e9e-9f49-b2f194d5ef8f",
+      "uuid": "403aa689-5ef4-4978-978a-74b806e0760f",
       "importer": "sprite-frame",
-      "rawTextureUuid": "d0d3a854-9f5c-486f-8a9e-ebd1c96b68b5",
+      "rawTextureUuid": "9c710aa3-45b5-43fb-b76f-8d6af41a21d5",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/shop/img/shop_2.jpg.meta

@@ -1,38 +0,0 @@
-{
-  "ver": "2.3.7",
-  "uuid": "39980b3f-ffc1-450f-90bc-4861aa8c81fb",
-  "importer": "texture",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 1080,
-  "height": 2340,
-  "platformSettings": {},
-  "subMetas": {
-    "shop_2": {
-      "ver": "1.0.6",
-      "uuid": "5652a0a0-3753-477b-afbd-e68830208955",
-      "importer": "sprite-frame",
-      "rawTextureUuid": "39980b3f-ffc1-450f-90bc-4861aa8c81fb",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 1080,
-      "height": 2340,
-      "rawWidth": 1080,
-      "rawHeight": 2340,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/shop/prefab/shop.prefab

@@ -328,7 +328,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "1880f261-dd18-4e9e-9f49-b2f194d5ef8f"
+      "__uuid__": "403aa689-5ef4-4978-978a-74b806e0760f"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -4002,7 +4002,7 @@
     "component": "",
     "_componentId": "48bfeZuYFZE2qmgxbW2IigB",
     "handler": "buyProduct",
-    "customEventData": "gold_pack_5"
+    "customEventData": "gold_5"
   },
   {
     "__type__": "de906iE/HVHpI6VO7IMvKaI",

assets/shop/prefab/shop.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.3.2",
   "uuid": "b01ef5c5-2755-455d-acb4-ba3818f5e331",
   "importer": "prefab",
-  "optimizationPolicy": "AUTO",
+  "optimizationPolicy": "MULTI_INSTANCE",
   "asyncLoadAssets": false,
   "readonly": false,
   "subMetas": {}

assets/shop/script/shop.ts

@@ -53,6 +53,7 @@ export default class NewClass extends cc.Component {
     }
     //打开商店界面
     openShop() {
+        Utils.outTradeNo = null;
         // 商品数据数组
         const products = [
             { product_id: "gold_1", name: "金币包1", price: 600, coin: 1200, title: "3x2六档金币" },
@@ -126,6 +127,7 @@ protected update(dt: number): void {
             //@ts-ignore
             wx.offShow(this.onShowListener);
         }
+        Utils.outTradeNo = null;
         //销毁预制体
         if (this.node.parent.getComponent("JiaZai")) {
             this.node.parent.getComponent("JiaZai").closeShop();
@@ -141,6 +143,10 @@ protected update(dt: number): void {
             console.log("有苹果订单号，开始轮训");
             Utils.getIosPayInfo((data) => {
                 console.log("获得轮训结果:", data);
+                if (data.code == 1) {
+                    cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null;
+                    MiniGameSdk.API.showToast("购买金币成功");
+                }
             })
         }
     }
@@ -249,6 +255,7 @@ protected update(dt: number): void {
         // Utils.GoKEFu();
         if (systemType == "ios") {
             MiniGameSdk.API.showToast("IOS系统暂不支持支付");
+            this.btn_Touch = true;
             // Utils.GoKEFu();
         }
         else {
@@ -283,6 +290,7 @@ protected update(dt: number): void {
                         if (data.data.pay_state == 1) {
                             this.btn_Touch = true;
                             MiniGameSdk.API.showToast("取消充值");
+
                             const dataFail2 = {
                                 outTradeNo: Utils.outTradeNo,
                                 price: price,
@@ -291,8 +299,7 @@ protected update(dt: number): void {
                                 type: systemType,
                                 fail_reason: "用户取消支付",
                             }
-
+                            cc.fx.GameTool.shushu_Track("payment_fail", dataFail2);
-                            cc.fx.GameTool.shushu_Track("payment_fail",name);
                         }
                         else if (data.data.pay_state == 2) {
                             this.btn_Touch = true;

settings/builder.json

@@ -15,7 +15,7 @@
   "mainCompressionType": "subpackage",
   "mainIsRemote": false,
   "optimizeHotUpdate": false,
-  "md5Cache": true,
+  "md5Cache": false,
   "nativeMd5Cache": true,
   "encryptJs": true,
   "xxteaKey": "07ac496c-82b0-4f",