diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index a209036..fd3f3c2 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -1015,11 +1015,11 @@ export default class JiaZai extends cc.Component { cc.fx.GameConfig.GM_INFO.monthTime = remainingDays; resolve(remainingDays); } else { - resolve(0); // 或 reject(data) 根据需要 + // resolve(0); // 或 reject(data) 根据需要 } } else { - resolve(0); // 或 reject(data) 根据需要 + // resolve(0); // 或 reject(data) 根据需要 } }); }); diff --git a/assets/Script/Revive.ts b/assets/Script/Revive.ts index 9796f1b..028931c 100644 --- a/assets/Script/Revive.ts +++ b/assets/Script/Revive.ts @@ -181,7 +181,6 @@ export default class Revive extends cc.Component { let shopComp = shop.getComponent("shop"); if (shopComp) { shopComp.openShop(); - shopComp.init(); } } cc.fx.GameConfig.GM_INFO.revive = 1; diff --git a/assets/Script/module/Pay/Utils.ts b/assets/Script/module/Pay/Utils.ts index 6ae8321..7f0ac64 100644 --- a/assets/Script/module/Pay/Utils.ts +++ b/assets/Script/module/Pay/Utils.ts @@ -62,6 +62,7 @@ export default class Utils { payment_num: 1, type: systemType, } + console.log("创建订单", Utils.outTradeNo); cc.fx.GameTool.shushu_Track("init_order", data); //console.log("创建的最新订单的订单号:", Utils.outTradeNo); // let timeoutId: number; @@ -186,7 +187,7 @@ export default class Utils { payment_num: iosPayInfo.payment_count, type: "ios", } - //console.log("ios创建订单信息:", data); + console.log("ios创建订单信息:", data); cc.fx.GameTool.shushu_Track("init_order", shushu_data); //@ts-ignore wx.openCustomerServiceConversation({ @@ -208,7 +209,7 @@ export default class Utils { ...Array(3).fill(1000), ...Array(5).fill(2000), ...Array(6).fill(5000), - ...Array(5).fill(15000) + ...Array(5).fill(10000) ]; let attempt = 0; // 轮询次数 const iosOutTradeNo = order; @@ -223,8 +224,8 @@ export default class Utils { //console.log("请求uid:" + Utils.uid); //console.log("outTradeNo:" + iosOutTradeNo); Utils.POST("wx/iosgetPayInfo", { outTradeNo: iosOutTradeNo }, res => { - //console.log("查询字符结果IOS"); - //console.log(res); + console.log("查询字符结果IOS"); + console.log(res); if (res.code === 1) { callBack(res); } else if (res.code === 0) { @@ -243,6 +244,8 @@ export default class Utils { } + + //#endregion //#region 微信云 diff --git a/assets/Script/monthlyCard.ts b/assets/Script/monthlyCard.ts index a0978e2..2a52100 100644 --- a/assets/Script/monthlyCard.ts +++ b/assets/Script/monthlyCard.ts @@ -232,7 +232,6 @@ export default class NewClass extends cc.Component { let shopComp = shop.getComponent("shop"); if (shopComp) { shopComp.openShop(); - shopComp.init(); } } diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index a688ef6..bc0d873 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -200,19 +200,23 @@ export default class NewClass extends cc.Component { if (systemInfo.platform === 'ios') { if (cc.sys.platform === cc.sys.WECHAT_GAME) { console.log("从后台进入前台订单号:", cc.fx.GameConfig.GM_INFO.iosOutTradeNo); - this.closeLoad(); if (cc.fx.GameConfig.GM_INFO.iosOutTradeNo != null && cc.fx.GameConfig.GM_INFO.iosOutTradeNo != "") { console.log("有苹果订单号,开始轮训"); const iosOutTradeNo = cc.fx.GameConfig.GM_INFO.iosOutTradeNo; cc.fx.GameConfig.GM_INFO.iosOutTradeNo = ""; - this.openLoad(); + // this.closeLoad(); + // this.openLoad(); this.btn_Touch = true; + Utils.getIosPayInfo(iosOutTradeNo, (data) => { console.log("获得轮训结果:", data); const iosID = data.data?.payment_name || this.iosProductId; let iosAmount = data.data?.goodsPrice || this.iosPrice; iosAmount = parseInt(iosAmount); + if (iosID == "reborn_Gift" || iosID == "month_Card") { + return; + } if (data.code == 1) { console.log("购买成功"); console.log("商品id:", iosID); @@ -292,7 +296,7 @@ export default class NewClass extends cc.Component { } cc.fx.GameTool.shushu_Track("payment_fail", dataFail); } - + this.closeLoad(); this.btn_Touch = true; cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; }) @@ -466,7 +470,6 @@ export default class NewClass extends cc.Component { console.error('获取系统信息失败', e); } - // Utils.GoKEFu(); if (systemType == "ios") { // MiniGameSdk.API.showToast("IOS系统暂不支持支付"); // this.btn_Touch = true; @@ -483,7 +486,14 @@ export default class NewClass extends cc.Component { console.log("准备跳客服回话:"); console.log(this.iosProductId); Utils.GoKEFu(iosPayInfo, (res) => { - this.closeLoad(); + if (res == "success") { + console.log("客服回话成功"); + } + else { + console.log("客服回话失败"); + cc.fx.GameConfig.GM_INFO.iosOutTradeNo = null; + this.closeLoad(); + } }); } else { @@ -715,11 +725,6 @@ export default class NewClass extends cc.Component { } } openmonthCard() { - if (cc.sys.platform === cc.sys.WECHAT_GAME && this.onShowListener) { - console.log("shop移除onshow11111"); - //@ts-ignore - wx.offShow(this.onShowListener); - } const winCOIN = cc.find("Canvas"); // 假设 Canvas 节点 if (winCOIN) { const wincoin = winCOIN.getComponent(SceneManager);