diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 6530889..8d5b824 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -464,7 +464,6 @@ export default class MapConroler extends cc.Component { } let endLevel = false; - console.log("33333333333333333", cc.fx.GameTool.maxLevel(), cc.fx.GameConfig.GM_INFO.GameplayType) if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) { endLevel = true; } @@ -2326,13 +2325,14 @@ export default class MapConroler extends cc.Component { let endLevelShow = () => { let levelNum = this.node.parent.parent.getChildByName("Win").getChildByName("tween").getChildByName("endlessNode").getChildByName("levelNum") NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.endLevelNum, 45, 48, "half_black_", levelNum, true);// 45 48 + cc.fx.GameTool.setEndLevelLabelPos(levelNum); if (!cc.fx.GameConfig.GM_INFO.randomLevel || cc.fx.GameConfig.GM_INFO.randomLevel === 0) { cc.fx.GameConfig.GM_INFO.randomLevel = 31; } cc.fx.StorageMessage.setStorage("randomLevel", cc.fx.GameConfig.GM_INFO.randomLevel); } - console.log("222222222222222", cc.fx.GameTool.maxLevel(), cc.fx.GameConfig.GM_INFO.GameplayType) + // if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) { if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) { @@ -2470,7 +2470,6 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.parent.getChildByName("zhuanchang").active = true; this.node.parent.parent.parent.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false); setTimeout(() => { - console.log("11111111111111111111111", cc.fx.GameConfig.GM_INFO.randomLevel); let rLevel = cc.fx.StorageMessage.getStorage("randomLevel"); let endLevelNum = cc.fx.StorageMessage.getStorage("endLevelNum"); if (!cc.fx.GameConfig.GM_INFO.randomLevel || cc.fx.GameConfig.GM_INFO.randomLevel === 0) { @@ -5185,7 +5184,23 @@ export default class MapConroler extends cc.Component { top.getChildByName("level").active = false; top.getChildByName("difficultySpr").active = false; this.node.parent.parent.parent.getChildByName("Pause").getChildByName("share").active = false; - let levelNum = endlessNode.getChildByName("levelNum"); + let endNode = endlessNode.getChildByName("endNode"); + let levelNum = endNode.getChildByName("levelNum"); + let level_x = endNode.getChildByName("level_x"); + let endlessSpr = endNode.getChildByName("endlessSpr"); + endlessSpr.x = -72; + level_x.x = -5; + if (cc.fx.GameConfig.GM_INFO.endLevelNum < 10) { + endNode.x = 40; + } else if (cc.fx.GameConfig.GM_INFO.endLevelNum >= 10 && cc.fx.GameConfig.GM_INFO.endLevelNum < 100) { + endNode.x = 25; + } else if (cc.fx.GameConfig.GM_INFO.endLevelNum >= 100 && cc.fx.GameConfig.GM_INFO.endLevelNum < 1000) { + endNode.x = 5; + } else if (cc.fx.GameConfig.GM_INFO.endLevelNum >= 1000) { + endlessSpr.x = -92; + level_x.x = -25; + endNode.x = 0; + } NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.endLevelNum, 45, 48, "half_black_", levelNum, true); cc.fx.GameTool.setEndLevelLabelPos(levelNum); } diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 2cf122e..ba86312 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -2110,30 +2110,32 @@ var GameTool = { MiniGameSdk.API.shushu_Track('error', errorData); }, getNextLevel() { - const MAX_LEVEL = cc.fx.GameConfig.GM_INFO.level - 30; - const MIN_LEVEL = 30; // 从30开始 - if (cc.fx.GameTool.maxLevel()) { - if (cc.fx.GameConfig.GM_INFO.randomLevel >= MAX_LEVEL) { - cc.fx.GameConfig.GM_INFO.randomLevel = MIN_LEVEL; - } else if (cc.fx.GameConfig.GM_INFO.randomLevel == 0) { - cc.fx.GameConfig.GM_INFO.randomLevel = MIN_LEVEL; - } - let nextLevel = 0; - if (cc.fx.GameConfig.GM_INFO.randomLevel == MAX_LEVEL - 1) { - nextLevel = MAX_LEVEL; - } else { - nextLevel = Math.round(Math.random() * (MAX_LEVEL - cc.fx.GameConfig.GM_INFO.randomLevel)) + cc.fx.GameConfig.GM_INFO.randomLevel + 1; - nextLevel = Math.min(nextLevel, MAX_LEVEL); - } - // Math.floor(Math.random() * 100) + 1; - cc.fx.GameConfig.GM_INFO.randomLevel = nextLevel; - return nextLevel; - } - return 0; + // const MAX_LEVEL = cc.fx.GameConfig.GM_INFO.level - 30; + // const MIN_LEVEL = 30; // 从30开始 + // if (cc.fx.GameTool.maxLevel()) { + // if (cc.fx.GameConfig.GM_INFO.randomLevel >= MAX_LEVEL) { + // cc.fx.GameConfig.GM_INFO.randomLevel = MIN_LEVEL; + // } else if (cc.fx.GameConfig.GM_INFO.randomLevel == 0) { + // cc.fx.GameConfig.GM_INFO.randomLevel = MIN_LEVEL; + // } + // let nextLevel = 0; + // if (cc.fx.GameConfig.GM_INFO.randomLevel == MAX_LEVEL - 1) { + // nextLevel = MAX_LEVEL; + // } else { + // nextLevel = Math.round(Math.random() * (MAX_LEVEL - cc.fx.GameConfig.GM_INFO.randomLevel)) + cc.fx.GameConfig.GM_INFO.randomLevel + 1; + // nextLevel = Math.min(nextLevel, MAX_LEVEL); + // } + // // Math.floor(Math.random() * 100) + 1; + // cc.fx.GameConfig.GM_INFO.randomLevel = nextLevel; + // return nextLevel; + // } + // return 0; + + return cc.fx.GameTool.getPurelyRandom(); }, getPurelyRandom() { - const MAX_LEVEL = cc.fx.GameConfig.GM_INFO.level; + const MAX_LEVEL = cc.fx.GameConfig.GM_INFO.level - 30; const MIN_LEVEL = 30; if (cc.fx.GameTool.maxLevel()) { let randomNum = MAX_LEVEL - MIN_LEVEL; @@ -2141,6 +2143,7 @@ var GameTool = { let nextLevel = Math.floor(Math.random() * (randomNum + 1)) + MIN_LEVEL; return nextLevel; } + return 0; }, // 抖动效果 onBtnJitter(node) {