diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 1ffc4b1..64ccdc9 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -988,7 +988,8 @@ export default class JiaZai extends cc.Component { } //获取月卡有效期距离今天的天数 - getMonthlyCardValidityDays(): Promise { + getMonthlyCardValidityDays(): Promise<{ days: number, time: number }> { + console.log("________________2"); return new Promise((resolve, reject) => { Utils.getMonthlyCard((data) => { @@ -1006,13 +1007,18 @@ export default class JiaZai extends cc.Component { const days = Math.floor(diffMs / 86400000); const remainingDays = Math.max(0, days); cc.fx.GameConfig.GM_INFO.monthTime = remainingDays; - resolve(remainingDays); + let obj = { + days: remainingDays, + time: validityTime, + } + resolve(obj); + } else { - resolve(0); // 或 reject(data) 根据需要 + // resolve(0); // 或 reject(data) 根据需要 } } else { - resolve(0); // 或 reject(data) 根据需要 + // resolve(0); // 或 reject(data) 根据需要 } }); }); diff --git a/assets/Script/monthlyCard.ts b/assets/Script/monthlyCard.ts index a0978e2..4a03805 100644 --- a/assets/Script/monthlyCard.ts +++ b/assets/Script/monthlyCard.ts @@ -192,8 +192,12 @@ export default class NewClass extends cc.Component { if (jiazaiComp) { console.log("获取到JiaZai组件", jiazaiComp); jiazaiComp.getMonthlyCardValidityDays().then(days => { - cc.fx.GameConfig.GM_INFO.monthTime = days; - NumberToImage.numberToImageNodes(days, 35, 20, "month_", this.monthCardTime, true); + cc.fx.GameConfig.GM_INFO.monthTime = days.days; + //本地储存当前服务器时间 + let dateStr = new Date(days.time); + cc.fx.StorageMessage.setStorage("mCardDate", dateStr); + NumberToImage.numberToImageNodes(days.days, 35, 20, "month_", this.monthCardTime, true); + }); setTimeout(() => { jiazaiComp.setHealthInfo(false); @@ -247,7 +251,8 @@ export default class NewClass extends cc.Component { const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 const jiazaiComp = jiazaiNode.getComponent(JiaZai); - if (jiazaiComp && this.home == 1 && cc.fx.GameConfig.GM_INFO.hp == 7) { + if (jiazaiComp && this.home == 1 && cc.fx.GameConfig.GM_INFO.hp_Max == 7) { + this.home = 0; jiazaiComp.rewarded(); console.log("123iiiii222")