diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index be33b57..0b72564 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -435,7 +435,7 @@ { "__type__": "cc.Node", "_name": "bg", - "_objFlags": 0, + "_objFlags": 512, "_parent": { "__id__": 7 }, diff --git a/assets/Script/Barrier.ts b/assets/Script/Barrier.ts index dc38eac..d51d190 100644 --- a/assets/Script/Barrier.ts +++ b/assets/Script/Barrier.ts @@ -59,8 +59,7 @@ export default class Block extends cc.Component { // this.node.on(cc.Node.EventType.TOUCH_END, this.touchEnd, this); this.pz = false; this.stacking = cc.v2(0, 0); - // this.selfBoxColliders = this.node.getComponentsInChildren(cc.BoxCollider) - // .filter(collider => collider.tag < 4); + } diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index a4afd06..3318c5c 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -348,14 +348,14 @@ export default class Block extends cc.Component { let lock = cc.instantiate(MapConroler._instance.Block_Prop[this.type]); lock.parent = this.node; lock.setPosition(posConfig.pos1.x, posConfig.pos1.y); - lock.getComponent("Lock").init(this.block_Info.lockTime, "block"); + lock.getComponent("Lock").init(this.block_Info.lockTime, "block", this.block_Info.block); break; case BlockType.第二上锁块: let lock2 = cc.instantiate(MapConroler._instance.Block_Prop[3]); lock2.parent = this.node; - lock2.color = cc.color(255, 125, 0); + lock2.getChildByName("icon").color = cc.color(255, 125, 0); lock2.setPosition(posConfig.pos1.x, posConfig.pos1.y); - lock2.getComponent("Lock").init(this.block_Info.lockTime2, "block"); + lock2.getComponent("Lock").init(this.block_Info.lockTime2, "block", this.block_Info.block); break; case BlockType.冻结块: let freeze = cc.instantiate(MapConroler._instance.Block_Prop[this.type]); @@ -637,7 +637,8 @@ export default class Block extends cc.Component { this.removeAction(jg, type); } else { - MapConroler._instance.upDoor(this.color); + if (MapConroler && MapConroler._instance) + MapConroler._instance.upDoor(this.color); this.setVibrate("medium", 1) //@ts-ignore } @@ -761,7 +762,8 @@ export default class Block extends cc.Component { setTimeout(() => { let tempColor = this.color; setTimeout(() => { - MapConroler._instance.upDoor(tempColor); + if (MapConroler && MapConroler._instance) + MapConroler._instance.upDoor(tempColor); }, 250); MapConroler._instance.nextLevel(1); @@ -1984,7 +1986,8 @@ export default class Block extends cc.Component { effectNode.zIndex = 9999; // 添加到 Canvas 节点下 - MapConroler._instance.node.parent.addChild(effectNode); + if (MapConroler && MapConroler._instance) + MapConroler._instance.node.parent.addChild(effectNode); this.playMagicAnimation(skeletonComponent, index); diff --git a/assets/Script/ItemGuide.ts b/assets/Script/ItemGuide.ts index e9ebcbb..4d66814 100644 --- a/assets/Script/ItemGuide.ts +++ b/assets/Script/ItemGuide.ts @@ -77,14 +77,20 @@ export default class ItemGuide extends cc.Component { pos = this.node.convertToNodeSpaceAR(pos); this.itemGuide.zIndex = 1000; //同时改变大小和位置 - MapConroler._instance.setPropNum(); + if (MapConroler && MapConroler._instance) { + MapConroler._instance.setPropNum(); + } + // if (this.itemGuide.active == true) { cc.tween(this.itemGuide) .to(0.9, { scale: 0.3, position: pos }) // 同时执行 .call(() => { - MapConroler._instance.setPropNum(); this.node.active = false; + if (MapConroler && MapConroler._instance) { + MapConroler._instance.setPropNum(); + } + }) .start(); // } diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 7f9a974..4dd6d13 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -1271,7 +1271,8 @@ export default class JiaZai extends cc.Component { updateCoin() { //console.log("主页更新金币", cc.fx.GameConfig.GM_INFO.coin); // NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true); - NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); + if (this.coin) + NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); } getOrder() { @@ -1689,7 +1690,8 @@ export default class JiaZai extends cc.Component { this.newbieGift = true; // let top = this.node.getChildByName("Load").getChildByName("Top"); // top.getChildByName("yicon").active = false; - this.Stamina.parent.getChildByName("xinshou").active = true; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").active = true; cc.fx.GameConfig.GM_INFO.starter_packTime = res.data.starter_pack / 1000; if (!this.actionpNode) this.openStarter_pack(); console.log("打开新手礼包"); @@ -1698,8 +1700,9 @@ export default class JiaZai extends cc.Component { if (time > 0) { this.startStarter_pack(); time = cc.fx.GameTool.getTimeMargin2(time); - this.Stamina.parent.getChildByName("xinshou").getChildByName("time").getComponent(cc.Label) - .string = time + ""; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").getChildByName("time").getComponent(cc.Label) + .string = time + ""; } @@ -1710,13 +1713,15 @@ export default class JiaZai extends cc.Component { this.winStreakShow = true; console.log("用户新手礼包已经过期，不触发"); this.newbieGift = false; - this.Stamina.parent.getChildByName("xinshou").active = false; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").active = false; } else if (data.data.starter_packState == 1) { this.winStreakShow = true; console.log("用户已经购买过新手礼包，不触发"); this.newbieGift = false; - this.Stamina.parent.getChildByName("xinshou").active = false; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").active = false; } else { console.log("用户在新手礼包时间范围内，给弹窗"); @@ -1726,8 +1731,9 @@ export default class JiaZai extends cc.Component { if (time > 0) { this.startStarter_pack(); time = cc.fx.GameTool.getTimeMargin2(time); - this.Stamina.parent.getChildByName("xinshou").getChildByName("time").getComponent(cc.Label) - .string = time + ""; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").getChildByName("time").getComponent(cc.Label) + .string = time + ""; } let date = new Date(); let day = date.getDate() + 1; // 当前日期（1-31） @@ -1742,7 +1748,8 @@ export default class JiaZai extends cc.Component { this.newbieGift = true; // let top = this.node.getChildByName("Load").getChildByName("Top"); // top.getChildByName("yicon").active = false; - this.Stamina.parent.getChildByName("xinshou").active = true; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").active = true; cc.fx.StorageMessage.setStorage("Starter_pack", dateStr); if (!this.actionpNode) this.openStarter_pack(); console.log("打开新手礼包"); @@ -1751,14 +1758,16 @@ export default class JiaZai extends cc.Component { else { this.winStreakShow = true; this.newbieGift = false; - this.Stamina.parent.getChildByName("xinshou").active = true; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").active = true; console.log("当天已经给过，不再弹窗新手礼包"); } } } else { this.newbieGift = false; - this.Stamina.parent.getChildByName("xinshou").active = false; + if (this.Stamina) + this.Stamina.parent.getChildByName("xinshou").active = false; } }) } @@ -2538,103 +2547,109 @@ export default class JiaZai extends cc.Component { if (this.RankNode == null && this.RankNode == undefined) { this.LoadCareer(() => { Utils.getSRank(res => { - let data = JSON.parse(res.data); - if (data && data.role) { - let role = data.role; - let sortedArray = []; - // console.log("_________________________得到接口返回", res.data); - sortedArray = Object.entries(role) - //@ts-ignore - .sort((a, b) => b[1] - a[1]) // 按数值从大到小排序 - .map((item, index) => ({ - rank: index + 1, // 排名 - name: item[0], // 省份名称 - count: item[1] // 数值 - })); - // 排序后的结果 - // console.log("sortedArray", sortedArray); - let city = JSON.parse(JSON.stringify(cc.fx.GameConfig.CITY)); - let rankData = []; - if (sortedArray) { - for (let i = 0; i < sortedArray.length; i++) { - // 检查sortedArray中的省份名称是否存在于原始data.role数据中 - if (data && data[sortedArray[i].name] !== undefined) { - // 如果存在，则将data中对应的键值对放入rankData - if (data.role && data.role[sortedArray[i].name] !== undefined) { + if (res.data) { + let data = JSON.parse(res.data); + if (data != null && data != undefined) { + if (data.role) { + let role = data.role; + let sortedArray = []; + // console.log("_________________________得到接口返回", res.data); + sortedArray = Object.entries(role) + //@ts-ignore + .sort((a, b) => b[1] - a[1]) // 按数值从大到小排序 + .map((item, index) => ({ + rank: index + 1, // 排名 + name: item[0], // 省份名称 + count: item[1] // 数值 + })); + // 排序后的结果 + // console.log("sortedArray", sortedArray); + let city = JSON.parse(JSON.stringify(cc.fx.GameConfig.CITY)); + let rankData = []; + if (sortedArray) { + for (let i = 0; i < sortedArray.length; i++) { + // 检查sortedArray中的省份名称是否存在于原始data.role数据中 + if (data && data[sortedArray[i].name] !== undefined) { + // 如果存在，则将data中对应的键值对放入rankData + if (data.role && data.role[sortedArray[i].name] !== undefined) { + rankData.push({ + rank: sortedArray[i].rank, + name: sortedArray[i].name, + count: sortedArray[i].count, + // 可以添加data2中对应的数据 + rankingData: data[sortedArray[i].name] + }); + delete city[sortedArray[i].name]; + } + } + } + // 循环完成后，将CITY中剩下的城市按顺序添加到rankData中 + let nextRank = rankData.length + 1; // 获取下一个排名 + for (let cityName in city) { rankData.push({ - rank: sortedArray[i].rank, - name: sortedArray[i].name, - count: sortedArray[i].count, - // 可以添加data2中对应的数据 - rankingData: data[sortedArray[i].name] + rank: nextRank++, + name: cityName, + count: 0, + rankingData: [] }); - delete city[sortedArray[i].name]; + } + let otherIndex = rankData.findIndex(item => item.name === "其他"); + if (otherIndex !== -1) { + let otherItem = rankData.splice(otherIndex, 1)[0]; + rankData.push(otherItem); + } + let topData = data.all ? data.all : []; + this.careerRank = { + rankData: JSON.parse(JSON.stringify(rankData)), + topData: JSON.parse(JSON.stringify(topData)) + } + console.log("自己的addLevel", cc.fx.GameConfig.GM_INFO.addLevel); + if (cc.fx.GameConfig.GM_INFO.addLevel > 4) { + console.log("______________自己入职了"); + this.addSelfToRank(rankData); + } + for (let i = 0; i < rankData.length; i++) { + rankData[i].rank = i + 1; + } + if (this.RankNode != null && this.RankNode != undefined) { + console.log("_________________________预制体已经加载好了，准备渲染"); + this.node.getChildByName("Career").addChild(this.RankNode); + // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; + this.RankNode.opacity = 0; + this.RankNode.zIndex = 3; + this.RankNode.getComponent("CareerManager").init(rankData, topData); + cc.tween(this.RankNode) + .to(0.3, { opacity: 255 }) + .delay(0.2) + .call(() => { + console.log("_________________________渲染完成"); + this.node.getChildByName("Snow").active = true; + }) + .start() + } else { + console.log("_________________________预制体已经加载好了，准备渲染"); + this.LoadCareer(() => { + this.node.getChildByName("Career").addChild(this.RankNode); + // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; + this.RankNode.opacity = 0; + this.RankNode.zIndex = 3; + this.RankNode.getComponent("CareerManager").init(rankData, topData); + cc.tween(this.RankNode) + .to(0.3, { opacity: 255 }) + .delay(0.2) + .call(() => { + console.log("_________________________渲染完成"); + this.node.getChildByName("Snow").active = true; + }) + .start() + }, true) } } } - // 循环完成后，将CITY中剩下的城市按顺序添加到rankData中 - let nextRank = rankData.length + 1; // 获取下一个排名 - for (let cityName in city) { - rankData.push({ - rank: nextRank++, - name: cityName, - count: 0, - rankingData: [] - }); - } - let otherIndex = rankData.findIndex(item => item.name === "其他"); - if (otherIndex !== -1) { - let otherItem = rankData.splice(otherIndex, 1)[0]; - rankData.push(otherItem); - } - let topData = data.all ? data.all : []; - this.careerRank = { - rankData: JSON.parse(JSON.stringify(rankData)), - topData: JSON.parse(JSON.stringify(topData)) - } - console.log("自己的addLevel", cc.fx.GameConfig.GM_INFO.addLevel); - if (cc.fx.GameConfig.GM_INFO.addLevel > 4) { - console.log("______________自己入职了"); - this.addSelfToRank(rankData); - } - for (let i = 0; i < rankData.length; i++) { - rankData[i].rank = i + 1; - } - if (this.RankNode != null && this.RankNode != undefined) { - console.log("_________________________预制体已经加载好了，准备渲染"); - this.node.getChildByName("Career").addChild(this.RankNode); - // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; - this.RankNode.opacity = 0; - this.RankNode.zIndex = 3; - this.RankNode.getComponent("CareerManager").init(rankData, topData); - cc.tween(this.RankNode) - .to(0.3, { opacity: 255 }) - .delay(0.2) - .call(() => { - console.log("_________________________渲染完成"); - this.node.getChildByName("Snow").active = true; - }) - .start() - } else { - console.log("_________________________预制体已经加载好了，准备渲染"); - this.LoadCareer(() => { - this.node.getChildByName("Career").addChild(this.RankNode); - // this.node.getChildByName("Career").getChildByName("bg").parent = this.RankNode; - this.RankNode.opacity = 0; - this.RankNode.zIndex = 3; - this.RankNode.getComponent("CareerManager").init(rankData, topData); - cc.tween(this.RankNode) - .to(0.3, { opacity: 255 }) - .delay(0.2) - .call(() => { - console.log("_________________________渲染完成"); - this.node.getChildByName("Snow").active = true; - }) - .start() - }, true) - } } + } + // console.log("rankingData_________", rankData); }); }, isShow); diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 54413fa..2cd96fb 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -240,9 +240,7 @@ export default class MapConroler extends cc.Component { this.hitSoundCount = 0; this.hitSoundTime = 0; this.cityRank = cc.fx.GameConfig.GM_INFO.cityRank; - //this.iceLabel.string = cc.fx.GameConfig.GM_INFO.freezeAmount.toString(); - // this.hammerLabel.string = cc.fx.GameConfig.GM_INFO.hammerAmount.toString(); - // this.magicLabel.string = cc.fx.GameConfig.GM_INFO.magicAmount.toString(); + this.setPropNum(); // cc.game.addPersistRootNode(this.node); MapConroler._instance = this; @@ -486,8 +484,7 @@ export default class MapConroler extends cc.Component { NumberToImage.getTimeMargi3(this.timeNumber, 45, "company_", this.timeLabel) this.updateCoin(); - // var timeTemp = cc.fx.GameTool.getTimeMargin(this.timeNumber); - // this.timeLabel.string = timeTemp.toString(); + let levelName = (cc.fx.GameConfig.GM_INFO.level + 1); if (cc.fx.GameConfig.GM_INFO.otherLevel) { levelName = cc.fx.GameConfig.GM_INFO.otherLevel; @@ -618,7 +615,8 @@ export default class MapConroler extends cc.Component { passRateNode.active = true; let passRate = passRateNode.getChildByName("passRate"); // NumberToImage.numberToImageNodes4(levelData.pass_rate, 50, 0, "Black", passRate, true) - passRate.getComponent(cc.Label).string = levelData.pass_rate.toString(); + if (levelData.pass_rate) + passRate.getComponent(cc.Label).string = levelData.pass_rate.toString(); if (passRateNode) { let targetY = cc.winSize.height / 2 - 500; cc.tween(passRateNode) @@ -1016,7 +1014,6 @@ export default class MapConroler extends cc.Component { node.opacity = 250; wall.getChildByName("wall").getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, direction); - //wall.getChildByName("wall").getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); this.setDoorInfo(wall.getChildByName("wall")); this.wallNum += 1; @@ -1041,7 +1038,7 @@ export default class MapConroler extends cc.Component { this.setDoorInfo(wall.getChildByName("wall")); - //wall.getChildByName("wall").getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.wallNum += 1; if (wall.getChildByName("wall").getComponent("Wall").special == 2) this.openWall.push(wall); @@ -1066,7 +1063,6 @@ export default class MapConroler extends cc.Component { this.setDoorInfo(wall.getChildByName("wall")); - //wall.getChildByName("wall").getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); this.wallNum += 1; if (wall.getChildByName("wall").getComponent("Wall").special == 2) this.openWall.push(wall); @@ -1090,7 +1086,7 @@ export default class MapConroler extends cc.Component { this.setDoorInfo(wall.getChildByName("wall")); - //wall.getChildByName("wall").getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.wallNum += 1; if (wall.getChildByName("wall").getComponent("Wall").special == 2) this.openWall.push(wall); @@ -1109,7 +1105,7 @@ export default class MapConroler extends cc.Component { wall.parent = this.node; wall.setPosition(cc.v2(node.x, node.y)); wall.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall.children[1]); this.wallNum += 1; wall2 = cc.instantiate(this.Wall_Prefab[11]); @@ -1117,7 +1113,7 @@ export default class MapConroler extends cc.Component { wall2.parent = this.node; wall2.setPosition(cc.v2(node.x, node.y)); wall2.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall2.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall2.children[1]); this.wallNum += 1; break; @@ -1128,7 +1124,7 @@ export default class MapConroler extends cc.Component { wall.parent = this.node; wall.setPosition(cc.v2(node.x + 5, node.y)); wall.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall.children[1]); this.wallNum += 1; wall2 = cc.instantiate(this.Wall_Prefab[10]); @@ -1136,7 +1132,7 @@ export default class MapConroler extends cc.Component { wall2.parent = this.node; wall2.setPosition(cc.v2(node.x + 5, node.y)); wall2.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall2.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall2.children[1]); this.wallNum += 1; break; @@ -1147,7 +1143,7 @@ export default class MapConroler extends cc.Component { wall.parent = this.node; wall.setPosition(cc.v2(node.x, node.y)); wall.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall.children[1]); this.wallNum += 1; wall2 = cc.instantiate(this.Wall_Prefab[7]); @@ -1155,7 +1151,7 @@ export default class MapConroler extends cc.Component { wall2.parent = this.node; wall2.setPosition(cc.v2(node.x, node.y)); wall2.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall2.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall2.children[1]); this.wallNum += 1; break; @@ -1166,7 +1162,7 @@ export default class MapConroler extends cc.Component { wall.parent = this.node; wall.setPosition(cc.v2(node.x + 5, node.y)); wall.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall.children[1]); this.wallNum += 1; wall2 = cc.instantiate(this.Wall_Prefab[4]); @@ -1174,7 +1170,7 @@ export default class MapConroler extends cc.Component { wall2.parent = this.node; wall2.setPosition(cc.v2(node.x + 5, node.y)); wall2.children[1].getComponent("Wall").init(null, node.getComponent("MapBlock").posX, node.getComponent("MapBlock").posY, wall2.name); - //wall.children[0].getChildByName("num").getComponent(cc.Label).string = this.wallNum.toString(); + this.setDoorInfo(wall2.children[1]); this.wallNum += 1; break; @@ -3299,7 +3295,8 @@ export default class MapConroler extends cc.Component { } updateCoin() { - NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); + if (this.coin) + NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); } //使用锤子道具 @@ -3356,6 +3353,7 @@ export default class MapConroler extends cc.Component { this.hammer = false; this.ishammer = false; this.pause = false; + if (this.gameStart == true) this.startBoom(); // 如果是使用连胜免费锤子，则不隐藏按钮并恢复其状态 if (this.hammerSpecial) { diff --git a/assets/Script/NumberToImage.ts b/assets/Script/NumberToImage.ts index 4c9e4ba..7dc34bd 100644 --- a/assets/Script/NumberToImage.ts +++ b/assets/Script/NumberToImage.ts @@ -194,40 +194,45 @@ export default class NumberToImage extends cc.Component { } static numberToImageNodes5(number, width, posX, name, targetNode: cc.Node, middle: boolean = false) { - const numStr = number.toString(); - let cha = 0; - if (number > 99) cha = -posX - else if (number < 10) cha = posX - if (targetNode.children.length > 0) - targetNode.removeAllChildren(); - - const digitNodes: cc.Node[] = []; - for (let i = 0; i < numStr.length; i++) { - const digit = parseInt(numStr[i], 10); - const node = new cc.Node(); - const sprite = node.addComponent(cc.Sprite); - sprite.spriteFrame = this.font3._spriteFrames[name + digit + ""]; - digitNodes.push(node); - } - - // 计算总宽度 - const totalWidth = (numStr.length - 1) * width + (digitNodes[0]?.width || 0); - - if (middle) { - // 计算居中的起始位置 - const startX = -totalWidth / 2; - for (let i = 0; i < digitNodes.length; i++) { - const node = digitNodes[i]; - node.x = startX + i * width; - if (targetNode) node.parent = targetNode; + if (targetNode) { + const numStr = number.toString(); + let cha = 0; + if (number > 99) cha = -posX + else if (number < 10) cha = posX + if (targetNode.children) { + if (targetNode.children.length > 0) + targetNode.removeAllChildren(); } - } else { - for (let i = 0; i < digitNodes.length; i++) { - const node = digitNodes[i]; - node.x = i * width + cha; - if (targetNode) node.parent = targetNode; + + const digitNodes: cc.Node[] = []; + for (let i = 0; i < numStr.length; i++) { + const digit = parseInt(numStr[i], 10); + const node = new cc.Node(); + const sprite = node.addComponent(cc.Sprite); + sprite.spriteFrame = this.font3._spriteFrames[name + digit + ""]; + digitNodes.push(node); + } + + // 计算总宽度 + const totalWidth = (numStr.length - 1) * width + (digitNodes[0]?.width || 0); + + if (middle) { + // 计算居中的起始位置 + const startX = -totalWidth / 2; + for (let i = 0; i < digitNodes.length; i++) { + const node = digitNodes[i]; + node.x = startX + i * width; + if (targetNode) node.parent = targetNode; + } + } else { + for (let i = 0; i < digitNodes.length; i++) { + const node = digitNodes[i]; + node.x = i * width + cha; + if (targetNode) node.parent = targetNode; + } } } + } static numberToImageNodesShop(number, width, posX, name, targetNode: cc.Node, middle: boolean = false) { diff --git a/assets/Script/Revive.ts b/assets/Script/Revive.ts index a11dd79..87d923e 100644 --- a/assets/Script/Revive.ts +++ b/assets/Script/Revive.ts @@ -145,7 +145,9 @@ export default class Revive extends cc.Component { //发奖励 revivew() { cc.fx.GameConfig.GM_INFO.revive = 1; - MapConroler._instance.setPropNum(); + if (MapConroler && MapConroler._instance) { + MapConroler._instance.setPropNum(); + } const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 const jiazaiComp = jiazaiNode.getComponent(JiaZai); if (jiazaiComp) { diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index 64aed1b..6addbf5 100644 --- a/assets/Script/SceneManager.ts +++ b/assets/Script/SceneManager.ts @@ -363,10 +363,12 @@ export default class SceneManager extends cc.Component { closeShop() { if (this.shopNode) { this.shopNode.active = false; - var pause = MapConroler._instance.iceTrue(); - if (pause == false) { - if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; - if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); + if (MapConroler && MapConroler._instance) { + var pause = MapConroler._instance.iceTrue(); + if (pause == false) { + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; + if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); + } } } } @@ -375,10 +377,12 @@ export default class SceneManager extends cc.Component { cc.fx.AudioManager._instance.playEffect("anniu_little", null); this.pause.getComponent("btnControl").setTouch(true); this.node.getChildByName("Pause").active = false; - var pause = MapConroler._instance.iceTrue(); - if (pause == false) { - if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; - if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); + if (MapConroler && MapConroler._instance) { + var pause = MapConroler._instance.iceTrue(); + if (pause == false) { + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; + if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); + } } } @@ -530,10 +534,12 @@ export default class SceneManager extends cc.Component { } else { - var pause = MapConroler._instance.iceTrue(); - if (pause == false) { - if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; - if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); + if (MapConroler && MapConroler._instance) { + var pause = MapConroler._instance.iceTrue(); + if (pause == false) { + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; + if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); + } } } diff --git a/assets/Script/Wall.ts b/assets/Script/Wall.ts index 1a84d08..b2c4956 100644 --- a/assets/Script/Wall.ts +++ b/assets/Script/Wall.ts @@ -347,7 +347,7 @@ export default class Wall extends cc.Component { lock.setPosition(-46, (this.wall_Info.length - 1) * 60); if (this.wall_Info.length == 1) lock.y += 10; } - lock.getComponent("Lock").init(this.wall_Info.lockTime, "wall"); + lock.getComponent("Lock").init(this.wall_Info.lockTime, "wall", null); break; } if (this.wall_Info.colorArray) { diff --git a/assets/Script/module/List/scrollviewList.ts b/assets/Script/module/List/scrollviewList.ts index f70ad61..f4e3de8 100644 --- a/assets/Script/module/List/scrollviewList.ts +++ b/assets/Script/module/List/scrollviewList.ts @@ -363,7 +363,11 @@ export default class scrollViewList extends cc.Component { } } this.itemNodes = []; - this.content.removeAllChildren(); + if (this.content) { + if (this.content.children.length > 0) { + this.content.removeAllChildren(); + } + } } /** diff --git a/assets/Script/module/Music/AudioManager.ts b/assets/Script/module/Music/AudioManager.ts index 9542275..0360e87 100644 --- a/assets/Script/module/Music/AudioManager.ts +++ b/assets/Script/module/Music/AudioManager.ts @@ -134,7 +134,9 @@ export default class AudioManager extends cc.Component { var context = cc.audioEngine.playEffect(audioSource, loop); if (callback) { cc.audioEngine.setFinishCallback(context, function () { - callback.call(this); + if (this && callback) { + callback.call(this); + } }.bind(this)); } // cc.wwx.OutPut.log('play audio effect isBrowser: ' + context.src); diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 6402d3a..4ac0599 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -426,8 +426,8 @@ var GameTool = { //关卡上限 maxLevel() { let jg = false; - if (cc.fx.GameConfig.GM_INFO.level > 919) { - cc.fx.GameConfig.GM_INFO.level = 920; + if (cc.fx.GameConfig.GM_INFO.level > 939) { + cc.fx.GameConfig.GM_INFO.level = 940; jg = true; } return jg; diff --git a/assets/Script/prop/Boom.ts b/assets/Script/prop/Boom.ts index 66b4a80..f18e0b4 100644 --- a/assets/Script/prop/Boom.ts +++ b/assets/Script/prop/Boom.ts @@ -47,10 +47,12 @@ export default class Boom extends cc.Component { } startBoom() { - if (MapConroler._instance.iceTrue() == true) return; - if (MapConroler._instance.pause == true) return; - if (this.node.name == "boom") { - this.schedule(this.updateTime, 1); + if (MapConroler._instance) { + if (MapConroler._instance.iceTrue() == true) return; + if (MapConroler._instance.pause == true) return; + if (this.node.name == "boom") { + this.schedule(this.updateTime, 1); + } } } diff --git a/assets/Script/prop/Lock.ts b/assets/Script/prop/Lock.ts index 43cc77b..0dfb34d 100644 --- a/assets/Script/prop/Lock.ts +++ b/assets/Script/prop/Lock.ts @@ -26,11 +26,109 @@ export default class Lock extends cc.Component { start() { } - init(time, type) { + init(time, type, block) { if (time) this.time = time; if (type) this.type = type; this.node.getChildByName("time").active = true; NumberToImage.numberToImageNodes(this.time, 20, 8, "lock_", this.node.getChildByName("time"), false); + let lock = this.node.getChildByName("lock"); + if (block != null) { + switch (block) { + case 0: + lock.getChildByName("lock_1").active = true; + break; + case 1: + lock.getChildByName("lock_2").active = true; + break; + case 2: + lock.getChildByName("lock_3").active = true; + break; + case 3: + lock.getChildByName("lock_4").active = true; + break; + case 4: + lock.getChildByName("lock_10").active = true; + break; + case 5: + lock.getChildByName("lock_5").active = true; + break; + case 6: + lock.getChildByName("lock_6").active = true; + break; + case 7: + lock.getChildByName("lock_7").active = true; + break; + case 8: + lock.getChildByName("lock_8").active = true; + lock.getChildByName("lock_8").scaleX = -1; + break; + case 9: + lock.getChildByName("lock_9").active = true; + lock.getChildByName("lock_9").scaleX = -1; + break; + case 10: + lock.getChildByName("lock_8").active = true; + lock.getChildByName("lock_8").scaleY = -1; + lock.getChildByName("lock_8").scaleX = -1; + lock.getChildByName("lock_8").y += 12; + lock.getChildByName("lock_8").x -= 2; + break; + case 11: + lock.getChildByName("lock_9").active = true; + lock.getChildByName("lock_9").scaleY = -1; + lock.getChildByName("lock_9").y += 2; + lock.getChildByName("lock_9").x -= 2; + break; + case 12: + lock.getChildByName("lock_8").active = true; + lock.getChildByName("lock_8").x += 1; + break; + case 13: + lock.getChildByName("lock_9").active = true; + lock.getChildByName("lock_9").x -= 3; + + break; + case 14: + lock.getChildByName("lock_4").active = true; + lock.getChildByName("lock_4").scaleY = -1; + lock.getChildByName("lock_4").y += 10; + break; + case 15: + lock.getChildByName("lock_4").active = true; + lock.getChildByName("lock_4").y -= 1; + break; + case 16: + lock.getChildByName("lock_3").active = true; + lock.getChildByName("lock_3").scaleX = -1; + break; + case 17: + lock.getChildByName("lock_3").active = true; + break; + case 18: + lock.getChildByName("lock_2").active = true; + break; + case 19: + lock.getChildByName("lock_4").active = true; + lock.getChildByName("lock_4").y -= 10; + break; + case 20: + lock.getChildByName("lock_4").active = true; + lock.getChildByName("lock_4").scaleX = -1; + lock.getChildByName("lock_4").y -= 8; + break; + case 21: + lock.getChildByName("lock_4").active = true; + lock.getChildByName("lock_4").scaleY = -1; + lock.getChildByName("lock_4").scaleX = -1; + lock.getChildByName("lock_4").y += 18; + break; + case 22: + lock.getChildByName("lock_4").active = true; + lock.getChildByName("lock_4").scaleY = -1; + lock.getChildByName("lock_4").y += 18; + break; + } + } } diff --git a/assets/UI/prop.meta b/assets/UI/prop.meta new file mode 100644 index 0000000..bd51220 --- /dev/null +++ b/assets/UI/prop.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "2067245c-cfc4-4a59-8d49-cf9f1f720a70", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/UI/prop/lock_1.png b/assets/UI/prop/lock_1.png new file mode 100644 index 0000000..0c9bdab Binary files /dev/null and b/assets/UI/prop/lock_1.png differ diff --git a/assets/UI/prop/lock_1.png.meta b/assets/UI/prop/lock_1.png.meta new file mode 100644 index 0000000..563493a --- /dev/null +++ b/assets/UI/prop/lock_1.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "441f2682-c8bc-48e8-9444-44034ed96285", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 114, + "height": 121, + "platformSettings": {}, + "subMetas": { + "lock_1": { + "ver": "1.0.6", + "uuid": "c1874f8a-a154-40a0-bf77-415114ef8cd3", + "importer": "sprite-frame", + "rawTextureUuid": "441f2682-c8bc-48e8-9444-44034ed96285", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 114, + "height": 121, + "rawWidth": 114, + "rawHeight": 121, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_10.png b/assets/UI/prop/lock_10.png new file mode 100644 index 0000000..c71ef8c Binary files /dev/null and b/assets/UI/prop/lock_10.png differ diff --git a/assets/UI/prop/lock_10.png.meta b/assets/UI/prop/lock_10.png.meta new file mode 100644 index 0000000..c520411 --- /dev/null +++ b/assets/UI/prop/lock_10.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "0a1cf62e-7801-432f-a345-093a7dcf88af", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 139, + "height": 235, + "platformSettings": {}, + "subMetas": { + "lock_10": { + "ver": "1.0.6", + "uuid": "5adb1b42-ae73-4e0c-a406-05709d235c7c", + "importer": "sprite-frame", + "rawTextureUuid": "0a1cf62e-7801-432f-a345-093a7dcf88af", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 139, + "height": 235, + "rawWidth": 139, + "rawHeight": 235, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_2.png b/assets/UI/prop/lock_2.png new file mode 100644 index 0000000..acc7b7c Binary files /dev/null and b/assets/UI/prop/lock_2.png differ diff --git a/assets/UI/prop/lock_2.png.meta b/assets/UI/prop/lock_2.png.meta new file mode 100644 index 0000000..6b63b88 --- /dev/null +++ b/assets/UI/prop/lock_2.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "3de42fb9-c49e-4ee6-bcaf-e07a8f97dfc0", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 144, + "height": 143, + "platformSettings": {}, + "subMetas": { + "lock_2": { + "ver": "1.0.6", + "uuid": "c473c6bf-b760-40d1-9982-93c219702010", + "importer": "sprite-frame", + "rawTextureUuid": "3de42fb9-c49e-4ee6-bcaf-e07a8f97dfc0", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 144, + "height": 143, + "rawWidth": 144, + "rawHeight": 143, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_3.png b/assets/UI/prop/lock_3.png new file mode 100644 index 0000000..1b7a7c1 Binary files /dev/null and b/assets/UI/prop/lock_3.png differ diff --git a/assets/UI/prop/lock_3.png.meta b/assets/UI/prop/lock_3.png.meta new file mode 100644 index 0000000..3b56979 --- /dev/null +++ b/assets/UI/prop/lock_3.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "8b801212-e890-4398-be2c-8dd92613dd54", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 135, + "height": 154, + "platformSettings": {}, + "subMetas": { + "lock_3": { + "ver": "1.0.6", + "uuid": "8abb9341-a2cc-4fa2-b1f7-59ea2ecebe95", + "importer": "sprite-frame", + "rawTextureUuid": "8b801212-e890-4398-be2c-8dd92613dd54", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 135, + "height": 154, + "rawWidth": 135, + "rawHeight": 154, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_4.png b/assets/UI/prop/lock_4.png new file mode 100644 index 0000000..95fbde5 Binary files /dev/null and b/assets/UI/prop/lock_4.png differ diff --git a/assets/UI/prop/lock_4.png.meta b/assets/UI/prop/lock_4.png.meta new file mode 100644 index 0000000..58dc0e6 --- /dev/null +++ b/assets/UI/prop/lock_4.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "7f4ce6ec-be3e-4588-acb3-0b9770b9c504", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 140, + "height": 150, + "platformSettings": {}, + "subMetas": { + "lock_4": { + "ver": "1.0.6", + "uuid": "8f4f666a-344f-4536-a4bb-46388db293b9", + "importer": "sprite-frame", + "rawTextureUuid": "7f4ce6ec-be3e-4588-acb3-0b9770b9c504", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 140, + "height": 150, + "rawWidth": 140, + "rawHeight": 150, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_5.png b/assets/UI/prop/lock_5.png new file mode 100644 index 0000000..1fa9ed0 Binary files /dev/null and b/assets/UI/prop/lock_5.png differ diff --git a/assets/UI/prop/lock_5.png.meta b/assets/UI/prop/lock_5.png.meta new file mode 100644 index 0000000..d602e0b --- /dev/null +++ b/assets/UI/prop/lock_5.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "b41c4283-4bf8-416c-b414-c92c89156cb3", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 242, + "height": 259, + "platformSettings": {}, + "subMetas": { + "lock_5": { + "ver": "1.0.6", + "uuid": "2ad9942f-9338-486b-b385-1a4dde43a1ad", + "importer": "sprite-frame", + "rawTextureUuid": "b41c4283-4bf8-416c-b414-c92c89156cb3", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -0.5, + "trimX": 0, + "trimY": 1, + "width": 242, + "height": 258, + "rawWidth": 242, + "rawHeight": 259, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_6.png b/assets/UI/prop/lock_6.png new file mode 100644 index 0000000..b7ea540 Binary files /dev/null and b/assets/UI/prop/lock_6.png differ diff --git a/assets/UI/prop/lock_6.png.meta b/assets/UI/prop/lock_6.png.meta new file mode 100644 index 0000000..bb168d7 --- /dev/null +++ b/assets/UI/prop/lock_6.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "3d43eebd-485e-4f2f-97fd-1cd197098450", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 144, + "height": 377, + "platformSettings": {}, + "subMetas": { + "lock_6": { + "ver": "1.0.6", + "uuid": "d0acc27e-748e-4b8e-9628-c4fd9bd27386", + "importer": "sprite-frame", + "rawTextureUuid": "3d43eebd-485e-4f2f-97fd-1cd197098450", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 144, + "height": 377, + "rawWidth": 144, + "rawHeight": 377, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_7.png b/assets/UI/prop/lock_7.png new file mode 100644 index 0000000..ee03882 Binary files /dev/null and b/assets/UI/prop/lock_7.png differ diff --git a/assets/UI/prop/lock_7.png.meta b/assets/UI/prop/lock_7.png.meta new file mode 100644 index 0000000..a247e79 --- /dev/null +++ b/assets/UI/prop/lock_7.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "f9839f41-2454-4bb8-bb6a-72541e9817c1", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 372, + "height": 150, + "platformSettings": {}, + "subMetas": { + "lock_7": { + "ver": "1.0.6", + "uuid": "60dee577-a7b0-4df6-ae26-eb049efcac6a", + "importer": "sprite-frame", + "rawTextureUuid": "f9839f41-2454-4bb8-bb6a-72541e9817c1", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 372, + "height": 150, + "rawWidth": 372, + "rawHeight": 150, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_8.png b/assets/UI/prop/lock_8.png new file mode 100644 index 0000000..9e5b054 Binary files /dev/null and b/assets/UI/prop/lock_8.png differ diff --git a/assets/UI/prop/lock_8.png.meta b/assets/UI/prop/lock_8.png.meta new file mode 100644 index 0000000..c623ac7 --- /dev/null +++ b/assets/UI/prop/lock_8.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "6a128107-200e-42b2-ab84-3d17b25088d6", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 144, + "height": 376, + "platformSettings": {}, + "subMetas": { + "lock_8": { + "ver": "1.0.6", + "uuid": "a7ab1cc2-d6e3-4d21-9f90-7db2b887ff3e", + "importer": "sprite-frame", + "rawTextureUuid": "6a128107-200e-42b2-ab84-3d17b25088d6", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 144, + "height": 376, + "rawWidth": 144, + "rawHeight": 376, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/UI/prop/lock_9.png b/assets/UI/prop/lock_9.png new file mode 100644 index 0000000..7165c5c Binary files /dev/null and b/assets/UI/prop/lock_9.png differ diff --git a/assets/UI/prop/lock_9.png.meta b/assets/UI/prop/lock_9.png.meta new file mode 100644 index 0000000..24046e5 --- /dev/null +++ b/assets/UI/prop/lock_9.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "27d6215f-626f-4847-bfe8-fd5e09add714", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 372, + "height": 143, + "platformSettings": {}, + "subMetas": { + "lock_9": { + "ver": "1.0.6", + "uuid": "73b0207c-f422-4cfd-96c2-427959375601", + "importer": "sprite-frame", + "rawTextureUuid": "27d6215f-626f-4847-bfe8-fd5e09add714", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 372, + "height": 143, + "rawWidth": 372, + "rawHeight": 143, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/action_bundle/script/NewbieGift.ts b/assets/action_bundle/script/NewbieGift.ts index fc512a8..dc8ab62 100644 --- a/assets/action_bundle/script/NewbieGift.ts +++ b/assets/action_bundle/script/NewbieGift.ts @@ -208,7 +208,8 @@ export default class NewbieGift extends cc.Component { const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 const jiazaiComp = jiazaiNode.getComponent(JiaZai); if (jiazaiComp) { - jiazaiComp.Stamina.parent.getChildByName("xinshou").active = false; + if (jiazaiComp.Stamina) + jiazaiComp.Stamina.parent.getChildByName("xinshou").active = false; jiazaiComp.updateCoin(); } this.closeStarter_pack(); @@ -292,9 +293,12 @@ export default class NewbieGift extends cc.Component { const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 const jiazaiComp = jiazaiNode.getComponent(JiaZai); if (jiazaiComp) { - let top = jiazaiComp.Stamina.parent; - posX = top.x + top.getChildByName("xinshou").x; - posY = top.y + top.getChildByName("xinshou").y; + if (jiazaiComp.Stamina) { + let top = jiazaiComp.Stamina.parent; + posX = top.x + top.getChildByName("xinshou").x; + posY = top.y + top.getChildByName("xinshou").y; + } + } // let isExpired = cc.fx.GameTool.checkExpiration(); // if (jiazaiComp && this.home == 1 && isExpired) { diff --git a/assets/career/script/CareerItem.ts b/assets/career/script/CareerItem.ts index 3aa9b56..68b2ad2 100644 --- a/assets/career/script/CareerItem.ts +++ b/assets/career/script/CareerItem.ts @@ -60,49 +60,55 @@ export default class CareerItem extends cc.Component { this.node.getChildByName("ranking").getChildByName("nomal").active = true; NumberToImage.numberToImageNodes4(this.data.rank, 43, 15, "company_", this.node.getChildByName("ranking").getChildByName("nomal").getChildByName("rank"), true); let rank = this.node.getChildByName("ranking").getChildByName("nomal").getChildByName("rank"); - if (rank.children.length > 0) { - for (let i = 0; i < rank.children.length; i++) { - rank.children[i].color = cc.Color.WHITE; + if (rank && rank.children) { + if (rank.children.length > 0) { + for (let i = 0; i < rank.children.length; i++) { + rank.children[i].color = cc.Color.WHITE; + } } } + } this.node.zIndex = this.data.rank; + if (this.randerChildren) { + if (this.randerChildren.length == 0) { + this.randerChildren = []; + let lengthTemp = 0; + if (this.data.rankingData) { + if (this.data.rankingData.length) { + lengthTemp = this.data.rankingData.length; + } + } - if (this.randerChildren.length == 0) { - this.randerChildren = []; - let lengthTemp = 0; - if (this.data.rankingData.length) { - lengthTemp = this.data.rankingData.length; - } - let length = lengthTemp + 4; - if (length > 12) length = 12; - for (let i = 4; i < length; i++) { - this.randerChildren.push(this.node.children[i]); - let username = cc.fx.GameTool.subName(this.data.rankingData[i - 4].username, 5); - if (username == "user") username = "匿名玩家"; - // console.log("用户名字:", username); - this.node.children[i].getChildByName("kong").active = false; - this.node.children[i].getChildByName("name").getComponent(cc.Label).string = username + ""; - this.node.children[i].getChildByName("level").getComponent(cc.Label).string = this.data.rankingData[i - 4].addLevel; - if (this.data.rankingData[i - 4].useravatar == "" || this.data.rankingData[i - 4].useravatar == null || this.data.rankingData[i - 4].useravatar == undefined - ) { - // this.firstRender.children[i].getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.defaultsprite; + let length = lengthTemp + 4; + if (length > 12) length = 12; + for (let i = 4; i < length; i++) { + this.randerChildren.push(this.node.children[i]); + let username = cc.fx.GameTool.subName(this.data.rankingData[i - 4].username, 5); + if (username == "user") username = "匿名玩家"; + // console.log("用户名字:", username); + this.node.children[i].getChildByName("kong").active = false; + this.node.children[i].getChildByName("name").getComponent(cc.Label).string = username + ""; + this.node.children[i].getChildByName("level").getComponent(cc.Label).string = this.data.rankingData[i - 4].addLevel; + if (this.data.rankingData[i - 4].useravatar == "" || this.data.rankingData[i - 4].useravatar == null || this.data.rankingData[i - 4].useravatar == undefined + ) { + // this.firstRender.children[i].getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.defaultsprite; + } + else if (this.data.rankingData[i - 4].useravatar == "0" || this.data.rankingData[i - 4].useravatar == "1" || this.data.rankingData[i - 4].useravatar == "2" + || this.data.rankingData[i - 4].useravatar == "3" || this.data.rankingData[i - 4].useravatar == "4" || this.data.rankingData[i - 4].useravatar == "5" || this.data.rankingData[i - 4].useravatar == "6" + || this.data.rankingData[i - 4].useravatar == "7" || this.data.rankingData[i - 4].useravatar == "8" || this.data.rankingData[i - 4].useravatar == "9" || + this.data.rankingData[i - 4].useravatar == "10" || this.data.rankingData[i - 4].useravatar == "11" || this.data.rankingData[i - 4].useravatar == "12" || this.data.rankingData[i - 4].useravatar == "13" || this.data.rankingData[i - 4].useravatar == "14" + || this.data.rankingData[i - 4].useravatar == "15" || this.data.rankingData[i - 4].useravatar == "16" || this.data.rankingData[i - 4].useravatar == "17" + ) { + let useravatar = this.data.rankingData[i - 4].useravatar; + let useravatarTemp = "icon_" + useravatar; + // console.log("头像名称", useravatarTemp, "用户名字:", username); + this.node.children[i].getChildByName("mask").getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.UI.getSpriteFrame(useravatarTemp); + } + else this.setPic(this.data.rankingData[i - 4].useravatar, this.node.children[i].getChildByName("mask").getChildByName("icon")); } - else if (this.data.rankingData[i - 4].useravatar == "0" || this.data.rankingData[i - 4].useravatar == "1" || this.data.rankingData[i - 4].useravatar == "2" - || this.data.rankingData[i - 4].useravatar == "3" || this.data.rankingData[i - 4].useravatar == "4" || this.data.rankingData[i - 4].useravatar == "5" || this.data.rankingData[i - 4].useravatar == "6" - || this.data.rankingData[i - 4].useravatar == "7" || this.data.rankingData[i - 4].useravatar == "8" || this.data.rankingData[i - 4].useravatar == "9" || - this.data.rankingData[i - 4].useravatar == "10" || this.data.rankingData[i - 4].useravatar == "11" || this.data.rankingData[i - 4].useravatar == "12" || this.data.rankingData[i - 4].useravatar == "13" || this.data.rankingData[i - 4].useravatar == "14" - || this.data.rankingData[i - 4].useravatar == "15" || this.data.rankingData[i - 4].useravatar == "16" || this.data.rankingData[i - 4].useravatar == "17" - ) { - let useravatar = this.data.rankingData[i - 4].useravatar; - let useravatarTemp = "icon_" + useravatar; - // console.log("头像名称", useravatarTemp, "用户名字:", username); - this.node.children[i].getChildByName("mask").getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.UI.getSpriteFrame(useravatarTemp); - } - else this.setPic(this.data.rankingData[i - 4].useravatar, this.node.children[i].getChildByName("mask").getChildByName("icon")); } } - } else { this.node.opacity = 0; diff --git a/assets/career/script/CareerList.ts b/assets/career/script/CareerList.ts index 43aec3e..e9c47a3 100644 --- a/assets/career/script/CareerList.ts +++ b/assets/career/script/CareerList.ts @@ -171,21 +171,24 @@ export default class CareerList extends cc.Component { /**计算列表的各项参数 */ private countListParam() { - let dataLen = this.itemDataList.length; - let firstRenderHeight = this.firstRender ? this.firstRender.height : 0; - let firstRenderWidth = this.firstRender ? this.firstRender.width : 0; + if (this.itemDataList) { + let dataLen = this.itemDataList.length; + let firstRenderHeight = this.firstRender ? this.firstRender.height : 0; + let firstRenderWidth = this.firstRender ? this.firstRender.width : 0; - if (this.type == ListType.Vertical) { - this.scrollView.horizontal = false; - this.scrollView.vertical = true; - this.content.width = this.content.parent.width; - // 计算高度时考虑firstRender的高度和间距 - this.content.height = firstRenderHeight + (firstRenderHeight > 0 ? this.spaceY : 0) + - dataLen * this.itemHeight + (dataLen - 3) * this.spaceY + this.padding_top + this.padding_buttom + 500; - this.spawnCount = Math.round(this.scrollView.node.height / (this.itemHeight + this.spaceY)) + 4; //计算创建的item实例数量，比当前scrollView容器能放下的item数量再加上2个 - this.halfScrollView = this.scrollView.node.height / 2 + this.itemHeight / 2 + this.spaceY; //计算bufferZone，item的显示范围 - this.updateFun = this.updateV; + if (this.type == ListType.Vertical) { + this.scrollView.horizontal = false; + this.scrollView.vertical = true; + this.content.width = this.content.parent.width; + // 计算高度时考虑firstRender的高度和间距 + this.content.height = firstRenderHeight + (firstRenderHeight > 0 ? this.spaceY : 0) + + dataLen * this.itemHeight + (dataLen - 3) * this.spaceY + this.padding_top + this.padding_buttom + 500; + this.spawnCount = Math.round(this.scrollView.node.height / (this.itemHeight + this.spaceY)) + 4; //计算创建的item实例数量，比当前scrollView容器能放下的item数量再加上2个 + this.halfScrollView = this.scrollView.node.height / 2 + this.itemHeight / 2 + this.spaceY; //计算bufferZone，item的显示范围 + this.updateFun = this.updateV; + } } + } /** diff --git a/assets/custom/Json/level921.json b/assets/custom/Json/level921.json index 725ad9f..db5aa21 100644 --- a/assets/custom/Json/level921.json +++ b/assets/custom/Json/level921.json @@ -2,12 +2,12 @@ "LEVEL_INFO": [ { "risefall": [], - "id": "466", + "id": "921", "map": [ - 9, - 10 + 8, + 8 ], - "time": 150, + "time": 135, "gap": [] } ], @@ -15,425 +15,309 @@ [ { "block": 2, - "color": 5, - "type": 8, + "color": 3, + "type": 0, "position": { - "x": -180, - "y": 240, + "x": -240, + "y": 120, "z": 0 }, - "floor": 1, - "floorTime": 5, "id": 210 }, { "block": 2, - "color": 6, - "type": 4, - "position": { - "x": -300, - "y": 240, - "z": 0 - }, - "freezeTime": 12, - "floor": 1, - "floorTime": 5, - "id": 220 - }, - { - "block": 3, "color": 1, "type": 0, "position": { - "x": 180, - "y": 120, + "x": 360, + "y": -120, + "z": 0 + }, + "id": 220 + }, + { + "block": 16, + "color": 6, + "type": 0, + "position": { + "x": 115, + "y": 0, "z": 0 }, - "floor": 2, - "floorTime": 10, - "floorMove": true, "id": 230 }, { - "block": 1, - "color": 2, - "type": 0, - "position": { - "x": 60, - "y": 0, - "z": 0 - }, - "floor": 2, - "floorTime": 10, - "floorMove": true, - "id": 240 - }, - { - "block": 0, - "color": 3, - "type": 0, - "position": { - "x": 180, - "y": 0, - "z": 0 - }, - "floor": 2, - "floorTime": 10, - "floorMove": true, - "id": 250 - }, - { - "block": 5, + "block": 3, "color": 8, - "type": 8, + "type": 0, "position": { - "x": 420, + "x": 360, "y": -240, "z": 0 }, - "floor": 3, - "floorTime": 15, - "id": 260 + "id": 240 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": 360, + "y": -360, + "z": 0 + }, + "id": 250 }, { "block": 0, - "color": 5, + "color": 10, "type": 0, "position": { - "x": -60, - "y": 360, + "x": 240, + "y": 240, + "z": 0 + }, + "id": 260 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": 0, + "y": 0, "z": 0 }, "id": 270 }, { "block": 0, - "color": 5, - "type": 0, + "color": 11, + "type": 7, "position": { - "x": 420, - "y": 0, + "x": 120, + "y": -360, "z": 0 }, "id": 280 }, { - "block": 1, - "color": 5, - "type": 0, + "block": 0, + "color": 11, + "type": 7, "position": { - "x": -180, - "y": 120, + "x": 0, + "y": 240, "z": 0 }, "id": 290 }, - { - "block": 3, - "color": 3, - "type": 0, - "position": { - "x": 300, - "y": 360, - "z": 0 - }, - "id": 300 - }, { "block": 0, - "color": 2, - "type": 0, - "position": { - "x": -60, - "y": 240, - "z": 0 - }, - "id": 310 - }, - { - "block": 2, "color": 10, - "type": 0, + "type": 17, "position": { - "x": -300, - "y": -480, - "z": 0 - }, - "id": 320 - }, - { - "block": 2, - "color": 10, - "type": 0, - "position": { - "x": -60, - "y": -360, - "z": 0 - }, - "id": 330 - }, - { - "block": 2, - "color": 2, - "type": 0, - "position": { - "x": 60, - "y": -480, - "z": 0 - }, - "id": 340 - }, - { - "block": 0, - "color": 9, - "type": 0, - "position": { - "x": 180, - "y": -480, - "z": 0 - }, - "id": 350 - }, - { - "block": 2, - "color": 2, - "type": 9, - "position": { - "x": -300, - "y": -240, - "z": 0 - }, - "adhesiveTime": 2, - "id": 360 - }, - { - "block": 0, - "color": 6, - "type": 9, - "position": { - "x": -180, - "y": -120, - "z": 0 - }, - "adhesiveTime": 1, - "id": 370 - }, - { - "block": 1, - "color": 6, - "type": 9, - "position": { - "x": 180, - "y": -120, - "z": 0 - }, - "adhesiveTime": 2, - "id": 380 - }, - { - "block": 0, - "color": 8, - "type": 9, - "position": { - "x": 180, - "y": -240, - "z": 0 - }, - "adhesiveTime": 1, - "id": 390 - }, - { - "block": 1, - "color": 9, - "type": 9, - "position": { - "x": 420, - "y": -360, - "z": 0 - }, - "adhesiveTime": 2, - "id": 400 - }, - { - "block": 0, - "color": 7, - "type": 9, - "position": { - "x": 420, - "y": -480, - "z": 0 - }, - "adhesiveTime": 1, - "id": 410 - }, - { - "block": 2, - "color": 8, - "type": 0, - "position": { - "x": 300, + "x": -240, "y": 0, "z": 0 }, - "id": 420 - }, - { - "block": 2, - "color": 6, - "type": 0, - "position": { - "x": 420, - "y": 240, - "z": 0 - }, - "id": 430 + "boomTime": 1, + "id": 300 }, { "block": 1, - "color": 9, - "type": 4, + "color": 7, + "type": 17, "position": { - "x": -60, - "y": -480, + "x": 0, + "y": 120, "z": 0 }, - "freezeTime": 9, - "id": 440 + "boomTime": 2, + "id": 310 + }, + { + "block": 5, + "color": 5, + "type": 0, + "position": { + "x": -120, + "y": -360, + "z": 0 + }, + "lock": false, + "id": 320 + }, + { + "block": 22, + "color": 2, + "type": 0, + "position": { + "x": 0, + "y": -240, + "z": 0 + }, + "lock": false, + "id": 330 + }, + { + "block": 1, + "color": 4, + "type": 0, + "position": { + "x": 240, + "y": -120, + "z": 0 + }, + "lock": true, + "id": 340 } ] ], "WALL_INFO": [ [ { - "id": 467, - "num": 2, - "color": 7, + "id": 922, + "num": 0, + "color": 1, "special": 0, "length": 2 }, { - "id": 468, - "num": 3, - "color": 7, + "id": 923, + "num": 1, + "color": 1, "special": 0, "length": 0 }, { - "id": 469, - "num": 5, + "id": 924, + "num": 2, + "color": 6, + "special": 3, + "length": 3, + "freeze": 9 + }, + { + "id": 925, + "num": 3, + "color": 6, + "special": 3, + "length": 0, + "freeze": 9 + }, + { + "id": 926, + "num": 4, + "color": 6, + "special": 3, + "length": 0, + "freeze": 9 + }, + { + "id": 927, + "num": 7, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 928, + "num": 9, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 929, + "num": 13, + "color": 8, + "special": 0, + "length": 3 + }, + { + "id": 930, + "num": 15, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 931, + "num": 17, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 932, + "num": 23, "color": 9, + "special": 4, + "length": 1 + }, + { + "id": 933, + "num": 21, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 934, + "num": 22, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 935, + "num": 19, + "color": 3, + "special": 3, + "length": 2, + "freeze": 6 + }, + { + "id": 936, + "num": 20, + "color": 3, + "special": 3, + "length": 0, + "freeze": 6 + }, + { + "id": 937, + "num": 18, + "color": 10, "special": 0, "length": 1 }, { - "id": 470, - "num": 13, - "color": 1, - "special": 0, - "length": 3 - }, - { - "id": 471, - "num": 15, - "color": 1, - "special": 0, - "length": 0 - }, - { - "id": 472, - "num": 17, - "color": 1, - "special": 0, - "length": 0 - }, - { - "id": 473, - "num": 28, - "color": 10, - "special": 0, - "length": 2 - }, - { - "id": 474, - "num": 29, - "color": 10, - "special": 0, - "length": 0 - }, - { - "id": 475, - "num": 25, - "color": 2, - "special": 0, - "length": 2 - }, - { - "id": 476, - "num": 26, - "color": 2, - "special": 0, - "length": 0 - }, - { - "id": 477, - "num": 22, - "color": 6, - "special": 0, - "length": 2 - }, - { - "id": 478, - "num": 23, - "color": 6, - "special": 0, - "length": 0 - }, - { - "id": 479, - "num": 18, - "color": 8, - "special": 0, - "length": 2 - }, - { - "id": 480, - "num": 20, - "color": 8, - "special": 0, - "length": 0 - }, - { - "id": 481, - "num": 12, - "color": 3, - "special": 0, - "length": 3 - }, - { - "id": 482, + "id": 938, "num": 14, - "color": 3, - "special": 0, - "length": 0 - }, - { - "id": 483, - "num": 16, - "color": 3, - "special": 0, - "length": 0 - }, - { - "id": 484, - "num": 8, - "color": 5, + "color": 2, "special": 0, "length": 2 }, { - "id": 485, - "num": 10, - "color": 5, + "id": 939, + "num": 16, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 940, + "num": 6, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 941, + "num": 8, + "color": 7, "special": 0, "length": 0 } diff --git a/assets/custom/Json/level921.json.meta b/assets/custom/Json/level921.json.meta index 9af77ef..78f025d 100644 --- a/assets/custom/Json/level921.json.meta +++ b/assets/custom/Json/level921.json.meta @@ -1,6 +1,6 @@ { "ver": "1.0.2", - "uuid": "2af9ceb8-1935-4bdf-a62b-25631dd0e36c", + "uuid": "413944b2-50b1-4ef9-8dd4-98d037684239", "importer": "json", "subMetas": {} } \ No newline at end of file diff --git a/assets/custom/Json/level922.json b/assets/custom/Json/level922.json new file mode 100644 index 0000000..12c7868 --- /dev/null +++ b/assets/custom/Json/level922.json @@ -0,0 +1,336 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "922", + "map": [ + 9, + 9 + ], + "time": 110, + "gap": [ + { + "x": 1, + "y": 4, + "z": 0 + }, + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 3, + "y": 7, + "z": 0 + }, + { + "x": 4, + "y": 7, + "z": 0 + }, + { + "x": 5, + "y": 7, + "z": 0 + }, + { + "x": 6, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 4, + "z": 0 + }, + { + "x": 2, + "y": 5, + "z": 0 + }, + { + "x": 2, + "y": 6, + "z": 0 + }, + { + "x": 3, + "y": 5, + "z": 0 + }, + { + "x": 3, + "y": 6, + "z": 0 + }, + { + "x": 4, + "y": 6, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 1, + "color": 7, + "type": 0, + "position": { + "x": -180, + "y": -420, + "z": 0 + }, + "id": 210 + }, + { + "block": 22, + "color": 7, + "type": 0, + "position": { + "x": 180, + "y": -60, + "z": 0 + }, + "id": 220 + }, + { + "block": 2, + "color": 5, + "type": 0, + "position": { + "x": 420, + "y": -60, + "z": 0 + }, + "id": 230 + }, + { + "block": 2, + "color": 3, + "type": 17, + "position": { + "x": 60, + "y": -180, + "z": 0 + }, + "boomTime": 1, + "id": 240 + }, + { + "block": 2, + "color": 4, + "type": 17, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "boomTime": 2, + "id": 250 + }, + { + "block": 5, + "color": 2, + "type": 14, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "id": 260 + }, + { + "block": 0, + "color": 1, + "type": 14, + "position": { + "x": 180, + "y": -420, + "z": 0 + }, + "id": 270 + }, + { + "block": 1, + "color": 6, + "type": 14, + "position": { + "x": 420, + "y": -180, + "z": 0 + }, + "id": 280 + }, + { + "block": 14, + "color": 9, + "type": 14, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "id": 290 + }, + { + "block": 0, + "color": 3, + "type": 14, + "position": { + "x": -60, + "y": -180, + "z": 0 + }, + "id": 300 + }, + { + "block": 1, + "color": 1, + "type": 9, + "position": { + "x": -180, + "y": -180, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 10, + "id": 310 + }, + { + "block": 0, + "color": 6, + "type": 9, + "position": { + "x": -180, + "y": -300, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 10, + "id": 320 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 923, + "num": 0, + "color": 6, + "special": 0, + "length": 1 + }, + { + "id": 924, + "num": 1, + "color": 5, + "special": 6, + "length": 2, + "lockTime": 5 + }, + { + "id": 925, + "num": 2, + "color": 5, + "special": 6, + "length": 0, + "lockTime": 5 + }, + { + "id": 926, + "num": 20, + "color": 3, + "special": 0, + "length": 1 + }, + { + "id": 927, + "num": 25, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 928, + "num": 26, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 929, + "num": 24, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 930, + "num": 21, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 931, + "num": 22, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 932, + "num": 14, + "color": 9, + "special": 0, + "length": 3 + }, + { + "id": 933, + "num": 16, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 934, + "num": 19, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 935, + "num": 3, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 936, + "num": 5, + "color": 2, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level922.json.meta b/assets/custom/Json/level922.json.meta new file mode 100644 index 0000000..56a0310 --- /dev/null +++ b/assets/custom/Json/level922.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "1992f226-e114-410d-8126-175d929686fd", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level923.json b/assets/custom/Json/level923.json new file mode 100644 index 0000000..74f44c2 --- /dev/null +++ b/assets/custom/Json/level923.json @@ -0,0 +1,413 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "923", + "map": [ + 10, + 9 + ], + "time": 130, + "gap": [ + { + "x": 1, + "y": 2, + "z": 0 + }, + { + "x": 1, + "y": 3, + "z": 0 + }, + { + "x": 1, + "y": 4, + "z": 0 + }, + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 2, + "y": 5, + "z": 0 + }, + { + "x": 2, + "y": 4, + "z": 0 + }, + { + "x": 2, + "y": 3, + "z": 0 + }, + { + "x": 3, + "y": 5, + "z": 0 + }, + { + "x": 3, + "y": 4, + "z": 0 + }, + { + "x": 8, + "y": 5, + "z": 0 + }, + { + "x": 8, + "y": 4, + "z": 0 + }, + { + "x": 8, + "y": 3, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 0, + "y": 60, + "z": 0 + }, + "id": 210 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": -360, + "y": 300, + "z": 0 + }, + "id": 220 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": 360, + "y": 180, + "z": 0 + }, + "id": 230 + }, + { + "block": 1, + "color": 10, + "type": 0, + "position": { + "x": -240, + "y": 180, + "z": 0 + }, + "id": 240 + }, + { + "block": 1, + "color": 6, + "type": 0, + "position": { + "x": 480, + "y": -300, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": 240, + "y": -180, + "z": 0 + }, + "id": 260 + }, + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": 360, + "y": 300, + "z": 0 + }, + "id": 270 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": 360, + "y": -60, + "z": 0 + }, + "floor": 1, + "floorTime": 8, + "floorMove": false, + "id": 280 + }, + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": -360, + "y": -420, + "z": 0 + }, + "floor": 2, + "floorTime": 10, + "floorMove": false, + "id": 290 + }, + { + "block": 1, + "color": 7, + "type": 0, + "position": { + "x": -120, + "y": 300, + "z": 0 + }, + "lock": false, + "id": 300 + }, + { + "block": 2, + "color": 3, + "type": 0, + "position": { + "x": 0, + "y": 180, + "z": 0 + }, + "lock": false, + "id": 310 + }, + { + "block": 5, + "color": 9, + "type": 0, + "position": { + "x": 120, + "y": -420, + "z": 0 + }, + "lock": false, + "id": 320 + }, + { + "block": 3, + "color": 8, + "type": 0, + "position": { + "x": 480, + "y": -420, + "z": 0 + }, + "lock": false, + "id": 330 + }, + { + "block": 22, + "color": 6, + "type": 0, + "position": { + "x": -120, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 340 + }, + { + "block": 4, + "color": 8, + "type": 0, + "position": { + "x": 120, + "y": -180, + "z": 0 + }, + "lock": true, + "id": 350 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 480, + "y": 180, + "z": 0 + }, + "lock": false, + "id": 360 + }, + { + "block": 0, + "color": 6, + "type": 7, + "position": { + "x": 120, + "y": 300, + "z": 0 + }, + "id": 370 + }, + { + "block": 23, + "color": 6, + "type": 7, + "position": { + "x": 360, + "y": -180, + "z": 0 + }, + "id": 380 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 924, + "num": 0, + "color": 5, + "special": 0, + "length": 1 + }, + { + "id": 925, + "num": 1, + "color": 6, + "special": 0, + "length": 2 + }, + { + "id": 926, + "num": 2, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 927, + "num": 18, + "color": 9, + "special": 4, + "length": 2 + }, + { + "id": 928, + "num": 20, + "color": 9, + "special": 4, + "length": 0 + }, + { + "id": 929, + "num": 24, + "color": 8, + "special": 0, + "length": 3 + }, + { + "id": 930, + "num": 26, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 931, + "num": 33, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 932, + "num": 36, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 933, + "num": 37, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 934, + "num": 34, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 935, + "num": 35, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 936, + "num": 27, + "color": 2, + "special": 0, + "length": 1 + }, + { + "id": 937, + "num": 21, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 938, + "num": 23, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 939, + "num": 13, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 940, + "num": 19, + "color": 7, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level923.json.meta b/assets/custom/Json/level923.json.meta new file mode 100644 index 0000000..ce0ae4c --- /dev/null +++ b/assets/custom/Json/level923.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "2090c561-7a15-42b8-8c52-38538bf0954e", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level924.json b/assets/custom/Json/level924.json new file mode 100644 index 0000000..3d8bdfa --- /dev/null +++ b/assets/custom/Json/level924.json @@ -0,0 +1,496 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "924", + "map": [ + 10, + 11 + ], + "time": 135, + "gap": [ + { + "x": 1, + "y": 1, + "z": 0 + }, + { + "x": 2, + "y": 1, + "z": 0 + }, + { + "x": 3, + "y": 1, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + }, + { + "x": 7, + "y": 1, + "z": 0 + }, + { + "x": 8, + "y": 1, + "z": 0 + }, + { + "x": 1, + "y": 4, + "z": 0 + }, + { + "x": 2, + "y": 4, + "z": 0 + }, + { + "x": 2, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 8, + "y": 4, + "z": 0 + }, + { + "x": 7, + "y": 4, + "z": 0 + }, + { + "x": 7, + "y": 5, + "z": 0 + }, + { + "x": 8, + "y": 5, + "z": 0 + }, + { + "x": 8, + "y": 6, + "z": 0 + }, + { + "x": 8, + "y": 7, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": 120, + "y": 300, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": 120, + "y": 420, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": 0, + "y": 300, + "z": 0 + }, + "id": 230 + }, + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": 0, + "y": 420, + "z": 0 + }, + "id": 240 + }, + { + "block": 2, + "color": 5, + "type": 0, + "position": { + "x": -120, + "y": 300, + "z": 0 + }, + "id": 250 + }, + { + "block": 17, + "color": 5, + "type": 0, + "position": { + "x": 240, + "y": -60, + "z": 0 + }, + "id": 260 + }, + { + "block": 1, + "color": 10, + "type": 0, + "position": { + "x": -120, + "y": 180, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": 360, + "y": 180, + "z": 0 + }, + "id": 280 + }, + { + "block": 1, + "color": 3, + "type": 0, + "position": { + "x": 120, + "y": 180, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 6, + "type": 0, + "position": { + "x": 240, + "y": 300, + "z": 0 + }, + "id": 300 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 480, + "y": 300, + "z": 0 + }, + "id": 310 + }, + { + "block": 0, + "color": 11, + "type": 0, + "position": { + "x": -120, + "y": -60, + "z": 0 + }, + "id": 320 + }, + { + "block": 1, + "color": 4, + "type": 0, + "position": { + "x": 0, + "y": -180, + "z": 0 + }, + "id": 330 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 240, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 340 + }, + { + "block": 2, + "color": 7, + "type": 0, + "position": { + "x": 120, + "y": -420, + "z": 0 + }, + "lock": false, + "id": 350 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": -120, + "y": 60, + "z": 0 + }, + "lock": false, + "id": 360 + }, + { + "block": 0, + "color": 3, + "type": 0, + "position": { + "x": 360, + "y": -420, + "z": 0 + }, + "lock": false, + "id": 370 + }, + { + "block": 0, + "color": 4, + "type": 17, + "position": { + "x": 0, + "y": -540, + "z": 0 + }, + "boomTime": 1, + "id": 380 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": -360, + "y": 420, + "z": 0 + }, + "adhesiveTime": 2, + "id": 390 + }, + { + "block": 0, + "color": 5, + "type": 9, + "position": { + "x": -360, + "y": 300, + "z": 0 + }, + "adhesiveTime": 1, + "id": 400 + }, + { + "block": 0, + "color": 4, + "type": 2, + "position": { + "x": -360, + "y": -420, + "z": 0 + }, + "floor": 1, + "floorTime": 9, + "floorMove": false, + "id": 410 + }, + { + "block": 22, + "color": 6, + "type": 2, + "position": { + "x": -240, + "y": -420, + "z": 0 + }, + "floor": 1, + "floorTime": 9, + "floorMove": false, + "id": 420 + }, + { + "block": 2, + "color": 5, + "type": 2, + "position": { + "x": -120, + "y": -420, + "z": 0 + }, + "floor": 1, + "floorTime": 9, + "floorMove": false, + "id": 430 + }, + { + "block": 2, + "color": 7, + "type": 2, + "position": { + "x": 0, + "y": -420, + "z": 0 + }, + "floor": 1, + "floorTime": 9, + "floorMove": false, + "id": 440 + }, + { + "block": 22, + "color": 6, + "type": 3, + "position": { + "x": 480, + "y": -420, + "z": 0 + }, + "lockTime": 4, + "id": 450 + }, + { + "block": 0, + "color": 9, + "type": 6, + "position": { + "x": 120, + "y": -60, + "z": 0 + }, + "boomTime": 45, + "id": 460 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 925, + "num": 1, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 926, + "num": 2, + "color": 3, + "special": 0, + "length": 1 + }, + { + "id": 927, + "num": 40, + "color": 4, + "special": 0, + "length": 1 + }, + { + "id": 928, + "num": 39, + "color": 10, + "special": 0, + "length": 1 + }, + { + "id": 929, + "num": 19, + "color": 5, + "special": 3, + "length": 2, + "freeze": 11 + }, + { + "id": 930, + "num": 21, + "color": 5, + "special": 3, + "length": 0, + "freeze": 11 + }, + { + "id": 931, + "num": 15, + "color": 6, + "special": 0, + "length": 2, + "colorArray": "51" + }, + { + "id": 932, + "num": 18, + "color": 6, + "special": 0, + "length": 0, + "colorArray": "51" + }, + { + "id": 933, + "num": 25, + "color": 9, + "special": 0, + "length": 2, + "colorArray": "86" + }, + { + "id": 934, + "num": 31, + "color": 9, + "special": 0, + "length": 0, + "colorArray": "86" + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level924.json.meta b/assets/custom/Json/level924.json.meta new file mode 100644 index 0000000..4490166 --- /dev/null +++ b/assets/custom/Json/level924.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "68db166e-627d-485f-a60d-31ce635f1616", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level925.json b/assets/custom/Json/level925.json new file mode 100644 index 0000000..da7381a --- /dev/null +++ b/assets/custom/Json/level925.json @@ -0,0 +1,322 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "925", + "map": [ + 8, + 8 + ], + "time": 120, + "gap": [ + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 6, + "y": 6, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 9, + "type": 0, + "position": { + "x": 0, + "y": 240, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": 0, + "y": -360, + "z": 0 + }, + "id": 220 + }, + { + "block": 2, + "color": 7, + "type": 0, + "position": { + "x": -240, + "y": -360, + "z": 0 + }, + "id": 230 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 120, + "y": -360, + "z": 0 + }, + "id": 240 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": 120, + "y": 240, + "z": 0 + }, + "id": 250 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": 0, + "y": 0, + "z": 0 + }, + "id": 260 + }, + { + "block": 0, + "color": 6, + "type": 0, + "position": { + "x": 240, + "y": -360, + "z": 0 + }, + "id": 270 + }, + { + "block": 2, + "color": 3, + "type": 2, + "position": { + "x": -240, + "y": -120, + "z": 0 + }, + "id": 280 + }, + { + "block": 2, + "color": 2, + "type": 2, + "position": { + "x": 120, + "y": -120, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 5, + "type": 2, + "position": { + "x": 240, + "y": 120, + "z": 0 + }, + "id": 300 + }, + { + "block": 6, + "color": 6, + "type": 2, + "position": { + "x": 360, + "y": -360, + "z": 0 + }, + "id": 310 + }, + { + "block": 1, + "color": 1, + "type": 3, + "position": { + "x": 0, + "y": -240, + "z": 0 + }, + "lockTime": 4, + "id": 320 + }, + { + "block": 2, + "color": 6, + "type": 1, + "position": { + "x": -120, + "y": -120, + "z": 0 + }, + "stacking": 9, + "id": 330 + }, + { + "block": 3, + "color": 7, + "type": 1, + "position": { + "x": 120, + "y": 120, + "z": 0 + }, + "stacking": 10, + "id": 340 + }, + { + "block": 1, + "color": 10, + "type": 1, + "position": { + "x": 360, + "y": 0, + "z": 0 + }, + "stacking": 2, + "id": 350 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 926, + "num": 2, + "color": 10, + "special": 3, + "length": 1, + "freeze": 10 + }, + { + "id": 927, + "num": 3, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 928, + "num": 4, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 929, + "num": 9, + "color": 5, + "special": 0, + "length": 1 + }, + { + "id": 930, + "num": 22, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 931, + "num": 23, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 932, + "num": 19, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 933, + "num": 20, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 934, + "num": 13, + "color": 6, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": true + }, + { + "id": 935, + "num": 15, + "color": 6, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": true + }, + { + "id": 936, + "num": 12, + "color": 7, + "special": 0, + "length": 3, + "longAndShort": 13, + "order": false + }, + { + "id": 937, + "num": 14, + "color": 7, + "special": 0, + "length": 0, + "longAndShort": 13, + "order": false + }, + { + "id": 938, + "num": 16, + "color": 7, + "special": 0, + "length": 0, + "longAndShort": 13, + "order": false + }, + { + "id": 939, + "num": 5, + "color": 2, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": true + }, + { + "id": 940, + "num": 8, + "color": 2, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": true + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level925.json.meta b/assets/custom/Json/level925.json.meta new file mode 100644 index 0000000..43de85e --- /dev/null +++ b/assets/custom/Json/level925.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "e274b8a0-8952-4b02-a32e-37ecff4da04a", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level926.json b/assets/custom/Json/level926.json new file mode 100644 index 0000000..1a3a6a9 --- /dev/null +++ b/assets/custom/Json/level926.json @@ -0,0 +1,236 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "926", + "map": [ + 8, + 8 + ], + "time": 120, + "gap": [ + { + "x": 3, + "y": 6, + "z": 0 + }, + { + "x": 3, + "y": 5, + "z": 0 + }, + { + "x": 4, + "y": 6, + "z": 0 + }, + { + "x": 4, + "y": 5, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 240, + "y": 240, + "z": 0 + }, + "id": 210 + }, + { + "block": 1, + "color": 8, + "type": 0, + "position": { + "x": 0, + "y": -360, + "z": 0 + }, + "id": 220 + }, + { + "block": 1, + "color": 3, + "type": 0, + "position": { + "x": -120, + "y": -120, + "z": 0 + }, + "id": 230 + }, + { + "block": 1, + "color": 10, + "type": 0, + "position": { + "x": 360, + "y": 0, + "z": 0 + }, + "id": 240 + }, + { + "block": 1, + "color": 1, + "type": 0, + "position": { + "x": 360, + "y": -120, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 7, + "type": 0, + "position": { + "x": 120, + "y": -360, + "z": 0 + }, + "id": 260 + }, + { + "block": 2, + "color": 9, + "type": 0, + "position": { + "x": 360, + "y": 120, + "z": 0 + }, + "id": 270 + }, + { + "block": 19, + "color": 5, + "type": 0, + "position": { + "x": 360, + "y": -360, + "z": 0 + }, + "lock": false, + "id": 280 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": 120, + "y": -120, + "z": 0 + }, + "lock": false, + "id": 290 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": -120, + "y": 0, + "z": 0 + }, + "lock": true, + "id": 300 + }, + { + "block": 2, + "color": 6, + "type": 0, + "position": { + "x": -240, + "y": -360, + "z": 0 + }, + "lock": true, + "id": 310 + }, + { + "block": 4, + "color": 7, + "type": 16, + "position": { + "x": -240, + "y": 0, + "z": 0 + }, + "questionTime": 8, + "id": 320 + }, + { + "block": 0, + "color": 8, + "type": 16, + "position": { + "x": 0, + "y": -120, + "z": 0 + }, + "questionTime": 10, + "id": 330 + }, + { + "block": 0, + "color": 3, + "type": 16, + "position": { + "x": 0, + "y": -240, + "z": 0 + }, + "questionTime": 12, + "id": 340 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 927, + "num": 7, + "color": 5, + "special": 0, + "length": 2, + "colorArray": "47309" + }, + { + "id": 928, + "num": 9, + "color": 5, + "special": 0, + "length": 0, + "colorArray": "47309" + }, + { + "id": 929, + "num": 19, + "color": 3, + "special": 0, + "length": 2, + "colorArray": "215862626" + }, + { + "id": 930, + "num": 21, + "color": 3, + "special": 0, + "length": 0, + "colorArray": "215862626" + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level926.json.meta b/assets/custom/Json/level926.json.meta new file mode 100644 index 0000000..772329a --- /dev/null +++ b/assets/custom/Json/level926.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "9a8c7d51-c195-43c1-afdc-f4240e17bda0", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level927.json b/assets/custom/Json/level927.json new file mode 100644 index 0000000..fc0dd97 --- /dev/null +++ b/assets/custom/Json/level927.json @@ -0,0 +1,326 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "927", + "map": [ + 9, + 8 + ], + "time": 100, + "gap": [ + { + "x": 1, + "y": 3, + "z": 0 + }, + { + "x": 1, + "y": 2, + "z": 0 + }, + { + "x": 1, + "y": 1, + "z": 0 + }, + { + "x": 3, + "y": 1, + "z": 0 + }, + { + "x": 2, + "y": 1, + "z": 0 + }, + { + "x": 2, + "y": 2, + "z": 0 + }, + { + "x": 5, + "y": 1, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + }, + { + "x": 7, + "y": 1, + "z": 0 + }, + { + "x": 7, + "y": 2, + "z": 0 + }, + { + "x": 7, + "y": 3, + "z": 0 + }, + { + "x": 6, + "y": 2, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 60, + "y": 240, + "z": 0 + }, + "id": 210 + }, + { + "block": 2, + "color": 5, + "type": 0, + "position": { + "x": -60, + "y": 0, + "z": 0 + }, + "id": 220 + }, + { + "block": 2, + "color": 3, + "type": 0, + "position": { + "x": 180, + "y": 0, + "z": 0 + }, + "id": 230 + }, + { + "block": 22, + "color": 8, + "type": 0, + "position": { + "x": -180, + "y": 120, + "z": 0 + }, + "lock": true, + "id": 240 + }, + { + "block": 21, + "color": 6, + "type": 0, + "position": { + "x": 300, + "y": 120, + "z": 0 + }, + "lock": true, + "id": 250 + }, + { + "block": 1, + "color": 4, + "type": 0, + "position": { + "x": -60, + "y": -120, + "z": 0 + }, + "lock": true, + "id": 260 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": 300, + "y": -120, + "z": 0 + }, + "lock": true, + "id": 270 + }, + { + "block": 4, + "color": 1, + "type": 14, + "position": { + "x": 60, + "y": -360, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 8, + "type": 14, + "position": { + "x": -300, + "y": 120, + "z": 0 + }, + "id": 290 + }, + { + "block": 0, + "color": 6, + "type": 14, + "position": { + "x": 420, + "y": 120, + "z": 0 + }, + "id": 300 + }, + { + "block": 2, + "color": 10, + "type": 14, + "position": { + "x": 60, + "y": 0, + "z": 0 + }, + "id": 310 + }, + { + "block": 0, + "color": 3, + "type": 16, + "position": { + "x": 300, + "y": 0, + "z": 0 + }, + "questionTime": 7, + "id": 320 + }, + { + "block": 0, + "color": 10, + "type": 16, + "position": { + "x": -180, + "y": 0, + "z": 0 + }, + "questionTime": 9, + "id": 330 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 928, + "num": 0, + "color": 9, + "special": 0, + "length": 1 + }, + { + "id": 929, + "num": 1, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 930, + "num": 2, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 931, + "num": 24, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 932, + "num": 25, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 933, + "num": 23, + "color": 4, + "special": 0, + "length": 1 + }, + { + "id": 934, + "num": 8, + "color": 6, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": false + }, + { + "id": 935, + "num": 11, + "color": 6, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": false + }, + { + "id": 936, + "num": 16, + "color": 8, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": false + }, + { + "id": 937, + "num": 19, + "color": 8, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": false + }, + { + "id": 938, + "num": 13, + "color": 1, + "special": 3, + "length": 1, + "freeze": 10 + }, + { + "id": 939, + "num": 12, + "color": 5, + "special": 6, + "length": 1, + "lockTime": 4 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level927.json.meta b/assets/custom/Json/level927.json.meta new file mode 100644 index 0000000..4ff669b --- /dev/null +++ b/assets/custom/Json/level927.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "aa484a99-8960-4773-8610-a8c79edf643d", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level928.json b/assets/custom/Json/level928.json new file mode 100644 index 0000000..d5b8e73 --- /dev/null +++ b/assets/custom/Json/level928.json @@ -0,0 +1,388 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "928", + "map": [ + 9, + 9 + ], + "time": 100, + "gap": [ + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 4, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": -180, + "y": -60, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": -60, + "y": -180, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": -60, + "y": -60, + "z": 0 + }, + "id": 230 + }, + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": -180, + "y": -180, + "z": 0 + }, + "id": 240 + }, + { + "block": 2, + "color": 3, + "type": 0, + "position": { + "x": -300, + "y": -300, + "z": 0 + }, + "id": 250 + }, + { + "block": 1, + "color": 8, + "type": 0, + "position": { + "x": 300, + "y": -420, + "z": 0 + }, + "id": 260 + }, + { + "block": 1, + "color": 4, + "type": 0, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "id": 270 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 9, + "type": 0, + "position": { + "x": 60, + "y": 180, + "z": 0 + }, + "id": 290 + }, + { + "block": 1, + "color": 7, + "type": 9, + "position": { + "x": 180, + "y": -60, + "z": 0 + }, + "adhesiveTime": 2, + "id": 300 + }, + { + "block": 1, + "color": 7, + "type": 9, + "position": { + "x": 60, + "y": 60, + "z": 0 + }, + "adhesiveTime": 1, + "id": 310 + }, + { + "block": 20, + "color": 6, + "type": 0, + "position": { + "x": -60, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 320 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": -180, + "y": 180, + "z": 0 + }, + "lock": true, + "id": 330 + }, + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": -60, + "y": 180, + "z": 0 + }, + "lock": true, + "id": 340 + }, + { + "block": 2, + "color": 8, + "type": 0, + "position": { + "x": 420, + "y": -60, + "z": 0 + }, + "lock": true, + "id": 350 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": 420, + "y": 180, + "z": 0 + }, + "lock": false, + "id": 360 + }, + { + "block": 16, + "color": 3, + "type": 0, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "lock": false, + "id": 370 + }, + { + "block": 2, + "color": 9, + "type": 8, + "position": { + "x": 180, + "y": 180, + "z": 0 + }, + "id": 380 + }, + { + "block": 2, + "color": 5, + "type": 16, + "position": { + "x": 300, + "y": -180, + "z": 0 + }, + "questionTime": 10, + "id": 390 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 929, + "num": 0, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 930, + "num": 1, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 931, + "num": 3, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 932, + "num": 4, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 933, + "num": 12, + "color": 8, + "special": 2, + "length": 2, + "lock": true + }, + { + "id": 934, + "num": 14, + "color": 8, + "special": 2, + "length": 0, + "lock": true + }, + { + "id": 935, + "num": 18, + "color": 6, + "special": 2, + "length": 2, + "lock": true + }, + { + "id": 936, + "num": 20, + "color": 6, + "special": 2, + "length": 0, + "lock": true + }, + { + "id": 937, + "num": 27, + "color": 3, + "special": 0, + "length": 3 + }, + { + "id": 938, + "num": 28, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 939, + "num": 29, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 940, + "num": 23, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 941, + "num": 24, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 19, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 943, + "num": 21, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 944, + "num": 15, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 945, + "num": 17, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 946, + "num": 5, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 947, + "num": 11, + "color": 4, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level928.json.meta b/assets/custom/Json/level928.json.meta new file mode 100644 index 0000000..8fae1dd --- /dev/null +++ b/assets/custom/Json/level928.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "22168317-be5c-4aac-8a84-f686750ab3bd", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level929.json b/assets/custom/Json/level929.json new file mode 100644 index 0000000..b49f3b6 --- /dev/null +++ b/assets/custom/Json/level929.json @@ -0,0 +1,381 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "929", + "map": [ + 9, + 8 + ], + "time": 120, + "gap": [ + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 7, + "y": 6, + "z": 0 + }, + { + "x": 3, + "y": 1, + "z": 0 + }, + { + "x": 4, + "y": 1, + "z": 0 + }, + { + "x": 5, + "y": 1, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": -60, + "y": 240, + "z": 0 + }, + "floor": 1, + "floorTime": 4, + "floorMove": false, + "id": 210 + }, + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": 180, + "y": 240, + "z": 0 + }, + "floor": 3, + "floorTime": 11, + "floorMove": false, + "id": 220 + }, + { + "block": 2, + "color": 5, + "type": 9, + "position": { + "x": -300, + "y": 0, + "z": 0 + }, + "adhesiveTime": 2, + "id": 230 + }, + { + "block": 2, + "color": 5, + "type": 9, + "position": { + "x": -180, + "y": 120, + "z": 0 + }, + "adhesiveTime": 1, + "id": 240 + }, + { + "block": 2, + "color": 9, + "type": 9, + "position": { + "x": 300, + "y": 120, + "z": 0 + }, + "adhesiveTime": 2, + "id": 250 + }, + { + "block": 2, + "color": 9, + "type": 9, + "position": { + "x": 420, + "y": 0, + "z": 0 + }, + "adhesiveTime": 1, + "id": 260 + }, + { + "block": 1, + "color": 5, + "type": 1, + "position": { + "x": -180, + "y": -360, + "z": 0 + }, + "stacking": 7, + "id": 270 + }, + { + "block": 1, + "color": 8, + "type": 1, + "position": { + "x": 420, + "y": -360, + "z": 0 + }, + "stacking": 2, + "id": 280 + }, + { + "block": 2, + "color": 4, + "type": 1, + "position": { + "x": -180, + "y": -240, + "z": 0 + }, + "stacking": 9, + "id": 290 + }, + { + "block": 2, + "color": 3, + "type": 1, + "position": { + "x": -60, + "y": -240, + "z": 0 + }, + "stacking": 5, + "id": 300 + }, + { + "block": 0, + "color": 8, + "type": 1, + "position": { + "x": 60, + "y": -120, + "z": 0 + }, + "stacking": 2, + "id": 310 + }, + { + "block": 2, + "color": 10, + "type": 1, + "position": { + "x": 300, + "y": -240, + "z": 0 + }, + "stacking": 1, + "id": 320 + }, + { + "block": 2, + "color": 10, + "type": 1, + "position": { + "x": 180, + "y": -240, + "z": 0 + }, + "stacking": 4, + "id": 330 + }, + { + "block": 0, + "color": 1, + "type": 8, + "position": { + "x": 60, + "y": -240, + "z": 0 + }, + "id": 340 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": 60, + "y": 0, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 7, + "id": 350 + }, + { + "block": 0, + "color": 2, + "type": 9, + "position": { + "x": 180, + "y": 0, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 7, + "id": 360 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": 60, + "y": 120, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 10, + "id": 370 + }, + { + "block": 0, + "color": 7, + "type": 9, + "position": { + "x": -60, + "y": 120, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 10, + "id": 380 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 930, + "num": 0, + "color": 10, + "special": 2, + "length": 2, + "lock": true + }, + { + "id": 931, + "num": 1, + "color": 10, + "special": 2, + "length": 0, + "lock": true + }, + { + "id": 932, + "num": 4, + "color": 2, + "special": 0, + "length": 1 + }, + { + "id": 933, + "num": 9, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 934, + "num": 12, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 935, + "num": 14, + "color": 1, + "special": 3, + "length": 1, + "freeze": 16 + }, + { + "id": 936, + "num": 17, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 937, + "num": 19, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 938, + "num": 27, + "color": 7, + "special": 0, + "length": 1 + }, + { + "id": 939, + "num": 23, + "color": 4, + "special": 2, + "length": 2, + "lock": true + }, + { + "id": 940, + "num": 24, + "color": 4, + "special": 2, + "length": 0, + "lock": true + }, + { + "id": 941, + "num": 18, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 942, + "num": 20, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 943, + "num": 5, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 944, + "num": 8, + "color": 3, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level929.json.meta b/assets/custom/Json/level929.json.meta new file mode 100644 index 0000000..36d7303 --- /dev/null +++ b/assets/custom/Json/level929.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "9000586d-af26-458e-8b84-dc0ea209e223", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level930.json b/assets/custom/Json/level930.json new file mode 100644 index 0000000..cb8c40e --- /dev/null +++ b/assets/custom/Json/level930.json @@ -0,0 +1,425 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "930", + "map": [ + 9, + 9 + ], + "time": 120, + "gap": [ + { + "x": 3, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 4, + "type": 0, + "position": { + "x": -180, + "y": 60, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 4, + "type": 0, + "position": { + "x": -180, + "y": 180, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 4, + "type": 0, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "id": 230 + }, + { + "block": 23, + "color": 4, + "type": 0, + "position": { + "x": 60, + "y": -300, + "z": 0 + }, + "id": 240 + }, + { + "block": 1, + "color": 2, + "type": 0, + "position": { + "x": 420, + "y": 300, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "id": 260 + }, + { + "block": 4, + "color": 8, + "type": 0, + "position": { + "x": -300, + "y": -60, + "z": 0 + }, + "id": 270 + }, + { + "block": 1, + "color": 1, + "type": 0, + "position": { + "x": -60, + "y": -180, + "z": 0 + }, + "id": 280 + }, + { + "block": 1, + "color": 10, + "type": 0, + "position": { + "x": 300, + "y": -420, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 4, + "type": 9, + "position": { + "x": 180, + "y": 180, + "z": 0 + }, + "adhesiveTime": 2, + "id": 300 + }, + { + "block": 2, + "color": 4, + "type": 9, + "position": { + "x": 60, + "y": 60, + "z": 0 + }, + "adhesiveTime": 1, + "id": 310 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": 420, + "y": -60, + "z": 0 + }, + "id": 320 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": -60, + "y": 180, + "z": 0 + }, + "adhesiveTime": 2, + "floor": 1, + "floorTime": 7, + "floorMove": false, + "id": 330 + }, + { + "block": 2, + "color": 3, + "type": 9, + "position": { + "x": -60, + "y": -60, + "z": 0 + }, + "adhesiveTime": 1, + "floor": 1, + "floorTime": 7, + "floorMove": false, + "id": 340 + }, + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": -180, + "y": -60, + "z": 0 + }, + "floor": 1, + "floorTime": 7, + "floorMove": false, + "id": 350 + }, + { + "block": 1, + "color": 3, + "type": 8, + "position": { + "x": 420, + "y": -180, + "z": 0 + }, + "id": 360 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": -300, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 370 + }, + { + "block": 1, + "color": 7, + "type": 0, + "position": { + "x": -60, + "y": -420, + "z": 0 + }, + "lock": false, + "id": 380 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "lock": false, + "id": 390 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 60, + "y": 300, + "z": 0 + }, + "lock": false, + "id": 400 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 180, + "y": -180, + "z": 0 + }, + "lock": true, + "id": 410 + }, + { + "block": 0, + "color": 1, + "type": 4, + "position": { + "x": 180, + "y": -300, + "z": 0 + }, + "freezeTime": 11, + "id": 420 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 931, + "num": 0, + "color": 5, + "special": 0, + "length": 1 + }, + { + "id": 932, + "num": 2, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 933, + "num": 3, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 934, + "num": 14, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 935, + "num": 16, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 936, + "num": 18, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 937, + "num": 20, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 938, + "num": 27, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 939, + "num": 24, + "color": 8, + "special": 0, + "length": 3 + }, + { + "id": 940, + "num": 25, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 941, + "num": 26, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 21, + "color": 4, + "special": 0, + "length": 3 + }, + { + "id": 943, + "num": 22, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 944, + "num": 23, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 945, + "num": 15, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 946, + "num": 17, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 947, + "num": 8, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 948, + "num": 10, + "color": 9, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level930.json.meta b/assets/custom/Json/level930.json.meta new file mode 100644 index 0000000..cf0f697 --- /dev/null +++ b/assets/custom/Json/level930.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "b416c2f3-25d4-4f45-ac75-a25db197b7fe", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level931.json b/assets/custom/Json/level931.json new file mode 100644 index 0000000..96ef2e9 --- /dev/null +++ b/assets/custom/Json/level931.json @@ -0,0 +1,439 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "931", + "map": [ + 9, + 11 + ], + "time": 110, + "gap": [ + { + "x": 1, + "y": 8, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 4, + "z": 0 + }, + { + "x": 7, + "y": 8, + "z": 0 + }, + { + "x": 7, + "y": 7, + "z": 0 + }, + { + "x": 7, + "y": 6, + "z": 0 + }, + { + "x": 7, + "y": 5, + "z": 0 + }, + { + "x": 7, + "y": 4, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": -60, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 300, + "y": -60, + "z": 0 + }, + "id": 220 + }, + { + "block": 22, + "color": 9, + "type": 0, + "position": { + "x": -60, + "y": 180, + "z": 0 + }, + "id": 230 + }, + { + "block": 21, + "color": 2, + "type": 0, + "position": { + "x": 180, + "y": 180, + "z": 0 + }, + "id": 240 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": -60, + "y": 60, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 3, + "type": 0, + "position": { + "x": 60, + "y": -180, + "z": 0 + }, + "id": 260 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": -300, + "y": -420, + "z": 0 + }, + "id": 270 + }, + { + "block": 1, + "color": 1, + "type": 0, + "position": { + "x": -60, + "y": -420, + "z": 0 + }, + "id": 280 + }, + { + "block": 1, + "color": 3, + "type": 0, + "position": { + "x": 300, + "y": -420, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 6, + "type": 0, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "id": 300 + }, + { + "block": 2, + "color": 2, + "type": 16, + "position": { + "x": -60, + "y": -180, + "z": 0 + }, + "questionTime": 11, + "id": 310 + }, + { + "block": 2, + "color": 9, + "type": 16, + "position": { + "x": 180, + "y": -180, + "z": 0 + }, + "questionTime": 13, + "id": 320 + }, + { + "block": 1, + "color": 8, + "type": 16, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "questionTime": 5, + "id": 330 + }, + { + "block": 0, + "color": 10, + "type": 16, + "position": { + "x": -180, + "y": -300, + "z": 0 + }, + "questionTime": 6, + "id": 340 + }, + { + "block": 0, + "color": 7, + "type": 16, + "position": { + "x": 300, + "y": -300, + "z": 0 + }, + "questionTime": 7, + "id": 350 + }, + { + "block": 1, + "color": 1, + "type": 4, + "position": { + "x": 300, + "y": -540, + "z": 0 + }, + "freezeTime": 8, + "id": 360 + }, + { + "block": 1, + "color": 8, + "type": 4, + "position": { + "x": -60, + "y": -540, + "z": 0 + }, + "freezeTime": 10, + "id": 370 + }, + { + "block": 2, + "color": 6, + "type": 9, + "position": { + "x": 60, + "y": 180, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 12, + "id": 380 + }, + { + "block": 0, + "color": 10, + "type": 9, + "position": { + "x": 60, + "y": 420, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 12, + "id": 390 + }, + { + "block": 2, + "color": 4, + "type": 3, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "lockTime": 2, + "id": 400 + }, + { + "block": 1, + "color": 7, + "type": 2, + "position": { + "x": -180, + "y": 420, + "z": 0 + }, + "id": 410 + }, + { + "block": 1, + "color": 10, + "type": 2, + "position": { + "x": 420, + "y": 420, + "z": 0 + }, + "id": 420 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 932, + "num": 0, + "color": 7, + "special": 0, + "length": 1 + }, + { + "id": 933, + "num": 2, + "color": 5, + "special": 0, + "length": 1 + }, + { + "id": 934, + "num": 8, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 935, + "num": 9, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 936, + "num": 14, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 937, + "num": 16, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 938, + "num": 20, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 939, + "num": 22, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 940, + "num": 27, + "color": 6, + "special": 0, + "length": 2 + }, + { + "id": 941, + "num": 28, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 34, + "color": 8, + "special": 0, + "length": 1 + }, + { + "id": 943, + "num": 32, + "color": 10, + "special": 0, + "length": 1 + }, + { + "id": 944, + "num": 21, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 945, + "num": 23, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 946, + "num": 4, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 947, + "num": 13, + "color": 9, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level931.json.meta b/assets/custom/Json/level931.json.meta new file mode 100644 index 0000000..c29936a --- /dev/null +++ b/assets/custom/Json/level931.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "f554ec69-094e-464c-8ca0-dbacc1bc9913", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level932.json b/assets/custom/Json/level932.json new file mode 100644 index 0000000..1c9f8c5 --- /dev/null +++ b/assets/custom/Json/level932.json @@ -0,0 +1,389 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "932", + "map": [ + 9, + 9 + ], + "time": 115, + "gap": [ + { + "x": 1, + "y": 1, + "z": 0 + }, + { + "x": 2, + "y": 1, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 3, + "y": 7, + "z": 0 + }, + { + "x": 4, + "y": 7, + "z": 0 + }, + { + "x": 3, + "y": 6, + "z": 0 + }, + { + "x": 4, + "y": 6, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": -300, + "z": 0 + }, + "id": 210 + }, + { + "block": 1, + "color": 10, + "type": 0, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "id": 220 + }, + { + "block": 22, + "color": 10, + "type": 0, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "id": 230 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": -60, + "y": -180, + "z": 0 + }, + "id": 240 + }, + { + "block": 4, + "color": 5, + "type": 0, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "id": 250 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 180, + "y": -420, + "z": 0 + }, + "id": 260 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": 60, + "y": -180, + "z": 0 + }, + "id": 270 + }, + { + "block": 2, + "color": 6, + "type": 0, + "position": { + "x": 420, + "y": -180, + "z": 0 + }, + "id": 280 + }, + { + "block": 2, + "color": 11, + "type": 0, + "position": { + "x": 180, + "y": 180, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 1, + "type": 0, + "position": { + "x": -180, + "y": 60, + "z": 0 + }, + "id": 300 + }, + { + "block": 2, + "color": 2, + "type": 7, + "position": { + "x": 180, + "y": -180, + "z": 0 + }, + "id": 310 + }, + { + "block": 0, + "color": 3, + "type": 4, + "position": { + "x": -300, + "y": 180, + "z": 0 + }, + "freezeTime": 10, + "id": 320 + }, + { + "block": 2, + "color": 3, + "type": 16, + "position": { + "x": 420, + "y": 180, + "z": 0 + }, + "questionTime": 12, + "id": 330 + }, + { + "block": 3, + "color": 7, + "type": 0, + "position": { + "x": 180, + "y": 60, + "z": 0 + }, + "lock": false, + "id": 340 + }, + { + "block": 1, + "color": 8, + "type": 0, + "position": { + "x": 180, + "y": -300, + "z": 0 + }, + "lock": false, + "id": 350 + }, + { + "block": 0, + "color": 3, + "type": 0, + "position": { + "x": -60, + "y": -300, + "z": 0 + }, + "lock": false, + "id": 360 + }, + { + "block": 20, + "color": 8, + "type": 0, + "position": { + "x": -180, + "y": -180, + "z": 0 + }, + "lock": true, + "id": 370 + }, + { + "block": 2, + "color": 3, + "type": 0, + "position": { + "x": 300, + "y": -180, + "z": 0 + }, + "lock": true, + "id": 380 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 933, + "num": 1, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 934, + "num": 2, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 935, + "num": 3, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 936, + "num": 4, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 937, + "num": 6, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 938, + "num": 9, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 939, + "num": 18, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 940, + "num": 20, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 941, + "num": 22, + "color": 3, + "special": 0, + "length": 1 + }, + { + "id": 942, + "num": 28, + "color": 6, + "special": 3, + "length": 2, + "freeze": 9 + }, + { + "id": 943, + "num": 29, + "color": 6, + "special": 3, + "length": 0, + "freeze": 9 + }, + { + "id": 944, + "num": 25, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 945, + "num": 26, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 946, + "num": 10, + "color": 7, + "special": 0, + "length": 3 + }, + { + "id": 947, + "num": 13, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 948, + "num": 17, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 949, + "num": 5, + "color": 5, + "special": 0, + "length": 1 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level932.json.meta b/assets/custom/Json/level932.json.meta new file mode 100644 index 0000000..96add53 --- /dev/null +++ b/assets/custom/Json/level932.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "340f48ba-45f6-4308-ba14-6056a87e9993", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level933.json b/assets/custom/Json/level933.json new file mode 100644 index 0000000..92bf9ff --- /dev/null +++ b/assets/custom/Json/level933.json @@ -0,0 +1,428 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "933", + "map": [ + 8, + 11 + ], + "time": 135, + "gap": [ + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 6, + "y": 5, + "z": 0 + }, + { + "x": 6, + "y": 4, + "z": 0 + }, + { + "x": 6, + "y": 3, + "z": 0 + }, + { + "x": 6, + "y": 2, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": -120, + "y": 60, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 240, + "y": -420, + "z": 0 + }, + "id": 220 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": -120, + "y": -300, + "z": 0 + }, + "id": 230 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 240, + "y": 300, + "z": 0 + }, + "id": 240 + }, + { + "block": 4, + "color": 1, + "type": 0, + "position": { + "x": 360, + "y": 180, + "z": 0 + }, + "id": 250 + }, + { + "block": 1, + "color": 4, + "type": 0, + "position": { + "x": 360, + "y": 60, + "z": 0 + }, + "id": 260 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": 0, + "y": -420, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 6, + "type": 0, + "position": { + "x": 0, + "y": -540, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": -120, + "y": -60, + "z": 0 + }, + "id": 290 + }, + { + "block": 6, + "color": 1, + "type": 0, + "position": { + "x": 120, + "y": -180, + "z": 0 + }, + "lock": true, + "id": 300 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 120, + "y": -540, + "z": 0 + }, + "lock": true, + "id": 310 + }, + { + "block": 1, + "color": 2, + "type": 0, + "position": { + "x": 240, + "y": -300, + "z": 0 + }, + "lock": false, + "id": 320 + }, + { + "block": 1, + "color": 1, + "type": 0, + "position": { + "x": -120, + "y": 420, + "z": 0 + }, + "lock": false, + "id": 330 + }, + { + "block": 2, + "color": 3, + "type": 14, + "position": { + "x": -240, + "y": -540, + "z": 0 + }, + "id": 340 + }, + { + "block": 0, + "color": 7, + "type": 14, + "position": { + "x": 240, + "y": -540, + "z": 0 + }, + "id": 350 + }, + { + "block": 1, + "color": 6, + "type": 14, + "position": { + "x": 0, + "y": -180, + "z": 0 + }, + "id": 360 + }, + { + "block": 2, + "color": 4, + "type": 14, + "position": { + "x": 0, + "y": 300, + "z": 0 + }, + "id": 370 + }, + { + "block": 0, + "color": 6, + "type": 14, + "position": { + "x": -120, + "y": 180, + "z": 0 + }, + "floor": 1, + "floorTime": 9, + "floorMove": false, + "id": 380 + }, + { + "block": 2, + "color": 1, + "type": 14, + "position": { + "x": 240, + "y": -180, + "z": 0 + }, + "floor": 2, + "floorTime": 12, + "floorMove": false, + "id": 390 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": 120, + "y": 180, + "z": 0 + }, + "id": 400 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 934, + "num": 4, + "color": 7, + "special": 0, + "length": 1 + }, + { + "id": 935, + "num": 5, + "color": 6, + "special": 0, + "length": 1 + }, + { + "id": 936, + "num": 29, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 937, + "num": 30, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 938, + "num": 23, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 939, + "num": 24, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 940, + "num": 17, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 941, + "num": 19, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 0, + "color": 1, + "special": 0, + "length": 3, + "longAndShort": 13, + "order": true + }, + { + "id": 943, + "num": 1, + "color": 1, + "special": 0, + "length": 0, + "longAndShort": 13, + "order": true + }, + { + "id": 944, + "num": 2, + "color": 1, + "special": 0, + "length": 0, + "longAndShort": 13, + "order": true + }, + { + "id": 945, + "num": 14, + "color": 9, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": false + }, + { + "id": 946, + "num": 16, + "color": 9, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": false + }, + { + "id": 947, + "num": 20, + "color": 3, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": false + }, + { + "id": 948, + "num": 27, + "color": 3, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": false + }, + { + "id": 949, + "num": 13, + "color": 5, + "special": 6, + "length": 2, + "lockTime": 6 + }, + { + "id": 950, + "num": 15, + "color": 5, + "special": 6, + "length": 0, + "lockTime": 6 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level933.json.meta b/assets/custom/Json/level933.json.meta new file mode 100644 index 0000000..ba6e0b4 --- /dev/null +++ b/assets/custom/Json/level933.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "31badb8b-9c74-4d7d-a647-a8415300caac", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level934.json b/assets/custom/Json/level934.json new file mode 100644 index 0000000..831bf66 --- /dev/null +++ b/assets/custom/Json/level934.json @@ -0,0 +1,333 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "934", + "map": [ + 8, + 8 + ], + "time": 105, + "gap": [] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": 120, + "y": 0, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": 240, + "y": 0, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": 360, + "y": 0, + "z": 0 + }, + "id": 230 + }, + { + "block": 23, + "color": 7, + "type": 0, + "position": { + "x": 120, + "y": -360, + "z": 0 + }, + "id": 240 + }, + { + "block": 2, + "color": 8, + "type": 0, + "position": { + "x": -240, + "y": -360, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 7, + "type": 0, + "position": { + "x": -240, + "y": -120, + "z": 0 + }, + "id": 260 + }, + { + "block": 2, + "color": 4, + "type": 0, + "position": { + "x": 360, + "y": 120, + "z": 0 + }, + "id": 270 + }, + { + "block": 4, + "color": 2, + "type": 17, + "position": { + "x": 0, + "y": -360, + "z": 0 + }, + "boomTime": 1, + "id": 280 + }, + { + "block": 2, + "color": 10, + "type": 17, + "position": { + "x": -120, + "y": 0, + "z": 0 + }, + "boomTime": 2, + "id": 290 + }, + { + "block": 1, + "color": 10, + "type": 17, + "position": { + "x": -120, + "y": 240, + "z": 0 + }, + "boomTime": 3, + "id": 300 + }, + { + "block": 2, + "color": 2, + "type": 17, + "position": { + "x": -120, + "y": -360, + "z": 0 + }, + "boomTime": 4, + "id": 310 + }, + { + "block": 0, + "color": 7, + "type": 3, + "position": { + "x": 0, + "y": 240, + "z": 0 + }, + "lockTime": 5, + "id": 320 + }, + { + "block": 0, + "color": 4, + "type": 2, + "position": { + "x": 120, + "y": 240, + "z": 0 + }, + "id": 330 + }, + { + "block": 1, + "color": 9, + "type": 2, + "position": { + "x": 240, + "y": 120, + "z": 0 + }, + "id": 340 + }, + { + "block": 22, + "color": 5, + "type": 2, + "position": { + "x": 240, + "y": -360, + "z": 0 + }, + "id": 350 + }, + { + "block": 1, + "color": 1, + "type": 2, + "position": { + "x": 360, + "y": -120, + "z": 0 + }, + "id": 360 + }, + { + "block": 0, + "color": 6, + "type": 2, + "position": { + "x": 360, + "y": -240, + "z": 0 + }, + "id": 370 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 935, + "num": 0, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 936, + "num": 1, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 937, + "num": 3, + "color": 2, + "special": 0, + "length": 3 + }, + { + "id": 938, + "num": 4, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 939, + "num": 5, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 940, + "num": 7, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 941, + "num": 9, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 13, + "color": 8, + "special": 0, + "length": 1 + }, + { + "id": 943, + "num": 15, + "color": 6, + "special": 0, + "length": 1 + }, + { + "id": 944, + "num": 22, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 945, + "num": 23, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 946, + "num": 18, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 947, + "num": 19, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 948, + "num": 14, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 949, + "num": 16, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 950, + "num": 6, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 951, + "num": 8, + "color": 1, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level934.json.meta b/assets/custom/Json/level934.json.meta new file mode 100644 index 0000000..525210c --- /dev/null +++ b/assets/custom/Json/level934.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "1aeb3e34-03e7-44c8-9777-738a20138687", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level935.json b/assets/custom/Json/level935.json new file mode 100644 index 0000000..85c755d --- /dev/null +++ b/assets/custom/Json/level935.json @@ -0,0 +1,403 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "935", + "map": [ + 9, + 9 + ], + "time": 120, + "gap": [] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": 180, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": 60, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 5, + "type": 0, + "position": { + "x": -300, + "y": 60, + "z": 0 + }, + "id": 230 + }, + { + "block": 23, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": -60, + "z": 0 + }, + "id": 240 + }, + { + "block": 23, + "color": 10, + "type": 0, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "id": 250 + }, + { + "block": 23, + "color": 10, + "type": 0, + "position": { + "x": 300, + "y": -60, + "z": 0 + }, + "id": 260 + }, + { + "block": 23, + "color": 10, + "type": 0, + "position": { + "x": 420, + "y": -60, + "z": 0 + }, + "id": 270 + }, + { + "block": 23, + "color": 10, + "type": 0, + "position": { + "x": 300, + "y": -180, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": -300, + "y": -60, + "z": 0 + }, + "id": 290 + }, + { + "block": 0, + "color": 4, + "type": 0, + "position": { + "x": -300, + "y": 180, + "z": 0 + }, + "id": 300 + }, + { + "block": 2, + "color": 8, + "type": 0, + "position": { + "x": 60, + "y": 60, + "z": 0 + }, + "id": 310 + }, + { + "block": 1, + "color": 9, + "type": 0, + "position": { + "x": 300, + "y": 300, + "z": 0 + }, + "id": 320 + }, + { + "block": 1, + "color": 1, + "type": 0, + "position": { + "x": 180, + "y": -60, + "z": 0 + }, + "id": 330 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": -300, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 340 + }, + { + "block": 22, + "color": 6, + "type": 0, + "position": { + "x": 300, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 350 + }, + { + "block": 0, + "color": 6, + "type": 0, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "lock": true, + "id": 360 + }, + { + "block": 2, + "color": 8, + "type": 0, + "position": { + "x": 420, + "y": 60, + "z": 0 + }, + "lock": false, + "id": 370 + }, + { + "block": 2, + "color": 5, + "type": 0, + "position": { + "x": -60, + "y": -60, + "z": 0 + }, + "lock": false, + "id": 380 + }, + { + "block": 2, + "color": 9, + "type": 16, + "position": { + "x": -180, + "y": -300, + "z": 0 + }, + "questionTime": 3, + "id": 390 + }, + { + "block": 0, + "color": 4, + "type": 4, + "position": { + "x": 300, + "y": 180, + "z": 0 + }, + "freezeTime": 5, + "id": 400 + }, + { + "block": 6, + "color": 3, + "type": 16, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "questionTime": 10, + "id": 410 + }, + { + "block": 0, + "color": 3, + "type": 0, + "position": { + "x": -60, + "y": -420, + "z": 0 + }, + "id": 420 + }, + { + "block": 22, + "color": 10, + "type": 16, + "position": { + "x": -60, + "y": 180, + "z": 0 + }, + "questionTime": 14, + "id": 430 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 936, + "num": 0, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 937, + "num": 1, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 938, + "num": 3, + "color": 4, + "special": 0, + "length": 1 + }, + { + "id": 939, + "num": 6, + "color": 1, + "special": 4, + "length": 1 + }, + { + "id": 940, + "num": 10, + "color": 6, + "special": 0, + "length": 3 + }, + { + "id": 941, + "num": 12, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 14, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 943, + "num": 16, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 944, + "num": 18, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 945, + "num": 26, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 946, + "num": 27, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 947, + "num": 21, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 948, + "num": 22, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 949, + "num": 13, + "color": 9, + "special": 0, + "length": 2 + }, + { + "id": 950, + "num": 15, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 951, + "num": 7, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 952, + "num": 9, + "color": 3, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level935.json.meta b/assets/custom/Json/level935.json.meta new file mode 100644 index 0000000..01d96e7 --- /dev/null +++ b/assets/custom/Json/level935.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "017a11e6-5e7a-4603-b3ef-4c904601437c", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level936.json b/assets/custom/Json/level936.json new file mode 100644 index 0000000..fc1e21e --- /dev/null +++ b/assets/custom/Json/level936.json @@ -0,0 +1,339 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "936", + "map": [ + 8, + 9 + ], + "time": 120, + "gap": [ + { + "x": 1, + "y": 1, + "z": 0 + }, + { + "x": 2, + "y": 1, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": -120, + "y": 300, + "z": 0 + }, + "id": 210 + }, + { + "block": 22, + "color": 9, + "type": 0, + "position": { + "x": 120, + "y": -300, + "z": 0 + }, + "id": 220 + }, + { + "block": 1, + "color": 5, + "type": 9, + "position": { + "x": 240, + "y": 300, + "z": 0 + }, + "adhesiveTime": 2, + "id": 230 + }, + { + "block": 1, + "color": 5, + "type": 9, + "position": { + "x": 360, + "y": 180, + "z": 0 + }, + "adhesiveTime": 1, + "id": 240 + }, + { + "block": 1, + "color": 2, + "type": 2, + "position": { + "x": 240, + "y": -420, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 2, + "type": 2, + "position": { + "x": 0, + "y": 180, + "z": 0 + }, + "id": 260 + }, + { + "block": 1, + "color": 3, + "type": 2, + "position": { + "x": 0, + "y": 60, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 6, + "type": 2, + "position": { + "x": -120, + "y": -180, + "z": 0 + }, + "id": 280 + }, + { + "block": 1, + "color": 6, + "type": 2, + "position": { + "x": 240, + "y": -60, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 7, + "type": 3, + "position": { + "x": 360, + "y": -300, + "z": 0 + }, + "lockTime": 6, + "id": 300 + }, + { + "block": 0, + "color": 7, + "type": 2, + "position": { + "x": 240, + "y": -300, + "z": 0 + }, + "id": 310 + }, + { + "block": 4, + "color": 9, + "type": 1, + "position": { + "x": -240, + "y": -60, + "z": 0 + }, + "stacking": 7, + "id": 320 + }, + { + "block": 2, + "color": 10, + "type": 1, + "position": { + "x": 0, + "y": -420, + "z": 0 + }, + "stacking": 7, + "id": 330 + }, + { + "block": 1, + "color": 8, + "type": 1, + "position": { + "x": -120, + "y": -300, + "z": 0 + }, + "stacking": 4, + "id": 340 + }, + { + "block": 1, + "color": 8, + "type": 1, + "position": { + "x": 0, + "y": -60, + "z": 0 + }, + "stacking": 1, + "id": 350 + }, + { + "block": 2, + "color": 4, + "type": 1, + "position": { + "x": 120, + "y": 60, + "z": 0 + }, + "stacking": 10, + "id": 360 + }, + { + "block": 2, + "color": 1, + "type": 1, + "position": { + "x": 360, + "y": -60, + "z": 0 + }, + "stacking": 3, + "id": 370 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 937, + "num": 7, + "color": 7, + "special": 0, + "length": 1 + }, + { + "id": 938, + "num": 12, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 939, + "num": 14, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 940, + "num": 21, + "color": 9, + "special": 0, + "length": 3 + }, + { + "id": 941, + "num": 22, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 23, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 943, + "num": 19, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 944, + "num": 20, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 945, + "num": 13, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 946, + "num": 15, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 947, + "num": 25, + "color": 6, + "special": 3, + "length": 1, + "freeze": 12 + }, + { + "id": 948, + "num": 3, + "color": 1, + "special": 0, + "length": 2, + "colorArray": "09" + }, + { + "id": 949, + "num": 4, + "color": 1, + "special": 0, + "length": 0, + "colorArray": "09" + }, + { + "id": 950, + "num": 0, + "color": 5, + "special": 0, + "length": 2, + "colorArray": "41" + }, + { + "id": 951, + "num": 1, + "color": 5, + "special": 0, + "length": 0, + "colorArray": "41" + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level936.json.meta b/assets/custom/Json/level936.json.meta new file mode 100644 index 0000000..211e2f4 --- /dev/null +++ b/assets/custom/Json/level936.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "3b5493fc-1506-4be4-ad00-e4b9c6822c1d", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level937.json b/assets/custom/Json/level937.json new file mode 100644 index 0000000..ea04fa0 --- /dev/null +++ b/assets/custom/Json/level937.json @@ -0,0 +1,382 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [ + { + "x": 3, + "y": 6, + "color": "5" + }, + { + "x": 3, + "y": 5, + "color": "5" + }, + { + "x": 4, + "y": 6, + "color": "5" + }, + { + "x": 4, + "y": 5, + "color": "5" + } + ], + "id": "937", + "map": [ + 9, + 9 + ], + "time": 120, + "gap": [ + { + "x": 7, + "y": 6, + "z": 0 + }, + { + "x": 7, + "y": 5, + "z": 0 + }, + { + "x": 7, + "y": 4, + "z": 0 + }, + { + "x": 7, + "y": 3, + "z": 0 + }, + { + "x": 7, + "y": 2, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": -300, + "y": -300, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": -300, + "y": 60, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 3, + "type": 0, + "position": { + "x": 180, + "y": 300, + "z": 0 + }, + "id": 230 + }, + { + "block": 23, + "color": 8, + "type": 0, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "id": 240 + }, + { + "block": 23, + "color": 8, + "type": 0, + "position": { + "x": 60, + "y": -300, + "z": 0 + }, + "id": 250 + }, + { + "block": 22, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": -300, + "z": 0 + }, + "id": 260 + }, + { + "block": 5, + "color": 5, + "type": 0, + "position": { + "x": 300, + "y": -300, + "z": 0 + }, + "id": 270 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": 300, + "y": 180, + "z": 0 + }, + "id": 280 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": 300, + "y": -60, + "z": 0 + }, + "id": 290 + }, + { + "block": 1, + "color": 3, + "type": 0, + "position": { + "x": 300, + "y": -420, + "z": 0 + }, + "id": 300 + }, + { + "block": 1, + "color": 2, + "type": 0, + "position": { + "x": -180, + "y": -60, + "z": 0 + }, + "id": 310 + }, + { + "block": 1, + "color": 8, + "type": 14, + "position": { + "x": -180, + "y": -420, + "z": 0 + }, + "id": 320 + }, + { + "block": 0, + "color": 1, + "type": 14, + "position": { + "x": 60, + "y": -180, + "z": 0 + }, + "id": 330 + }, + { + "block": 0, + "color": 10, + "type": 14, + "position": { + "x": 420, + "y": 300, + "z": 0 + }, + "id": 340 + }, + { + "block": 1, + "color": 9, + "type": 7, + "position": { + "x": 180, + "y": -60, + "z": 0 + }, + "id": 350 + }, + { + "block": 0, + "color": 6, + "type": 17, + "position": { + "x": 60, + "y": 300, + "z": 0 + }, + "boomTime": 1, + "id": 360 + }, + { + "block": 2, + "color": 6, + "type": 16, + "position": { + "x": -60, + "y": -300, + "z": 0 + }, + "questionTime": 7, + "id": 370 + }, + { + "block": 0, + "color": 2, + "type": 16, + "position": { + "x": -180, + "y": 60, + "z": 0 + }, + "questionTime": 10, + "id": 380 + }, + { + "block": 2, + "color": 7, + "type": 16, + "position": { + "x": -180, + "y": 180, + "z": 0 + }, + "questionTime": 12, + "id": 390 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 938, + "num": 0, + "color": 3, + "special": 0, + "length": 1 + }, + { + "id": 939, + "num": 2, + "color": 9, + "special": 5, + "length": 2 + }, + { + "id": 940, + "num": 3, + "color": 9, + "special": 5, + "length": 0 + }, + { + "id": 941, + "num": 5, + "color": 5, + "special": 6, + "length": 2, + "lockTime": 3 + }, + { + "id": 942, + "num": 6, + "color": 5, + "special": 6, + "length": 0, + "lockTime": 3 + }, + { + "id": 943, + "num": 8, + "color": 10, + "special": 0, + "length": 1 + }, + { + "id": 944, + "num": 14, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 945, + "num": 18, + "color": 6, + "special": 0, + "length": 1 + }, + { + "id": 946, + "num": 23, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 947, + "num": 24, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 948, + "num": 15, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 949, + "num": 17, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 950, + "num": 9, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 951, + "num": 11, + "color": 2, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level937.json.meta b/assets/custom/Json/level937.json.meta new file mode 100644 index 0000000..3360cdc --- /dev/null +++ b/assets/custom/Json/level937.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "26cbb202-0428-4f90-84d8-b722c75f2692", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level938.json b/assets/custom/Json/level938.json new file mode 100644 index 0000000..6ed7504 --- /dev/null +++ b/assets/custom/Json/level938.json @@ -0,0 +1,273 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "938", + "map": [ + 9, + 9 + ], + "time": 100, + "gap": [ + { + "x": 6, + "y": 2, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + }, + { + "x": 7, + "y": 2, + "z": 0 + }, + { + "x": 7, + "y": 1, + "z": 0 + }, + { + "x": 1, + "y": 4, + "z": 0 + }, + { + "x": 2, + "y": 4, + "z": 0 + }, + { + "x": 2, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 5, + "z": 0 + }, + { + "x": 1, + "y": 6, + "z": 0 + }, + { + "x": 2, + "y": 6, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": -60, + "y": 60, + "z": 0 + }, + "id": 210 + }, + { + "block": 20, + "color": 2, + "type": 0, + "position": { + "x": 300, + "y": -180, + "z": 0 + }, + "id": 220 + }, + { + "block": 1, + "color": 6, + "type": 0, + "position": { + "x": 420, + "y": 60, + "z": 0 + }, + "id": 230 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": 420, + "y": -180, + "z": 0 + }, + "id": 240 + }, + { + "block": 6, + "color": 5, + "type": 17, + "position": { + "x": 60, + "y": 60, + "z": 0 + }, + "boomTime": 1, + "id": 250 + }, + { + "block": 1, + "color": 1, + "type": 17, + "position": { + "x": -60, + "y": -180, + "z": 0 + }, + "boomTime": 2, + "id": 260 + }, + { + "block": 22, + "color": 9, + "type": 17, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "boomTime": 3, + "id": 270 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": -180, + "y": -420, + "z": 0 + }, + "floor": 1, + "floorTime": 7, + "floorMove": false, + "id": 290 + }, + { + "block": 4, + "color": 1, + "type": 4, + "position": { + "x": -300, + "y": -420, + "z": 0 + }, + "freezeTime": 8, + "id": 300 + }, + { + "block": 2, + "color": 2, + "type": 16, + "position": { + "x": 180, + "y": 180, + "z": 0 + }, + "questionTime": 9, + "id": 310 + }, + { + "block": 2, + "color": 8, + "type": 16, + "position": { + "x": 300, + "y": 180, + "z": 0 + }, + "questionTime": 10, + "id": 320 + }, + { + "block": 0, + "color": 6, + "type": 16, + "position": { + "x": -60, + "y": -420, + "z": 0 + }, + "questionTime": 11, + "id": 330 + }, + { + "block": 1, + "color": 8, + "type": 0, + "position": { + "x": 60, + "y": -60, + "z": 0 + }, + "lock": false, + "id": 340 + }, + { + "block": 2, + "color": 7, + "type": 0, + "position": { + "x": 420, + "y": 180, + "z": 0 + }, + "lock": true, + "id": 350 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 939, + "num": 24, + "color": 5, + "special": 0, + "length": 3, + "colorArray": "40817695017695" + }, + { + "id": 940, + "num": 25, + "color": 5, + "special": 0, + "length": 0, + "colorArray": "40817695017695" + }, + { + "id": 941, + "num": 26, + "color": 5, + "special": 0, + "length": 0, + "colorArray": "40817695017695" + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level938.json.meta b/assets/custom/Json/level938.json.meta new file mode 100644 index 0000000..62aadfd --- /dev/null +++ b/assets/custom/Json/level938.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "0196179a-6f4f-4351-94a2-3e90bbc2acbd", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level939.json b/assets/custom/Json/level939.json new file mode 100644 index 0000000..11a36e6 --- /dev/null +++ b/assets/custom/Json/level939.json @@ -0,0 +1,399 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "939", + "map": [ + 9, + 9 + ], + "time": 120, + "gap": [ + { + "x": 5, + "y": 7, + "z": 0 + }, + { + "x": 4, + "y": 7, + "z": 0 + }, + { + "x": 3, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + }, + { + "x": 5, + "y": 1, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 60, + "y": 180, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": -60, + "y": 180, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 180, + "y": -300, + "z": 0 + }, + "id": 230 + }, + { + "block": 9, + "color": 5, + "type": 0, + "position": { + "x": 180, + "y": 60, + "z": 0 + }, + "id": 240 + }, + { + "block": 22, + "color": 1, + "type": 0, + "position": { + "x": 60, + "y": -420, + "z": 0 + }, + "id": 250 + }, + { + "block": 4, + "color": 6, + "type": 0, + "position": { + "x": -300, + "y": -420, + "z": 0 + }, + "id": 260 + }, + { + "block": 0, + "color": 4, + "type": 0, + "position": { + "x": -180, + "y": -420, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": 300, + "y": 300, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": 300, + "y": 60, + "z": 0 + }, + "id": 290 + }, + { + "block": 2, + "color": 4, + "type": 16, + "position": { + "x": 180, + "y": -180, + "z": 0 + }, + "questionTime": 3, + "id": 300 + }, + { + "block": 2, + "color": 10, + "type": 16, + "position": { + "x": 420, + "y": 180, + "z": 0 + }, + "questionTime": 5, + "id": 310 + }, + { + "block": 2, + "color": 10, + "type": 16, + "position": { + "x": 420, + "y": -60, + "z": 0 + }, + "questionTime": 10, + "id": 320 + }, + { + "block": 2, + "color": 3, + "type": 16, + "position": { + "x": 300, + "y": -180, + "z": 0 + }, + "questionTime": 11, + "id": 330 + }, + { + "block": 2, + "color": 2, + "type": 16, + "position": { + "x": 420, + "y": -420, + "z": 0 + }, + "questionTime": 14, + "id": 340 + }, + { + "block": 1, + "color": 2, + "type": 7, + "position": { + "x": 60, + "y": -180, + "z": 0 + }, + "id": 350 + }, + { + "block": 2, + "color": 4, + "type": 9, + "position": { + "x": -300, + "y": 60, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 6, + "id": 360 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": -300, + "y": -60, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 6, + "id": 370 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": -180, + "y": -60, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 12, + "id": 380 + }, + { + "block": 2, + "color": 7, + "type": 9, + "position": { + "x": -180, + "y": 60, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 12, + "id": 390 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 940, + "num": 1, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 941, + "num": 2, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 942, + "num": 4, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 943, + "num": 5, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 944, + "num": 7, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 945, + "num": 9, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 946, + "num": 20, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 947, + "num": 22, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 948, + "num": 28, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 949, + "num": 29, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 950, + "num": 25, + "color": 6, + "special": 0, + "length": 3 + }, + { + "id": 951, + "num": 26, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 952, + "num": 27, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 953, + "num": 21, + "color": 4, + "special": 0, + "length": 1 + }, + { + "id": 954, + "num": 8, + "color": 5, + "special": 0, + "length": 3 + }, + { + "id": 955, + "num": 10, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 956, + "num": 12, + "color": 5, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level939.json.meta b/assets/custom/Json/level939.json.meta new file mode 100644 index 0000000..cf1c0fd --- /dev/null +++ b/assets/custom/Json/level939.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "86b1e4ec-f681-4ff1-a017-ef42537c9d2d", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level940.json b/assets/custom/Json/level940.json new file mode 100644 index 0000000..6fcccb0 --- /dev/null +++ b/assets/custom/Json/level940.json @@ -0,0 +1,469 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "940", + "map": [ + 10, + 10 + ], + "time": 100, + "gap": [ + { + "x": 8, + "y": 1, + "z": 0 + }, + { + "x": 7, + "y": 1, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + }, + { + "x": 7, + "y": 2, + "z": 0 + }, + { + "x": 6, + "y": 2, + "z": 0 + }, + { + "x": 1, + "y": 8, + "z": 0 + }, + { + "x": 2, + "y": 8, + "z": 0 + }, + { + "x": 3, + "y": 8, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 3, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 6, + "z": 0 + }, + { + "x": 2, + "y": 5, + "z": 0 + }, + { + "x": 3, + "y": 6, + "z": 0 + }, + { + "x": 3, + "y": 5, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 120, + "y": 120, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 0, + "y": 120, + "z": 0 + }, + "id": 220 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 0, + "y": 240, + "z": 0 + }, + "id": 230 + }, + { + "block": 4, + "color": 5, + "type": 0, + "position": { + "x": -360, + "y": -120, + "z": 0 + }, + "id": 240 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": 120, + "y": 360, + "z": 0 + }, + "id": 250 + }, + { + "block": 2, + "color": 6, + "type": 0, + "position": { + "x": 480, + "y": -120, + "z": 0 + }, + "id": 260 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": -240, + "y": -360, + "z": 0 + }, + "lock": true, + "id": 270 + }, + { + "block": 1, + "color": 6, + "type": 0, + "position": { + "x": 480, + "y": 120, + "z": 0 + }, + "lock": true, + "id": 280 + }, + { + "block": 1, + "color": 3, + "type": 0, + "position": { + "x": -240, + "y": -480, + "z": 0 + }, + "lock": false, + "id": 290 + }, + { + "block": 1, + "color": 3, + "type": 0, + "position": { + "x": 0, + "y": -360, + "z": 0 + }, + "lock": false, + "id": 300 + }, + { + "block": 2, + "color": 1, + "type": 0, + "position": { + "x": 480, + "y": -360, + "z": 0 + }, + "lock": false, + "id": 310 + }, + { + "block": 1, + "color": 8, + "type": 7, + "position": { + "x": 360, + "y": -120, + "z": 0 + }, + "id": 320 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": 120, + "y": -120, + "z": 0 + }, + "id": 330 + }, + { + "block": 11, + "color": 1, + "type": 16, + "position": { + "x": -240, + "y": -240, + "z": 0 + }, + "questionTime": 8, + "id": 340 + }, + { + "block": 1, + "color": 6, + "type": 16, + "position": { + "x": 240, + "y": -240, + "z": 0 + }, + "questionTime": 9, + "id": 350 + }, + { + "block": 0, + "color": 8, + "type": 4, + "position": { + "x": 0, + "y": 0, + "z": 0 + }, + "freezeTime": 10, + "id": 360 + }, + { + "block": 2, + "color": 2, + "type": 16, + "position": { + "x": 120, + "y": -480, + "z": 0 + }, + "questionTime": 11, + "id": 370 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": 240, + "y": 240, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 12, + "id": 380 + }, + { + "block": 0, + "color": 2, + "type": 9, + "position": { + "x": 240, + "y": 120, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 12, + "id": 390 + }, + { + "block": 2, + "color": 9, + "type": 9, + "position": { + "x": 360, + "y": 240, + "z": 0 + }, + "adhesiveTime": 2, + "lockTime": 8, + "id": 400 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": 240, + "y": 360, + "z": 0 + }, + "adhesiveTime": 1, + "lockTime": 8, + "id": 410 + }, + { + "block": 0, + "color": 10, + "type": 8, + "position": { + "x": 480, + "y": 360, + "z": 0 + }, + "id": 420 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 941, + "num": 1, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 942, + "num": 2, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 943, + "num": 3, + "color": 8, + "special": 0, + "length": 1 + }, + { + "id": 944, + "num": 19, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 945, + "num": 21, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 946, + "num": 28, + "color": 2, + "special": 0, + "length": 1 + }, + { + "id": 947, + "num": 33, + "color": 5, + "special": 0, + "length": 3, + "longAndShort": 13, + "order": true + }, + { + "id": 948, + "num": 34, + "color": 5, + "special": 0, + "length": 0, + "longAndShort": 13, + "order": true + }, + { + "id": 949, + "num": 35, + "color": 5, + "special": 0, + "length": 0, + "longAndShort": 13, + "order": true + }, + { + "id": 950, + "num": 6, + "color": 6, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": true + }, + { + "id": 951, + "num": 8, + "color": 6, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": true + }, + { + "id": 952, + "num": 18, + "color": 9, + "special": 0, + "length": 2, + "longAndShort": 12, + "order": true + }, + { + "id": 953, + "num": 20, + "color": 9, + "special": 0, + "length": 0, + "longAndShort": 12, + "order": true + }, + { + "id": 954, + "num": 29, + "color": 10, + "special": 0, + "length": 1 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level940.json.meta b/assets/custom/Json/level940.json.meta new file mode 100644 index 0000000..b409bae --- /dev/null +++ b/assets/custom/Json/level940.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "31280b9f-db47-45ad-90d5-7dee86de3856", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level941.json b/assets/custom/Json/level941.json new file mode 100644 index 0000000..725ad9f --- /dev/null +++ b/assets/custom/Json/level941.json @@ -0,0 +1,442 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "466", + "map": [ + 9, + 10 + ], + "time": 150, + "gap": [] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 2, + "color": 5, + "type": 8, + "position": { + "x": -180, + "y": 240, + "z": 0 + }, + "floor": 1, + "floorTime": 5, + "id": 210 + }, + { + "block": 2, + "color": 6, + "type": 4, + "position": { + "x": -300, + "y": 240, + "z": 0 + }, + "freezeTime": 12, + "floor": 1, + "floorTime": 5, + "id": 220 + }, + { + "block": 3, + "color": 1, + "type": 0, + "position": { + "x": 180, + "y": 120, + "z": 0 + }, + "floor": 2, + "floorTime": 10, + "floorMove": true, + "id": 230 + }, + { + "block": 1, + "color": 2, + "type": 0, + "position": { + "x": 60, + "y": 0, + "z": 0 + }, + "floor": 2, + "floorTime": 10, + "floorMove": true, + "id": 240 + }, + { + "block": 0, + "color": 3, + "type": 0, + "position": { + "x": 180, + "y": 0, + "z": 0 + }, + "floor": 2, + "floorTime": 10, + "floorMove": true, + "id": 250 + }, + { + "block": 5, + "color": 8, + "type": 8, + "position": { + "x": 420, + "y": -240, + "z": 0 + }, + "floor": 3, + "floorTime": 15, + "id": 260 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": -60, + "y": 360, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 420, + "y": 0, + "z": 0 + }, + "id": 280 + }, + { + "block": 1, + "color": 5, + "type": 0, + "position": { + "x": -180, + "y": 120, + "z": 0 + }, + "id": 290 + }, + { + "block": 3, + "color": 3, + "type": 0, + "position": { + "x": 300, + "y": 360, + "z": 0 + }, + "id": 300 + }, + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": -60, + "y": 240, + "z": 0 + }, + "id": 310 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": -300, + "y": -480, + "z": 0 + }, + "id": 320 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": -60, + "y": -360, + "z": 0 + }, + "id": 330 + }, + { + "block": 2, + "color": 2, + "type": 0, + "position": { + "x": 60, + "y": -480, + "z": 0 + }, + "id": 340 + }, + { + "block": 0, + "color": 9, + "type": 0, + "position": { + "x": 180, + "y": -480, + "z": 0 + }, + "id": 350 + }, + { + "block": 2, + "color": 2, + "type": 9, + "position": { + "x": -300, + "y": -240, + "z": 0 + }, + "adhesiveTime": 2, + "id": 360 + }, + { + "block": 0, + "color": 6, + "type": 9, + "position": { + "x": -180, + "y": -120, + "z": 0 + }, + "adhesiveTime": 1, + "id": 370 + }, + { + "block": 1, + "color": 6, + "type": 9, + "position": { + "x": 180, + "y": -120, + "z": 0 + }, + "adhesiveTime": 2, + "id": 380 + }, + { + "block": 0, + "color": 8, + "type": 9, + "position": { + "x": 180, + "y": -240, + "z": 0 + }, + "adhesiveTime": 1, + "id": 390 + }, + { + "block": 1, + "color": 9, + "type": 9, + "position": { + "x": 420, + "y": -360, + "z": 0 + }, + "adhesiveTime": 2, + "id": 400 + }, + { + "block": 0, + "color": 7, + "type": 9, + "position": { + "x": 420, + "y": -480, + "z": 0 + }, + "adhesiveTime": 1, + "id": 410 + }, + { + "block": 2, + "color": 8, + "type": 0, + "position": { + "x": 300, + "y": 0, + "z": 0 + }, + "id": 420 + }, + { + "block": 2, + "color": 6, + "type": 0, + "position": { + "x": 420, + "y": 240, + "z": 0 + }, + "id": 430 + }, + { + "block": 1, + "color": 9, + "type": 4, + "position": { + "x": -60, + "y": -480, + "z": 0 + }, + "freezeTime": 9, + "id": 440 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 467, + "num": 2, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 468, + "num": 3, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 469, + "num": 5, + "color": 9, + "special": 0, + "length": 1 + }, + { + "id": 470, + "num": 13, + "color": 1, + "special": 0, + "length": 3 + }, + { + "id": 471, + "num": 15, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 472, + "num": 17, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 473, + "num": 28, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 474, + "num": 29, + "color": 10, + "special": 0, + "length": 0 + }, + { + "id": 475, + "num": 25, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 476, + "num": 26, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 477, + "num": 22, + "color": 6, + "special": 0, + "length": 2 + }, + { + "id": 478, + "num": 23, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 479, + "num": 18, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 480, + "num": 20, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 481, + "num": 12, + "color": 3, + "special": 0, + "length": 3 + }, + { + "id": 482, + "num": 14, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 483, + "num": 16, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 484, + "num": 8, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 485, + "num": 10, + "color": 5, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/Json/level941.json.meta b/assets/custom/Json/level941.json.meta new file mode 100644 index 0000000..d19da56 --- /dev/null +++ b/assets/custom/Json/level941.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "6729eec4-126e-411d-a629-faa0923e0e1e", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/prefab/prop/lock.prefab b/assets/prefab/prop/lock.prefab index 670c2bf..469d45c 100644 --- a/assets/prefab/prop/lock.prefab +++ b/assets/prefab/prop/lock.prefab @@ -19,19 +19,25 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 34 + }, + { + "__id__": 37 } ], "_active": true, "_components": [ { - "__id__": 4 + "__id__": 39 }, { - "__id__": 5 + "__id__": 40 } ], "_prefab": { - "__id__": 6 + "__id__": 41 }, "_opacity": 255, "_color": { @@ -80,6 +86,1287 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "lock", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + }, + { + "__id__": 6 + }, + { + "__id__": 9 + }, + { + "__id__": 12 + }, + { + "__id__": 15 + }, + { + "__id__": 18 + }, + { + "__id__": 21 + }, + { + "__id__": 24 + }, + { + "__id__": 27 + }, + { + "__id__": 30 + } + ], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 33 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0.833, + 0.833, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "lock_1", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 4 + } + ], + "_prefab": { + "__id__": 5 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 114, + "height": 121 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 3 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "c1874f8a-a154-40a0-bf77-415114ef8cd3" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7aRObixb9EG6hDDC+lkB4U", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_2", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 8 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 143 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 6 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "c473c6bf-b760-40d1-9982-93c219702010" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d3ZMTYqIhPr5F2oRYfHvvd", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_3", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 11 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 135, + "height": 154 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 9 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "8abb9341-a2cc-4fa2-b1f7-59ea2ecebe95" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "24VD18h4hE/4vFhWCeTnPQ", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_4", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 14 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 140, + "height": 150 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 12 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "8f4f666a-344f-4536-a4bb-46388db293b9" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "08GrUcgX5JeIy6g3sdkyF5", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_5", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 17 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 242, + "height": 258 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 15 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "2ad9942f-9338-486b-b385-1a4dde43a1ad" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bfvhIlzB1G1ZGsLqZTKN68", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_6", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 19 + } + ], + "_prefab": { + "__id__": 20 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 377 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 15, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 18 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d0acc27e-748e-4b8e-9628-c4fd9bd27386" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8fRTkdZjFMd7TwvKFBodhN", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_7", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 23 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 372, + "height": 150 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 21 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "60dee577-a7b0-4df6-ae26-eb049efcac6a" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cfMUeh1hpJsqtfR0uSTnKb", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_8", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 25 + } + ], + "_prefab": { + "__id__": 26 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 376 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 24 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a7ab1cc2-d6e3-4d21-9f90-7db2b887ff3e" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b13kkH079E6IM0blUN9bYf", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_9", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 28 + } + ], + "_prefab": { + "__id__": 29 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 372, + "height": 143 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 27 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "73b0207c-f422-4cfd-96c2-427959375601" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "55+RZAcANKaKIF5W7lR4Wv", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock_10", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 139, + "height": 235 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -2, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 30 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5adb1b42-ae73-4e0c-a406-05709d235c7c" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "38I18hU7hAZoXzUC7O9U1k", + "sync": false + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b1yGj5iKhIfpcyOACSZjZz", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 36 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 66, + "height": 84 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 4.941, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 34 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a624291b-1769-4811-afa6-bc25f8540ac1" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "d2adfa00-68ea-4d63-97a0-44fca153a2d7" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bb95+KyRFKEr1Wy/7D5xg5", + "sync": false + }, { "__type__": "cc.Node", "_name": "time", @@ -91,7 +1378,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 3 + "__id__": 38 }, "_opacity": 255, "_color": { @@ -166,9 +1453,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "a624291b-1769-4811-afa6-bc25f8540ac1" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -180,9 +1465,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "d2adfa00-68ea-4d63-97a0-44fca153a2d7" - }, + "_atlas": null, "_id": "" }, { diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index 6262de6..7a64c68 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -365,13 +365,17 @@ export default class NewClass extends cc.Component { } openLoad() { - this.node.getChildByName("Loading").active = true; - this.node.getChildByName("Loading").getChildByName("load").stopAllActions(); - this.node.getChildByName("Loading").getChildByName("load").runAction(cc.rotateTo(2, 1080).repeatForever()); + if (this.node) { + this.node.getChildByName("Loading").active = true; + this.node.getChildByName("Loading").getChildByName("load").stopAllActions(); + this.node.getChildByName("Loading").getChildByName("load").runAction(cc.rotateTo(2, 1080).repeatForever()); + } + } closeLoad() { - this.node.getChildByName("Loading").active = false; + if (this.node) + this.node.getChildByName("Loading").active = false; } setHealthInfo(type) { @@ -386,7 +390,9 @@ export default class NewClass extends cc.Component { if (winCOIN) { const wincoin = winCOIN.getComponent(SceneManager); if (wincoin) { - MapConroler._instance.setPropNum(); + if (MapConroler && MapConroler._instance) { + MapConroler._instance.setPropNum(); + } console.log("局内"); cc.fx.GameTool.getHealth((data) => { if (this.Stamina) this.Stamina.getChildByName("time").active = true; @@ -720,7 +726,9 @@ export default class NewClass extends cc.Component { if (winCOIN) { const wincoin = winCOIN.getComponent(SceneManager); if (wincoin) { - MapConroler._instance.setPropNum(); + if (MapConroler && MapConroler._instance) { + MapConroler._instance.setPropNum(); + } console.log("局内"); }; } @@ -830,13 +838,15 @@ export default class NewClass extends cc.Component { } openConfirmBox() { - this.node.getChildByName("ConfirmBox").active = true; + if (this.node) + this.node.getChildByName("ConfirmBox").active = true; this.closeLoad(); } //关闭商城确认按钮 closeConfirmBox() { - this.node.getChildByName("ConfirmBox").active = false; + if (this.node) + this.node.getChildByName("ConfirmBox").active = false; } // update (dt) {}