yangzhao/cb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	assets/Script/JiaZai.ts
This commit is contained in:
YZ\249929363 2025-08-08 16:20:01 +08:00
parent c336935589 1a6096406e
commit 57bb8f0e21
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/Script/JiaZai.ts
View File

@ -988,7 +988,8 @@ export default class JiaZai extends cc.Component {
}
//获取月卡有效期距离今天的天数
getMonthlyCardValidityDays(): Promise<number> {
getMonthlyCardValidityDays(): Promise<{ days: number, time: number }> {
console.log("________________2");
return new Promise((resolve, reject) => {
Utils.getMonthlyCard((data) => {
@ -1006,9 +1007,14 @@ 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 {

11
assets/Script/monthlyCard.ts
View File

@ -193,8 +193,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")