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

修改成30天

Browse Source
This commit is contained in:
huanghaipeng 2025-11-11 19:49:47 +08:00
parent 78dd6775ff
commit 4da76c8622
3 changed files with 145 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
assets/Script/JiaZai.ts
View File

@ -236,11 +236,7 @@ export default class JiaZai extends cc.Component {
return; return;
} }
JiaZai.cachedPassCheckPrefab = prefab; JiaZai.cachedPassCheckPrefab = prefab;
//等级大于21开启
if (cc.fx.GameConfig.GM_INFO.level >= 21) {
let top = this.node.getChildByName("Load").getChildByName("Top");
top.getChildByName("passBtn").active = true;
};
}); });
}); });
@ -418,7 +414,7 @@ export default class JiaZai extends cc.Component {
}; };
if (cc.fx.GameConfig.GM_INFO.level >= 21) { if (cc.fx.GameConfig.GM_INFO.level >= 21) {
let top = this.node.getChildByName("Load").getChildByName("Top"); let top = this.node.getChildByName("Load").getChildByName("Top");
top.getChildByName("passBtn").active = true; // top.getChildByName("passBtn").active = false;
let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); let xinshouNode = this.Stamina.parent.getChildByName("xinshou");
if (xinshouNode) { if (xinshouNode) {
@ -428,7 +424,7 @@ export default class JiaZai extends cc.Component {
} }
} else { } else {
let top = this.node.getChildByName("Load").getChildByName("Top"); let top = this.node.getChildByName("Load").getChildByName("Top");
top.getChildByName("passBtn").active = false; // top.getChildByName("passBtn").active = false;
let xinshouNode = this.Stamina.parent.getChildByName("xinshou"); let xinshouNode = this.Stamina.parent.getChildByName("xinshou");
if (xinshouNode) { if (xinshouNode) {
xinshouNode.y = -710; xinshouNode.y = -710;
@ -1914,7 +1910,7 @@ export default class JiaZai extends cc.Component {
console.log("解析后的 progressLevel:", passCheck[2].activate); console.log("解析后的 progressLevel:", passCheck[2].activate);
} catch (e) { } catch (e) {
console.error("JSON 解析失败:", e); console.error("JSON 解析失败:", e);
let endTiem = data.data.time + 60 * 24 * 60 * 60 * 1000; let endTiem = data.data.time + 30 * 24 * 60 * 60 * 1000;
let passCheckData = { let passCheckData = {
1: { 1: {
time: "0", time: "0",
@ -1947,7 +1943,7 @@ export default class JiaZai extends cc.Component {
} }
} }
// console.log("passCheck:", passCheck.time, Number(passCheck[2].time), passCheck.time > Number(passCheck[2].time)); // console.log("passCheck:", passCheck.time, Number(passCheck[2].time), passCheck.time > Number(passCheck[2].time));
if (passCheck.time > Number(passCheck[2].time)) { if (passCheck && passCheck.time !== undefined && passCheck.time > Number(passCheck[2].time)) {
this.checkAndSetPlayerPassLevel(); this.checkAndSetPlayerPassLevel();
} }
if (passCheck) { if (passCheck) {
@ -1999,7 +1995,7 @@ export default class JiaZai extends cc.Component {
} }
cc.fx.GameConfig.GM_INFO.getItemType = 2; cc.fx.GameConfig.GM_INFO.getItemType = 2;
if (passCheckData == null || passCheckData == "null" || !passCheckData[2] || !passCheckData[2].time) { if (passCheckData == null || passCheckData == "null" || !passCheckData[2] || !passCheckData[2].time) {
let endTiem = res.data.time + 60 * 24 * 60 * 60 * 1000; let endTiem = res.data.time + 30 * 24 * 60 * 60 * 1000;
passCheckData = { passCheckData = {
1: { 1: {
time: "0", time: "0",
@ -2025,7 +2021,7 @@ export default class JiaZai extends cc.Component {
// passCheckData[2].time = res.data.time; // passCheckData[2].time = res.data.time;
passCheckData[1] = JSON.parse(JSON.stringify(passCheckData[2])); passCheckData[1] = JSON.parse(JSON.stringify(passCheckData[2]));
passCheckData[2] = { passCheckData[2] = {
time: res.data.time + 60 * 24 * 60 * 60 * 1000, time: res.data.time + 30 * 24 * 60 * 60 * 1000,
progress: 1, progress: 1,
progressLevel: 1, progressLevel: 1,
activate: false, activate: false,
@ -2104,148 +2100,160 @@ export default class JiaZai extends cc.Component {
let self = this; let self = this;
Utils.getPassCheckInfo((data) => { Utils.getPassCheckInfo((data) => {
if (data.code == 1) { if (data.code == 1) {
let top = self.node.getChildByName("Load").getChildByName("Top");
if (data.data.time == null) { if (data.data.time == null) {
let top = self.node.getChildByName("Load").getChildByName("Top");
top.getChildByName("passBtn").active = false; top.getChildByName("passBtn").active = false;
} else { } else {
cc.fx.GameConfig.GM_INFO.getItemType = 2; // 获取服务器时间
if (data.data.passCheck == null || data.data.passCheck == "null") { let serverTime = Number(data.data.time);
// let endTiem = data.data.time + 60 * 24 * 60 * 60 * 1000; // 获取当前时间
let endTiem = data.data.time + 60 * 24 * 60 * 60 * 1000; let now = new Date().getTime();
let dataInfo = { console.log("服务器时间", serverTime, now);
1: { if (now < serverTime) {
time: "0",
progress: 0,
progressLevel: 0,
activate: false,
free: [],
passCheck: [],
},
2: {
time: endTiem.toString(),
progress: 1,
progressLevel: 1,
activate: false,
free: [1],
passCheck: [1],
}
}
Utils.setPassCheckInfo(() => { top.getChildByName("passBtn").active = false;
}, dataInfo)
cc.fx.GameConfig.GM_INFO.getProgressLevel = 1;
cc.fx.GameConfig.GM_INFO.getProgress = 1;
} else { } else {
let passCheckLvObj = null; top.getChildByName("passBtn").active = true;
let parsedData = null; cc.fx.GameConfig.GM_INFO.getItemType = 2;
if (typeof data.data.passCheck === 'string') { if (data.data.passCheck == null || data.data.passCheck == "null") {
try { // let endTiem = data.data.time + 30 * 24 * 60 * 60 * 1000;
parsedData = JSON.parse(data.data.passCheck); let endTiem = data.data.time + 30 * 24 * 60 * 60 * 1000;
passCheckLvObj = parsedData[2]; let dataInfo = {
} catch (e) { 1: {
console.error("通行证数据解析失败:", e); time: "0",
progress: 0,
progressLevel: 0,
activate: false,
free: [],
passCheck: [],
},
2: {
time: endTiem.toString(),
progress: 1,
progressLevel: 1,
activate: false,
free: [1],
passCheck: [1],
}
} }
Utils.setPassCheckInfo(() => {
}, dataInfo)
cc.fx.GameConfig.GM_INFO.getProgressLevel = 1;
cc.fx.GameConfig.GM_INFO.getProgress = 1;
} else { } else {
passCheckLvObj = data.data.passCheck[2]; let passCheckLvObj = null;
} let parsedData = null;
if (!parsedData || !parsedData[1] || !parsedData[1].time || !parsedData[2] || !parsedData[2].time) { if (typeof data.data.passCheck === 'string') {
self.qinglishuju(); try {
return; parsedData = JSON.parse(data.data.passCheck);
} passCheckLvObj = parsedData[2];
let serverTime = Number(data.data.time); } catch (e) {
let time1 = Number(parsedData[1].time); console.error("通行证数据解析失败:", e);
let time2 = Number(parsedData[2].time);
// let allExpire = time2 + 30 * 24 * 60 * 60 * 1000;
// let newTime = serverTime + 60 * 24 * 60 * 60 * 1000;
// let allExpire = time2 + 2 * 60 * 1000 + 30 * 1000; // 2 结束后 2分30秒
// let newTime = serverTime + 5 * 60 * 1000; // 当前期的结束时间
// let outTime = time1 + 2 * 60 * 1000 + 30 * 1000; // 1的清理时间
let allExpire = time2 + 60 * 24 * 60 * 60 * 1000; // 2 结束后 2分30秒
let newTime = serverTime + 60 * 24 * 60 * 60 * 1000; // 当前期的结束时间
let outTime = time1 + 60 * 24 * 60 * 60 * 1000; // 1的清理时间
let now = new Date().getTime();
if (serverTime >= allExpire) {
// 清空数据
self.qinglishuju();
return;
} else {
if (serverTime >= time2 && serverTime < allExpire) {
let isGetItem = false;
if (passCheckLvObj.activate) {
for (let i = 0; i < passCheckLvObj.free.length; i++) {
if (passCheckLvObj.free[i] == 1 || passCheckLvObj.passCheck[i] == 1) {
isGetItem = true;
}
}
} else {
for (let i = 0; i < passCheckLvObj.free.length; i++) {
if (passCheckLvObj.free[i] == 1) {
isGetItem = true;
}
}
} }
if (isGetItem) {
// 未领完
parsedData[1] = JSON.parse(JSON.stringify(parsedData[2]));
parsedData[2] = {
time: newTime.toString(),
progress: 1,
progressLevel: 1,
activate: false,
free: [1],
passCheck: [1],
}
cc.fx.GameConfig.GM_INFO.getItemType = 1;
cc.fx.GameConfig.GM_INFO.getProgressLevel = 1;
cc.fx.GameConfig.GM_INFO.getProgress = 1;
cc.fx.StorageMessage.setStorage("ProgressIndex", 1);
Utils.setPassCheckInfo(() => { }, parsedData)
return;
} else {
// 清空数据
self.qinglishuju();
return;
}
} else { } else {
// 正常赋值 passCheckLvObj = data.data.passCheck[2];
if (time2 == newTime) { }
if (now < outTime) { if (!parsedData || !parsedData[1] || !parsedData[1].time || !parsedData[2] || !parsedData[2].time) {
let isGetItem = false; self.qinglishuju();
if (parsedData[1].activate) { return;
for (let i = 0; i < parsedData[1].free.length; i++) { }
if (parsedData[1].free[i] == 1 || parsedData[1].passCheck[i] == 1) { let serverTime = Number(data.data.time);
isGetItem = true; let time1 = Number(parsedData[1].time);
} let time2 = Number(parsedData[2].time);
// let allExpire = time2 + 30 * 24 * 60 * 60 * 1000;
// let newTime = serverTime + 30 * 24 * 60 * 60 * 1000;
// let allExpire = time2 + 2 * 60 * 1000 + 30 * 1000; // 2 结束后 2分30秒
// let newTime = serverTime + 5 * 60 * 1000; // 当前期的结束时间
// let outTime = time1 + 2 * 60 * 1000 + 30 * 1000; // 1的清理时间
let allExpire = time2 + 30 * 24 * 60 * 60 * 1000; // 2 结束后 2分30秒
let newTime = serverTime + 30 * 24 * 60 * 60 * 1000; // 当前期的结束时间
let outTime = time1 + 30 * 24 * 60 * 60 * 1000; // 1的清理时间
let now = new Date().getTime();
if (serverTime >= allExpire) {
// 清空数据
self.qinglishuju();
return;
} else {
if (serverTime >= time2 && serverTime < allExpire) {
let isGetItem = false;
if (passCheckLvObj.activate) {
for (let i = 0; i < passCheckLvObj.free.length; i++) {
if (passCheckLvObj.free[i] == 1 || passCheckLvObj.passCheck[i] == 1) {
isGetItem = true;
} }
} else {
for (let i = 0; i < parsedData[1].free.length; i++) {
if (parsedData[1].free[i] == 1) {
isGetItem = true;
}
}
}
if (isGetItem) {
cc.fx.GameConfig.GM_INFO.getItemType = 1;
} else {
cc.fx.GameConfig.GM_INFO.getItemType = 2;
} }
} else { } else {
for (let i = 0; i < passCheckLvObj.free.length; i++) {
if (passCheckLvObj.free[i] == 1) {
isGetItem = true;
}
}
}
if (isGetItem) {
// 未领完
parsedData[1] = JSON.parse(JSON.stringify(parsedData[2]));
cc.fx.GameConfig.GM_INFO.getItemType = 2; parsedData[2] = {
time: newTime.toString(),
progress: 1,
progressLevel: 1,
activate: false,
free: [1],
passCheck: [1],
}
cc.fx.GameConfig.GM_INFO.getItemType = 1;
cc.fx.GameConfig.GM_INFO.getProgressLevel = 1;
cc.fx.GameConfig.GM_INFO.getProgress = 1;
cc.fx.StorageMessage.setStorage("ProgressIndex", 1);
Utils.setPassCheckInfo(() => { }, parsedData)
return;
} else {
// 清空数据
self.qinglishuju();
return;
} }
} else {
// 正常赋值
if (time2 == newTime) {
if (now < outTime) {
let isGetItem = false;
if (parsedData[1].activate) {
for (let i = 0; i < parsedData[1].free.length; i++) {
if (parsedData[1].free[i] == 1 || parsedData[1].passCheck[i] == 1) {
isGetItem = true;
}
}
} else {
for (let i = 0; i < parsedData[1].free.length; i++) {
if (parsedData[1].free[i] == 1) {
isGetItem = true;
}
}
}
if (isGetItem) {
cc.fx.GameConfig.GM_INFO.getItemType = 1;
} else {
cc.fx.GameConfig.GM_INFO.getItemType = 2;
}
} else {
cc.fx.GameConfig.GM_INFO.getItemType = 2;
}
}
} }
} }
}
cc.fx.GameConfig.GM_INFO.getProgressLevel = (passCheckLvObj && passCheckLvObj.progressLevel) || 1; cc.fx.GameConfig.GM_INFO.getProgressLevel = (passCheckLvObj && passCheckLvObj.progressLevel) || 1;
cc.fx.GameConfig.GM_INFO.getProgress = (passCheckLvObj && passCheckLvObj.progress) || 1; cc.fx.GameConfig.GM_INFO.getProgress = (passCheckLvObj && passCheckLvObj.progress) || 1;
}
} }
} }
} }

6
assets/Script/Map.ts
View File

@ -2162,8 +2162,8 @@ export default class MapConroler extends cc.Component {
} }
cc.fx.GameConfig.GM_INFO.getItemType = 2; cc.fx.GameConfig.GM_INFO.getItemType = 2;
if (passCheckData == null || passCheckData == "null" || !passCheckData[2] || !passCheckData[2].time) { if (passCheckData == null || passCheckData == "null" || !passCheckData[2] || !passCheckData[2].time) {
// let endTiem = data.data.time + 60 * 24 * 60 * 60 * 1000; // let endTiem = data.data.time + 30 * 24 * 60 * 60 * 1000;
let endTiem = res.data.time + 60 * 24 * 60 * 60 * 1000; let endTiem = res.data.time + 30 * 24 * 60 * 60 * 1000;
passCheckData = { passCheckData = {
1: { 1: {
time: "0", time: "0",
@ -2189,7 +2189,7 @@ export default class MapConroler extends cc.Component {
// passCheckData[2].time = res.data.time; // passCheckData[2].time = res.data.time;
passCheckData[1] = JSON.parse(JSON.stringify(passCheckData[2])); passCheckData[1] = JSON.parse(JSON.stringify(passCheckData[2]));
passCheckData[2] = { passCheckData[2] = {
time: res.data.time + 60 * 24 * 60 * 60 * 10000, time: res.data.time + 30 * 24 * 60 * 60 * 10000,
progress: 1, progress: 1,
progressLevel: 1, progressLevel: 1,
activate: false, activate: false,

2
assets/shop/script/passCheck.ts
View File

@ -118,7 +118,7 @@ export default class passCheck extends cc.Component {
// const now = new Date().getTime(); // const now = new Date().getTime();
// // 计算结束时间（开始时间 + 60天） // // 计算结束时间（开始时间 + 60天）
// this.endTime = passCheck.time + (60 * 24 * 60 * 60 * 1000); // 开始时间 + 60天的毫秒数 // this.endTime = passCheck.time + (30 * 24 * 60 * 60 * 1000); // 开始时间 + 60天的毫秒数
this.endTime = passCheck.time; this.endTime = passCheck.time;
if (typeof passCheck === 'string') { if (typeof passCheck === 'string') {