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

融合后

Browse Source
This commit is contained in:
COMPUTER\EDY 2025-11-28 16:12:21 +08:00
parent 1f943e53a5
commit f85bde1784
3 changed files with 98 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assets/Script/JiaZai.ts
View File

@ -2445,9 +2445,11 @@ export default class JiaZai extends cc.Component {
//获取入职排行榜 //获取入职排行榜
getSRank() { getSRank() {
this.LoadCareer(null); console.log("_________________________重新获取排行");
console.log("重新获取排行"); if (this.RankNode == null && this.RankNode == undefined) {
this.LoadCareer(() => {
Utils.getSRank(res => { Utils.getSRank(res => {
console.log("_________________________得到接口返回");
let data = JSON.parse(res.data); let data = JSON.parse(res.data);
let role = data.role; let role = data.role;
let sortedArray = []; let sortedArray = [];
@ -2508,6 +2510,7 @@ export default class JiaZai extends cc.Component {
rankData[i].rank = i + 1; rankData[i].rank = i + 1;
} }
if (this.RankNode != null && this.RankNode != undefined) { if (this.RankNode != null && this.RankNode != undefined) {
console.log("_________________________预制体已经加载好了，准备渲染");
this.node.getChildByName("Career").addChild(this.RankNode); this.node.getChildByName("Career").addChild(this.RankNode);
// this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode;
this.RankNode.opacity = 0; this.RankNode.opacity = 0;
@ -2515,8 +2518,12 @@ export default class JiaZai extends cc.Component {
this.RankNode.getComponent("CareerManager").init(rankData, topData); this.RankNode.getComponent("CareerManager").init(rankData, topData);
cc.tween(this.RankNode) cc.tween(this.RankNode)
.to(0.3, { opacity: 255 }) .to(0.3, { opacity: 255 })
.call(() => {
console.log("_________________________渲染完成");
})
.start() .start()
} else { } else {
console.log("_________________________预制体已经加载好了，准备渲染");
this.LoadCareer(() => { this.LoadCareer(() => {
this.node.getChildByName("Career").addChild(this.RankNode); this.node.getChildByName("Career").addChild(this.RankNode);
// this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode;
@ -2525,11 +2532,16 @@ export default class JiaZai extends cc.Component {
this.RankNode.getComponent("CareerManager").init(rankData, topData); this.RankNode.getComponent("CareerManager").init(rankData, topData);
cc.tween(this.RankNode) cc.tween(this.RankNode)
.to(0.3, { opacity: 255 }) .to(0.3, { opacity: 255 })
.call(() => {
console.log("_________________________渲染完成");
})
.start() .start()
}) })
} }
// console.log("rankingData_________", rankData); // console.log("rankingData_________", rankData);
}); });
});
}
} }
addSelfToRank(rankData) { addSelfToRank(rankData) {

2
assets/Script/Map.ts
View File

@ -2702,7 +2702,7 @@ export default class MapConroler extends cc.Component {
this.stopTimeCutDown(); this.stopTimeCutDown();
let time = 0; let time = 0;
this.gameOver = true; this.gameOver = true;
if (type == "boom" || type == "lock" || type == "revolving") { if (type == "boom" || type == "lock" || type == "revolving" || type == "rotate") {
time = 2000; time = 2000;
} }
if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) { if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) {

4
assets/Script/module/Tool/GameTool.ts
View File

@ -426,8 +426,8 @@ var GameTool = {
//关卡上限 //关卡上限
maxLevel() { maxLevel() {
let jg = false; let jg = false;
if (cc.fx.GameConfig.GM_INFO.level > 729) { if (cc.fx.GameConfig.GM_INFO.level > 799) {
cc.fx.GameConfig.GM_INFO.level = 730; cc.fx.GameConfig.GM_INFO.level = 800;
jg = true; jg = true;
} }
return jg; return jg;