diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index d750f33..0f70530 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -18,6 +18,9 @@ }, { "__id__": 4 + }, + { + "__id__": 330 } ], "_active": false, @@ -15141,5 +15144,130 @@ "__id__": 87 }, "_id": "0dna+7W/NMp6RyIrSQLx5u" + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 331 + }, + { + "__id__": 332 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 66.74, + "height": 23.94 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 41.784, + 1898.03, + 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": "21Nnf4GPVCHqI0NNdx6GDw" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 330 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "749531", + "_N$string": "749531", + "_fontSize": 20, + "_lineHeight": 19.96, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 0, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "d4fwmbx0ZMzqfBeHQk0zBv" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 330 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 9, + "_left": 8.414000000000001, + "_right": 0, + "_top": 10, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "ce7XDOgWxAkqd9NR85oHSL" } ] \ No newline at end of file diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 14aa7d2..cfbb76e 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -195,7 +195,7 @@ export default class JiaZai extends cc.Component { let switchButtons = health.getComponent("heathnum").switchButtons; let coin = health.getComponent("heathnum").coin; // 启动弹窗自己的倒计时 - if (cc.fx.GameConfig.GM_INFO.hp < 5) { + if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) { this.startHeathTimeCutDown(timeNode); } if (cc.fx.GameConfig.GM_INFO.hp == 0) { @@ -209,11 +209,11 @@ export default class JiaZai extends cc.Component { if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = true; } } - } else if (cc.fx.GameConfig.GM_INFO.hp < 5 && cc.fx.GameConfig.GM_INFO.hp > 0) { + } else if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max && cc.fx.GameConfig.GM_INFO.hp > 0) { // 体力小于5但大于0，显示spriteFrames[1]，只显示第一个按钮 if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = false; } if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = true; } - } else if (cc.fx.GameConfig.GM_INFO.hp >= 5) { + } else if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_max) { // 体力为5，显示spriteFrames[0]，只显示第一个按钮 if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = true; } @@ -268,7 +268,7 @@ export default class JiaZai extends cc.Component { if (this.Stamina && this.Stamina.getChildByName("time")) { this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp; } - if (cc.fx.GameConfig.GM_INFO.hp < 5) { + if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) { MiniGameSdk.API.showToast("恢复一点体力"); cc.fx.GameTool.setUserHealth(1, (data) => { cc.fx.GameTool.getHealth(null); @@ -366,6 +366,7 @@ export default class JiaZai extends cc.Component { if (cc.fx.GameConfig.GM_INFO.min_Time != 0) { let time = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; + console.log("______________________启动计时器"); this.startTimeCutDown(); } } @@ -458,7 +459,7 @@ export default class JiaZai extends cc.Component { this.RewardNode = null; this.RewardNode = cc.instantiate(JiaZai.cachedRewardPrefab); this.node.addChild(this.RewardNode); - this.RewardNode.getComponent("RewardWindow").init(data); + this.RewardNode.getComponent("Reward").init(data); } this.updatePower(); } @@ -570,6 +571,8 @@ export default class JiaZai extends cc.Component { console.log("需要补发数据", order); if (order.itemid == "gold_1" || order.itemid == "gold_2" || order.itemid == "gold_3" || order.itemid == "gold_4" || order.itemid == "gold_5" || order.itemid == "gold_6" + || order.itemid == "unlimited_health_bundle_1" || order.itemid == "unlimited_health_bundle_2" + || order.itemid == "unlimited_health_bundle_3" ) { this.openLoad(); console.log("补发名称:", order.itemid); diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index da6b9f2..d4e823d 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -291,17 +291,17 @@ export default class MapConroler extends cc.Component { this.itemLock[1].active = lock1Active; this.itemLock[2].active = lock2Active; - if (cc.fx.GameConfig.GM_INFO.magicAFirst == true) { + if (cc.fx.GameConfig.GM_INFO.magicAFirst == true) { this.magicNode.children[0].active = true; this.magicNode.children[1].active = false; this.magicNode.children[2].active = false; } - if (cc.fx.GameConfig.GM_INFO.hammerFirst== true) { + if (cc.fx.GameConfig.GM_INFO.hammerFirst == true) { this.hammerNode.children[0].active = true; this.hammerNode.children[1].active = false; this.hammerNode.children[2].active = false; } - if (cc.fx.GameConfig.GM_INFO.freezeFirst == true ) { + if (cc.fx.GameConfig.GM_INFO.freezeFirst == true) { this.iceNode.children[0].active = true; this.iceNode.children[1].active = false; this.iceNode.children[2].active = false; @@ -389,19 +389,24 @@ export default class MapConroler extends cc.Component { // block.getChildByName("num").getComponent(cc.Label).string = i + ":" + j; block.setPosition(cc.v2(startX + i * 120, startY + j * 120)) if (risefall != null) { - if (this.mapRiseFall(cc.v2(i, j), risefall, block)) { - this.riseFallBlcok.push(block); + if (risefall.length > 0) { + if (this.mapRiseFall(cc.v2(i, j), risefall, block)) { + this.riseFallBlcok.push(block); + } } + } if (gap != null) { - if (!this.mapGap(cc.v2(i, j), gap) || i == 0 || i == this.mapWidth - 1 - || j == 0 || j == this.mapHeight - 1) { - block.opacity = 254; - block.removeComponent(cc.Sprite); - block.removeAllChildren(); - this.wallInfo.push(block); + if (gap.length > 0) { + if (!this.mapGap(cc.v2(i, j), gap) || i == 0 || i == this.mapWidth - 1 + || j == 0 || j == this.mapHeight - 1) { + block.opacity = 254; + block.removeComponent(cc.Sprite); + block.removeAllChildren(); + this.wallInfo.push(block); + } + else this.mapInfo.push(block); } - else this.mapInfo.push(block); } else { if (i == 0 || i == this.mapWidth - 1 @@ -426,18 +431,18 @@ export default class MapConroler extends cc.Component { this.guideNode.zIndex = 1000; this.guideNode.getComponent(Animation).play(); } - - if (cc.fx.GameConfig.GM_INFO.hammerFirst== true ) { + + if (cc.fx.GameConfig.GM_INFO.hammerFirst == true) { this.guideItem.active = true; this.setPropNum(); } - if ( cc.fx.GameConfig.GM_INFO.freezeFirst == true ) { - this.guideItem.active = true; - this.setPropNum(); + if (cc.fx.GameConfig.GM_INFO.freezeFirst == true) { + this.guideItem.active = true; + this.setPropNum(); } - if ( cc.fx.GameConfig.GM_INFO.magicAFirst == true) { - this.guideItem.active = true; - this.setPropNum(); + if (cc.fx.GameConfig.GM_INFO.magicAFirst == true) { + this.guideItem.active = true; + this.setPropNum(); } } @@ -924,11 +929,16 @@ export default class MapConroler extends cc.Component { //升降地块判断 mapRiseFall(point, risefall, block) { for (let i = 0; i < risefall.length; i++) { - if (point.x == risefall[i].pos.x && point.y == risefall[i].pos.y) { - block.getChildByName("risefall").active = true; + if (point.x == risefall[i].x && point.y == risefall[i].y) { + block.getChildByName("riseup").active = true; + let spriteName = "riseup" + risefall[i].color; + let spriteName2 = "risefall" + risefall[i].color; + let icon = block.getComponent("MapBlock").riseFall.getSpriteFrame(spriteName); + let icon2 = block.getComponent("MapBlock").riseFall.getSpriteFrame(spriteName2); + block.getChildByName("risefall").getComponent(cc.Sprite).spriteFrame = icon2; + block.getChildByName("riseup").getComponent(cc.Sprite).spriteFrame = icon; + block.getChildByName("risefall").active = false; block.getChildByName('risefall').getChildByName("color").getComponent(cc.Label).string = risefall[i].color + ""; - block.getChildByName('risefall').addComponent(cc.BoxCollider); - block.getChildByName('risefall').getComponent(cc.BoxCollider).size = cc.size(110, 110); return true; } } @@ -940,13 +950,12 @@ export default class MapConroler extends cc.Component { for (let i = 0; i < this.riseFallBlcok.length; i++) { if (color == this.riseFallBlcok[i].getChildByName("risefall").getChildByName("color").getComponent(cc.Label).string) { if (down) { - this.riseFallBlcok[i].getChildByName("risefall").active = false; - this.riseFallBlcok[i].getChildByName('risefall').removeComponent(cc.BoxCollider); + this.riseFallBlcok[i].getChildByName("risefall").active = true; + this.riseFallBlcok[i].getChildByName("riseup").active = false; } else { - this.riseFallBlcok[i].getChildByName("risefall").active = true; - this.riseFallBlcok[i].getChildByName('risefall').addComponent(cc.BoxCollider); - this.riseFallBlcok[i].getChildByName('risefall').getComponent(cc.BoxCollider).size = cc.size(110, 110); + this.riseFallBlcok[i].getChildByName("risefall").active = false; + this.riseFallBlcok[i].getChildByName("riseup").active = true; } } @@ -1470,7 +1479,7 @@ export default class MapConroler extends cc.Component { // alert("游戏成功"); MiniGameSdk.API.showToast(cc.fx.GameConfig.GM_INFO.level); this.gameWin = true; - if (cc.fx.GameConfig.GM_INFO.hp < 5) { + if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) { console.log("恢复一点体力", cc.fx.GameConfig.GM_INFO.level); if (!this.powerState) { cc.fx.GameTool.setUserHealth(1, (data) => { @@ -1522,7 +1531,7 @@ export default class MapConroler extends cc.Component { } } - for (let i = 0; i < cc.fx.GameConfig.NEW_GUIDE.length; i++) { + for (let i = 0; i < cc.fx.GameConfig.NEW_GUIDE.length; i++) { if ((cc.fx.GameConfig.GM_INFO.level + 1) == cc.fx.GameConfig.NEW_GUIDE[i].level) { this.new_item = 3; } @@ -1557,18 +1566,18 @@ export default class MapConroler extends cc.Component { cc.fx.GameConfig.LEVEL_INFO_init(false, 0); return; } - if (this.new_item == 3) { + if (this.new_item == 3) { if (cc.fx.GameConfig.GM_INFO.level + 1 == 8) { console.log("新手引导开启"); - cc.fx.GameConfig.GM_INFO.hammerFirst = true; + cc.fx.GameConfig.GM_INFO.hammerFirst = true; } - if (cc.fx.GameConfig.GM_INFO.level +1== 11) { - cc.fx.GameConfig.GM_INFO.freezeFirst = true; + if (cc.fx.GameConfig.GM_INFO.level + 1 == 11) { + cc.fx.GameConfig.GM_INFO.freezeFirst = true; } - if (cc.fx.GameConfig.GM_INFO.level+1 == 16) { - cc.fx.GameConfig.GM_INFO.magicAFirst = true; - } - + if (cc.fx.GameConfig.GM_INFO.level + 1 == 16) { + cc.fx.GameConfig.GM_INFO.magicAFirst = true; + } + } cc.fx.AudioManager._instance.playEffect("zhuan1", null); @@ -1734,18 +1743,18 @@ export default class MapConroler extends cc.Component { this.openNewMode(1); return; } - if (this.new_item == 3) { - if (cc.fx.GameConfig.GM_INFO.level+1 == 8) { - cc.fx.GameConfig.GM_INFO.hammerFirst = true; - } - if (cc.fx.GameConfig.GM_INFO.level+1 == 11) { - cc.fx.GameConfig.GM_INFO.freezeFirst = true; - } - if (cc.fx.GameConfig.GM_INFO.level+1 == 16) { - cc.fx.GameConfig.GM_INFO.magicAFirst = true; - } - + if (this.new_item == 3) { + if (cc.fx.GameConfig.GM_INFO.level + 1 == 8) { + cc.fx.GameConfig.GM_INFO.hammerFirst = true; } + if (cc.fx.GameConfig.GM_INFO.level + 1 == 11) { + cc.fx.GameConfig.GM_INFO.freezeFirst = true; + } + if (cc.fx.GameConfig.GM_INFO.level + 1 == 16) { + cc.fx.GameConfig.GM_INFO.magicAFirst = true; + } + + } cc.fx.AudioManager._instance.playEffect("zhuan1", null); this.node.parent.parent.parent.getChildByName("zhuanchang").active = true; diff --git a/assets/Script/MapBlock.ts b/assets/Script/MapBlock.ts index 029cf67..d500c44 100644 --- a/assets/Script/MapBlock.ts +++ b/assets/Script/MapBlock.ts @@ -5,7 +5,7 @@ // Learn life-cycle callbacks: // - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html -const {ccclass, property} = cc._decorator; +const { ccclass, property } = cc._decorator; @ccclass export default class NewClass extends cc.Component { @@ -16,6 +16,9 @@ export default class NewClass extends cc.Component { @property block_Id: string = ''; + @property(cc.SpriteAtlas) + riseFall: cc.SpriteAtlas = null; + // LIFE-CYCLE CALLBACKS: posX: number = 0; //地图块的X坐标 @@ -23,18 +26,19 @@ export default class NewClass extends cc.Component { direction: string = ""; //地图块的方向 // onLoad () {} - start () { + start() { this.direction = ""; this.block_Id = ""; + // this.node.getChildByName("num").getComponent(cc.Label).string = this.direction; } - setDiraction(direction){ - this.direction = direction; + setDiraction(direction) { + this.direction = direction; // this.node.getChildByName("num").getComponent(cc.Label).string = this.direction; } - init(posX,posY){ + init(posX, posY) { this.posX = posX; this.posY = posY; } diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index 7a570a4..dde9682 100644 --- a/assets/Script/SceneManager.ts +++ b/assets/Script/SceneManager.ts @@ -393,7 +393,7 @@ export default class SceneManager extends cc.Component { this.RewardNode = cc.instantiate(SceneManager.cachedRewardPrefab); this.node.addChild(this.RewardNode); this.RewardNode.zIndex = 99; - this.RewardNode.getComponent("RewardWindow").init(data); + this.RewardNode.getComponent("Reward").init(data); } } diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index 10243e0..9cacc4f 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -101,7 +101,11 @@ export class GameConfig { shushu_AccountId: string; //数数账号ID uid: string; //用户和后端唯一id userPowerTime: number; //用户体力恢复时间 - freezeFirst: boolean; hammerFirst: boolean; magicAFirst: boolean; + freezeFirst: boolean; //冻结道具第一次 + hammerFirst: boolean; //锤子道具第一次 + magicAFirst: boolean; //魔法棒道具第一次 + hp_Max: number; //体力最大值 + doubleCoin: boolean;//是否翻倍 }; @@ -109,6 +113,7 @@ export class GameConfig { + //游戏内信息 static get Instance() { @@ -246,10 +251,11 @@ export class GameConfig { shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id userPowerTime: 0, //用户体力恢复时间 - freezeFirst: false, - - hammerFirst: false, - magicAFirst: false, + freezeFirst: false, //冻结道具第一次 + hammerFirst: false, //锤子道具第一次 + magicAFirst: false, //魔法棒道具第一次 + hp_Max: 5, //体力最大值 + doubleCoin: false, //是否双倍 }; // this.setCode(this.getKey("scode")); // this.GM_INFO.level = 0; @@ -265,7 +271,7 @@ export class GameConfig { // 可以根据需求对 newLevelData 进行处理 // //console.log("NEW_LEVEL.JSON 加载成功:", newLevelData); }) - cc.resources.load("Json/NEW_GUIDE", (err: any, res: cc.JsonAsset) => { + cc.resources.load("Json/NEW_GUIDE", (err: any, res: cc.JsonAsset) => { if (err) { console.error("加载 NEW_GUIDE.JSON 失败:", err); return; diff --git a/assets/Script/module/Pay/Utils.ts b/assets/Script/module/Pay/Utils.ts index 239c12a..e70893c 100644 --- a/assets/Script/module/Pay/Utils.ts +++ b/assets/Script/module/Pay/Utils.ts @@ -31,12 +31,20 @@ export default class Utils { } /**道具直购接口*/ - static buyProp(id, count, price, callBack) { + static buyProp(id, count, price, systemType, productId, callBack) { console.log("请求uid:" + Utils.uid, "请求id:" + id, "请求数量:" + count, "请求价格:" + price); Utils.POST("wx/orderPaySig", { uid: Utils.uid, itemid: id, itemCount: count, itemPrice: price }, res => { if (res.code == 1) { Utils.outTradeNo = res.data.outTradeNo; + const data = { + price: price, + payment_name: productId, + payment_num: 1, + type: systemType, + } + cc.fx.GameTool.shushu_Track("init_order", data); + console.log("创建的最新订单的订单号:", Utils.outTradeNo); // let timeoutId: number; // const timeoutDuration = 30000; // 30 秒超时时间 // // 设置超时定时器 @@ -110,6 +118,7 @@ export default class Utils { } let orderTemp = Utils.outTradeNo; if (order) orderTemp = order; + console.log("告知服务器发货的订单号：", orderTemp); Utils.POST("wx/getOrderReward", { outTradeNo: orderTemp }, res => { console.log("告知服务器发货:", res); if (res.code === 1) { diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 5dd19e5..ed78145 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -617,7 +617,7 @@ var GameTool = { //设置用户体力值 有可能加，有可能定时器减 setUserHealth(health, callback) { if (health > 0) { - if (cc.fx.GameConfig.GM_INFO.hp < 5) { + if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) { cc.fx.GameConfig.GM_INFO.hp += health; } } @@ -987,7 +987,7 @@ var GameTool = { cc.fx.GameTool.changeCoin(5000); coin = 5000; price = 1800; - this.setUserPowerTime(60); + this.setUserPowerTime(1800); // MiniGameSdk.API.showToast("获得无限体力小组合包"); rewardData = [ { type: "coin", count: coin }, diff --git a/assets/TextureBlock/block/down.plist b/assets/TextureBlock/block/down.plist index 000f8b0..787880c 100644 --- a/assets/TextureBlock/block/down.plist +++ b/assets/TextureBlock/block/down.plist @@ -15,7 +15,7 @@ spriteSourceSize {122,45} textureRect - {{1,565},{122,45}} + {{628,1023},{122,45}} textureRotated @@ -30,9 +30,9 @@ spriteSourceSize {243,45} textureRect - {{125,565},{243,45}} + {{205,733},{243,45}} textureRotated - + 10down3.png @@ -45,9 +45,9 @@ spriteSourceSize {363,45} textureRect - {{370,565},{363,45}} + {{237,368},{363,45}} textureRotated - + 10down4.png @@ -60,7 +60,7 @@ spriteSourceSize {45,124} textureRect - {{735,565},{45,124}} + {{237,1019},{45,124}} textureRotated @@ -75,9 +75,9 @@ spriteSourceSize {45,245} textureRect - {{1,612},{45,245}} + {{331,378},{45,245}} textureRotated - + 10down6.png @@ -90,7 +90,7 @@ spriteSourceSize {45,365} textureRect - {{248,612},{45,365}} + {{299,143},{45,365}} textureRotated @@ -105,7 +105,7 @@ spriteSourceSize {122,45} textureRect - {{1,1},{122,45}} + {{793,949},{122,45}} textureRotated @@ -120,7 +120,7 @@ spriteSourceSize {243,45} textureRect - {{125,1},{243,45}} + {{378,378},{243,45}} textureRotated @@ -135,7 +135,7 @@ spriteSourceSize {363,45} textureRect - {{370,1},{363,45}} + {{299,190},{363,45}} textureRotated @@ -150,9 +150,9 @@ spriteSourceSize {45,124} textureRect - {{735,1},{45,124}} + {{913,1},{45,124}} textureRotated - + 1down5.png @@ -165,7 +165,7 @@ spriteSourceSize {45,245} textureRect - {{1,48},{45,245}} + {{666,49},{45,245}} textureRotated @@ -180,9 +180,9 @@ spriteSourceSize {45,365} textureRect - {{248,48},{45,365}} + {{64,1},{45,365}} textureRotated - + 2down1.png @@ -195,7 +195,7 @@ spriteSourceSize {122,45} textureRect - {{861,1},{122,45}} + {{793,996},{122,45}} textureRotated @@ -210,7 +210,7 @@ spriteSourceSize {243,45} textureRect - {{615,48},{243,45}} + {{378,425},{243,45}} textureRotated @@ -225,7 +225,7 @@ spriteSourceSize {363,45} textureRect - {{1,95},{363,45}} + {{299,237},{363,45}} textureRotated @@ -240,9 +240,9 @@ spriteSourceSize {45,124} textureRect - {{860,48},{45,124}} + {{960,1},{45,124}} textureRotated - + 2down5.png @@ -251,13 +251,13 @@ spriteOffset {0,0} spriteSize - {45,245} + {61,266} spriteSourceSize - {45,245} + {61,266} textureRect - {{366,95},{45,245}} + {{1,757},{61,266}} textureRotated - + 2down6.png @@ -266,13 +266,13 @@ spriteOffset {0,0} spriteSize - {45,365} + {61,386} spriteSourceSize - {45,365} + {61,386} textureRect - {{613,95},{45,365}} + {{1,1},{61,386}} textureRotated - + 3down1.png @@ -285,9 +285,9 @@ spriteSourceSize {122,45} textureRect - {{1,142},{122,45}} + {{913,127},{122,45}} textureRotated - + 3down2.png @@ -300,7 +300,7 @@ spriteSourceSize {243,45} textureRect - {{125,142},{243,45}} + {{378,472},{243,45}} textureRotated @@ -315,7 +315,7 @@ spriteSourceSize {363,45} textureRect - {{370,142},{363,45}} + {{299,284},{363,45}} textureRotated @@ -330,9 +330,9 @@ spriteSourceSize {45,124} textureRect - {{735,142},{45,124}} + {{380,747},{45,124}} textureRotated - + 3down5.png @@ -345,7 +345,7 @@ spriteSourceSize {45,245} textureRect - {{1,189},{45,245}} + {{666,96},{45,245}} textureRotated @@ -360,9 +360,9 @@ spriteSourceSize {45,365} textureRect - {{248,189},{45,365}} + {{111,1},{45,365}} textureRotated - + 4down1.png @@ -375,9 +375,9 @@ spriteSourceSize {122,45} textureRect - {{861,142},{122,45}} + {{960,127},{122,45}} textureRotated - + 4down2.png @@ -390,7 +390,7 @@ spriteSourceSize {243,45} textureRect - {{615,189},{243,45}} + {{378,519},{243,45}} textureRotated @@ -405,7 +405,7 @@ spriteSourceSize {363,45} textureRect - {{1,236},{363,45}} + {{299,331},{363,45}} textureRotated @@ -420,9 +420,9 @@ spriteSourceSize {45,124} textureRect - {{860,189},{45,124}} + {{380,873},{45,124}} textureRotated - + 4down5.png @@ -435,7 +435,7 @@ spriteSourceSize {45,245} textureRect - {{366,236},{45,245}} + {{666,143},{45,245}} textureRotated @@ -450,9 +450,9 @@ spriteSourceSize {45,365} textureRect - {{613,236},{45,365}} + {{158,1},{45,365}} textureRotated - + 5down1.png @@ -465,9 +465,9 @@ spriteSourceSize {122,45} textureRect - {{1,283},{122,45}} + {{911,251},{122,45}} textureRotated - + 5down2.png @@ -480,7 +480,7 @@ spriteSourceSize {243,45} textureRect - {{125,283},{243,45}} + {{378,566},{243,45}} textureRotated @@ -495,9 +495,9 @@ spriteSourceSize {363,45} textureRect - {{370,283},{363,45}} + {{49,389},{363,45}} textureRotated - + 5down4.png @@ -510,9 +510,9 @@ spriteSourceSize {45,124} textureRect - {{735,283},{45,124}} + {{915,759},{45,124}} textureRotated - + 5down5.png @@ -525,7 +525,7 @@ spriteSourceSize {45,245} textureRect - {{1,330},{45,245}} + {{664,190},{45,245}} textureRotated @@ -540,9 +540,9 @@ spriteSourceSize {45,365} textureRect - {{248,330},{45,365}} + {{205,1},{45,365}} textureRotated - + 6down1.png @@ -555,9 +555,9 @@ spriteSourceSize {122,45} textureRect - {{861,283},{122,45}} + {{958,251},{122,45}} textureRotated - + 6down2.png @@ -570,9 +570,9 @@ spriteSourceSize {243,45} textureRect - {{615,330},{243,45}} + {{64,754},{243,45}} textureRotated - + 6down3.png @@ -585,9 +585,9 @@ spriteSourceSize {363,45} textureRect - {{1,377},{363,45}} + {{96,368},{363,45}} textureRotated - + 6down4.png @@ -600,9 +600,9 @@ spriteSourceSize {45,124} textureRect - {{860,330},{45,124}} + {{962,759},{45,124}} textureRotated - + 6down5.png @@ -615,7 +615,7 @@ spriteSourceSize {45,245} textureRect - {{366,377},{45,245}} + {{664,237},{45,245}} textureRotated @@ -630,9 +630,9 @@ spriteSourceSize {45,365} textureRect - {{613,377},{45,365}} + {{252,1},{45,365}} textureRotated - + 7down1.png @@ -645,7 +645,7 @@ spriteSourceSize {122,46} textureRect - {{861,565},{122,46}} + {{793,901},{122,46}} textureRotated @@ -660,7 +660,7 @@ spriteSourceSize {244,46} textureRect - {{615,612},{244,46}} + {{664,284},{244,46}} textureRotated @@ -675,7 +675,7 @@ spriteSourceSize {364,46} textureRect - {{1,659},{364,46}} + {{299,1},{364,46}} textureRotated @@ -690,9 +690,9 @@ spriteSourceSize {46,124} textureRect - {{861,613},{46,124}} + {{542,613},{46,124}} textureRotated - + 7down5.png @@ -705,7 +705,7 @@ spriteSourceSize {46,246} textureRect - {{367,659},{46,246}} + {{665,1},{46,246}} textureRotated @@ -720,9 +720,9 @@ spriteSourceSize {46,366} textureRect - {{615,661},{46,366}} + {{1,389},{46,366}} textureRotated - + 8down1.png @@ -735,7 +735,7 @@ spriteSourceSize {122,45} textureRect - {{1,424},{122,45}} + {{380,999},{122,45}} textureRotated @@ -750,9 +750,9 @@ spriteSourceSize {243,45} textureRect - {{125,424},{243,45}} + {{111,733},{243,45}} textureRotated - + 8down3.png @@ -765,9 +765,9 @@ spriteSourceSize {363,45} textureRect - {{370,424},{363,45}} + {{143,368},{363,45}} textureRotated - + 8down4.png @@ -780,9 +780,9 @@ spriteSourceSize {45,124} textureRect - {{735,424},{45,124}} + {{917,885},{45,124}} textureRotated - + 8down5.png @@ -795,7 +795,7 @@ spriteSourceSize {45,245} textureRect - {{1,471},{45,245}} + {{664,332},{45,245}} textureRotated @@ -810,7 +810,7 @@ spriteSourceSize {45,365} textureRect - {{248,471},{45,365}} + {{299,49},{45,365}} textureRotated @@ -825,7 +825,7 @@ spriteSourceSize {122,45} textureRect - {{861,424},{122,45}} + {{504,1015},{122,45}} textureRotated @@ -840,9 +840,9 @@ spriteSourceSize {243,45} textureRect - {{615,471},{243,45}} + {{158,733},{243,45}} textureRotated - + 9down3.png @@ -855,9 +855,9 @@ spriteSourceSize {363,45} textureRect - {{1,518},{363,45}} + {{190,368},{363,45}} textureRotated - + 9down4.png @@ -870,7 +870,7 @@ spriteSourceSize {45,124} textureRect - {{860,471},{45,124}} + {{111,978},{45,124}} textureRotated @@ -885,9 +885,9 @@ spriteSourceSize {45,245} textureRect - {{366,518},{45,245}} + {{284,378},{45,245}} textureRotated - + 9down6.png @@ -900,7 +900,307 @@ spriteSourceSize {45,365} textureRect - {{613,518},{45,365}} + {{299,96},{45,365}} + textureRotated + + + risefall1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{284,625},{120,120}} + textureRotated + + + risefall10.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{793,779},{120,120}} + textureRotated + + + risefall2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{887,515},{120,120}} + textureRotated + + + risefall3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{887,637},{120,120}} + textureRotated + + + risefall4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{427,741},{120,120}} + textureRotated + + + risefall5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{427,863},{120,120}} + textureRotated + + + risefall6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{549,771},{120,120}} + textureRotated + + + risefall7.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{549,893},{120,120}} + textureRotated + + + risefall8.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{671,779},{120,120}} + textureRotated + + + risefall9.png + + aliases + + spriteOffset + {0,0} + spriteSize + {120,120} + spriteSourceSize + {120,120} + textureRect + {{671,901},{120,120}} + textureRotated + + + riseup1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{623,379},{126,134}} + textureRotated + + + riseup10.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{726,651},{126,134}} + textureRotated + + + riseup2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{751,379},{126,134}} + textureRotated + + + riseup3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{623,515},{126,134}} + textureRotated + + + riseup4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{759,515},{126,134}} + textureRotated + + + riseup5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{406,613},{126,134}} + textureRotated + + + riseup6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{252,747},{126,134}} + textureRotated + + + riseup7.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{252,883},{126,134}} + textureRotated + + + riseup8.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{879,379},{126,134}} + textureRotated + + + riseup9.png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,134} + spriteSourceSize + {126,134} + textureRect + {{590,643},{126,134}} textureRotated @@ -916,9 +1216,9 @@ realTextureFileName down.png size - {986,708} + {1008,1069} smartupdate - $TexturePacker:SmartUpdate:e71e00cbca228ccc0b15a23585e90eb3:c43c34fe0ac0b70e0467bdecae7396c0:1f82f659e2591d395bca4b2a7c74dd8a$ + $TexturePacker:SmartUpdate:bcd0c185191512da3445ee7c39e234b1:03c71043c08664016169e35c84d6ee5a:1f82f659e2591d395bca4b2a7c74dd8a$ textureFileName down.png diff --git a/assets/TextureBlock/block/down.plist.meta b/assets/TextureBlock/block/down.plist.meta index 4a28f1f..8c05b0a 100644 --- a/assets/TextureBlock/block/down.plist.meta +++ b/assets/TextureBlock/block/down.plist.meta @@ -4,8 +4,8 @@ "importer": "asset", "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "size": { - "width": 986, - "height": 708 + "width": 1008, + "height": 1069 }, "type": "Texture Packer", "subMetas": { @@ -19,8 +19,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 565, + "trimX": 628, + "trimY": 1023, "width": 122, "height": 45, "rawWidth": 122, @@ -39,11 +39,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 125, - "trimY": 565, + "trimX": 205, + "trimY": 733, "width": 243, "height": 45, "rawWidth": 243, @@ -62,11 +62,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 370, - "trimY": 565, + "trimX": 237, + "trimY": 368, "width": 363, "height": 45, "rawWidth": 363, @@ -88,8 +88,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 735, - "trimY": 565, + "trimX": 237, + "trimY": 1019, "width": 45, "height": 124, "rawWidth": 45, @@ -108,11 +108,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 612, + "trimX": 331, + "trimY": 378, "width": 45, "height": 245, "rawWidth": 45, @@ -134,8 +134,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 612, + "trimX": 299, + "trimY": 143, "width": 45, "height": 365, "rawWidth": 45, @@ -157,8 +157,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1, + "trimX": 793, + "trimY": 949, "width": 122, "height": 45, "rawWidth": 122, @@ -180,8 +180,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 125, - "trimY": 1, + "trimX": 378, + "trimY": 378, "width": 243, "height": 45, "rawWidth": 243, @@ -203,8 +203,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 370, - "trimY": 1, + "trimX": 299, + "trimY": 190, "width": 363, "height": 45, "rawWidth": 363, @@ -223,10 +223,10 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 735, + "trimX": 913, "trimY": 1, "width": 45, "height": 124, @@ -249,8 +249,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 48, + "trimX": 666, + "trimY": 49, "width": 45, "height": 245, "rawWidth": 45, @@ -269,11 +269,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 48, + "trimX": 64, + "trimY": 1, "width": 45, "height": 365, "rawWidth": 45, @@ -295,8 +295,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 861, - "trimY": 1, + "trimX": 793, + "trimY": 996, "width": 122, "height": 45, "rawWidth": 122, @@ -318,8 +318,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 615, - "trimY": 48, + "trimX": 378, + "trimY": 425, "width": 243, "height": 45, "rawWidth": 243, @@ -341,8 +341,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 95, + "trimX": 299, + "trimY": 237, "width": 363, "height": 45, "rawWidth": 363, @@ -361,11 +361,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 860, - "trimY": 48, + "trimX": 960, + "trimY": 1, "width": 45, "height": 124, "rawWidth": 45, @@ -384,15 +384,15 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 366, - "trimY": 95, - "width": 45, - "height": 245, - "rawWidth": 45, - "rawHeight": 245, + "trimX": 1, + "trimY": 757, + "width": 61, + "height": 266, + "rawWidth": 61, + "rawHeight": 266, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -407,15 +407,15 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 613, - "trimY": 95, - "width": 45, - "height": 365, - "rawWidth": 45, - "rawHeight": 365, + "trimX": 1, + "trimY": 1, + "width": 61, + "height": 386, + "rawWidth": 61, + "rawHeight": 386, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -430,11 +430,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 142, + "trimX": 913, + "trimY": 127, "width": 122, "height": 45, "rawWidth": 122, @@ -456,8 +456,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 125, - "trimY": 142, + "trimX": 378, + "trimY": 472, "width": 243, "height": 45, "rawWidth": 243, @@ -479,8 +479,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 370, - "trimY": 142, + "trimX": 299, + "trimY": 284, "width": 363, "height": 45, "rawWidth": 363, @@ -499,11 +499,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 735, - "trimY": 142, + "trimX": 380, + "trimY": 747, "width": 45, "height": 124, "rawWidth": 45, @@ -525,8 +525,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 189, + "trimX": 666, + "trimY": 96, "width": 45, "height": 245, "rawWidth": 45, @@ -545,11 +545,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 189, + "trimX": 111, + "trimY": 1, "width": 45, "height": 365, "rawWidth": 45, @@ -568,11 +568,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 861, - "trimY": 142, + "trimX": 960, + "trimY": 127, "width": 122, "height": 45, "rawWidth": 122, @@ -594,8 +594,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 615, - "trimY": 189, + "trimX": 378, + "trimY": 519, "width": 243, "height": 45, "rawWidth": 243, @@ -617,8 +617,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 236, + "trimX": 299, + "trimY": 331, "width": 363, "height": 45, "rawWidth": 363, @@ -637,11 +637,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 860, - "trimY": 189, + "trimX": 380, + "trimY": 873, "width": 45, "height": 124, "rawWidth": 45, @@ -663,8 +663,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 366, - "trimY": 236, + "trimX": 666, + "trimY": 143, "width": 45, "height": 245, "rawWidth": 45, @@ -683,11 +683,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 613, - "trimY": 236, + "trimX": 158, + "trimY": 1, "width": 45, "height": 365, "rawWidth": 45, @@ -706,11 +706,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 283, + "trimX": 911, + "trimY": 251, "width": 122, "height": 45, "rawWidth": 122, @@ -732,8 +732,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 125, - "trimY": 283, + "trimX": 378, + "trimY": 566, "width": 243, "height": 45, "rawWidth": 243, @@ -752,11 +752,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 370, - "trimY": 283, + "trimX": 49, + "trimY": 389, "width": 363, "height": 45, "rawWidth": 363, @@ -775,11 +775,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 735, - "trimY": 283, + "trimX": 915, + "trimY": 759, "width": 45, "height": 124, "rawWidth": 45, @@ -801,8 +801,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 330, + "trimX": 664, + "trimY": 190, "width": 45, "height": 245, "rawWidth": 45, @@ -821,11 +821,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 330, + "trimX": 205, + "trimY": 1, "width": 45, "height": 365, "rawWidth": 45, @@ -844,11 +844,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 861, - "trimY": 283, + "trimX": 958, + "trimY": 251, "width": 122, "height": 45, "rawWidth": 122, @@ -867,11 +867,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 615, - "trimY": 330, + "trimX": 64, + "trimY": 754, "width": 243, "height": 45, "rawWidth": 243, @@ -890,11 +890,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 377, + "trimX": 96, + "trimY": 368, "width": 363, "height": 45, "rawWidth": 363, @@ -913,11 +913,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 860, - "trimY": 330, + "trimX": 962, + "trimY": 759, "width": 45, "height": 124, "rawWidth": 45, @@ -939,8 +939,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 366, - "trimY": 377, + "trimX": 664, + "trimY": 237, "width": 45, "height": 245, "rawWidth": 45, @@ -959,11 +959,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 613, - "trimY": 377, + "trimX": 252, + "trimY": 1, "width": 45, "height": 365, "rawWidth": 45, @@ -985,8 +985,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 861, - "trimY": 565, + "trimX": 793, + "trimY": 901, "width": 122, "height": 46, "rawWidth": 122, @@ -1008,8 +1008,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 615, - "trimY": 612, + "trimX": 664, + "trimY": 284, "width": 244, "height": 46, "rawWidth": 244, @@ -1031,8 +1031,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 659, + "trimX": 299, + "trimY": 1, "width": 364, "height": 46, "rawWidth": 364, @@ -1051,10 +1051,10 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 861, + "trimX": 542, "trimY": 613, "width": 46, "height": 124, @@ -1077,8 +1077,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 367, - "trimY": 659, + "trimX": 665, + "trimY": 1, "width": 46, "height": 246, "rawWidth": 46, @@ -1097,11 +1097,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 615, - "trimY": 661, + "trimX": 1, + "trimY": 389, "width": 46, "height": 366, "rawWidth": 46, @@ -1123,8 +1123,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 424, + "trimX": 380, + "trimY": 999, "width": 122, "height": 45, "rawWidth": 122, @@ -1143,11 +1143,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 125, - "trimY": 424, + "trimX": 111, + "trimY": 733, "width": 243, "height": 45, "rawWidth": 243, @@ -1166,11 +1166,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 370, - "trimY": 424, + "trimX": 143, + "trimY": 368, "width": 363, "height": 45, "rawWidth": 363, @@ -1189,11 +1189,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 735, - "trimY": 424, + "trimX": 917, + "trimY": 885, "width": 45, "height": 124, "rawWidth": 45, @@ -1215,8 +1215,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 471, + "trimX": 664, + "trimY": 332, "width": 45, "height": 245, "rawWidth": 45, @@ -1238,8 +1238,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 471, + "trimX": 299, + "trimY": 49, "width": 45, "height": 365, "rawWidth": 45, @@ -1261,8 +1261,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 861, - "trimY": 424, + "trimX": 504, + "trimY": 1015, "width": 122, "height": 45, "rawWidth": 122, @@ -1281,11 +1281,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 615, - "trimY": 471, + "trimX": 158, + "trimY": 733, "width": 243, "height": 45, "rawWidth": 243, @@ -1304,11 +1304,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 518, + "trimX": 190, + "trimY": 368, "width": 363, "height": 45, "rawWidth": 363, @@ -1330,8 +1330,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 860, - "trimY": 471, + "trimX": 111, + "trimY": 978, "width": 45, "height": 124, "rawWidth": 45, @@ -1350,11 +1350,11 @@ "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 366, - "trimY": 518, + "trimX": 284, + "trimY": 378, "width": 45, "height": 245, "rawWidth": 45, @@ -1376,8 +1376,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 613, - "trimY": 518, + "trimX": 299, + "trimY": 96, "width": 45, "height": 365, "rawWidth": 45, @@ -1388,6 +1388,466 @@ "borderRight": 0, "spriteType": "normal", "subMetas": {} + }, + "risefall1.png": { + "ver": "1.0.6", + "uuid": "d9bb32b4-457c-4900-83b1-871a56fbf245", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 284, + "trimY": 625, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall10.png": { + "ver": "1.0.6", + "uuid": "44d84cb5-0565-4412-83ae-95e81c532eec", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 793, + "trimY": 779, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall2.png": { + "ver": "1.0.6", + "uuid": "7f7bd4ca-d625-4712-b420-df181b8d0cde", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 887, + "trimY": 515, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall3.png": { + "ver": "1.0.6", + "uuid": "0614c0e2-2e2a-41d5-8484-135f6070da07", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 887, + "trimY": 637, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall4.png": { + "ver": "1.0.6", + "uuid": "840aa0f4-fd29-4844-94e2-fdf4b136d3de", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 427, + "trimY": 741, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall5.png": { + "ver": "1.0.6", + "uuid": "78496782-b8a3-461e-90fb-ca535d6e9f70", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 427, + "trimY": 863, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall6.png": { + "ver": "1.0.6", + "uuid": "79550727-6c56-459d-bc36-e89e7f52d32d", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 549, + "trimY": 771, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall7.png": { + "ver": "1.0.6", + "uuid": "4bd93d73-cf7b-4225-b5a7-804d6fd44e60", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 549, + "trimY": 893, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall8.png": { + "ver": "1.0.6", + "uuid": "4c3bfa4c-25d3-4308-8189-ad1911ea428d", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 671, + "trimY": 779, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "risefall9.png": { + "ver": "1.0.6", + "uuid": "d8f49f18-14cf-45a6-b491-5020971c0cfa", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 671, + "trimY": 901, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup1.png": { + "ver": "1.0.6", + "uuid": "02283f66-bdfd-4725-a7f2-b3f8bc5386c3", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 623, + "trimY": 379, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup10.png": { + "ver": "1.0.6", + "uuid": "f3c0b687-bd98-4a8b-99d3-5c7f65c9156d", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 726, + "trimY": 651, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup2.png": { + "ver": "1.0.6", + "uuid": "02440d71-bba3-4e50-bc58-e5f4124cc880", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 751, + "trimY": 379, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup3.png": { + "ver": "1.0.6", + "uuid": "c20d1601-462a-431f-9067-7fbc24f45e95", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 623, + "trimY": 515, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup4.png": { + "ver": "1.0.6", + "uuid": "181e577d-41da-4a70-b7c0-ee77aaf15107", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 759, + "trimY": 515, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup5.png": { + "ver": "1.0.6", + "uuid": "58d3f9a2-1239-4feb-815d-660bec909edb", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 406, + "trimY": 613, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup6.png": { + "ver": "1.0.6", + "uuid": "07cf3404-01c6-4b8e-ba4a-f9246d385bf2", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 252, + "trimY": 747, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup7.png": { + "ver": "1.0.6", + "uuid": "9fb2d2e0-8daa-4a26-b37c-bc3da8562cc2", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 252, + "trimY": 883, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup8.png": { + "ver": "1.0.6", + "uuid": "4987667f-be41-40a7-bc5a-f93e2d381fa0", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 879, + "trimY": 379, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "riseup9.png": { + "ver": "1.0.6", + "uuid": "491cdfd2-93a4-432b-a19f-937207d809ec", + "importer": "sprite-frame", + "rawTextureUuid": "c660c59d-e175-4194-aaf3-33d1d03b783f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 590, + "trimY": 643, + "width": 126, + "height": 134, + "rawWidth": 126, + "rawHeight": 134, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} } } } \ No newline at end of file diff --git a/assets/TextureBlock/block/down.png b/assets/TextureBlock/block/down.png index 096d32a..22edd90 100644 Binary files a/assets/TextureBlock/block/down.png and b/assets/TextureBlock/block/down.png differ diff --git a/assets/prefab/map/MapBlock.prefab b/assets/prefab/map/MapBlock.prefab index 7d4663b..4a7734b 100644 --- a/assets/prefab/map/MapBlock.prefab +++ b/assets/prefab/map/MapBlock.prefab @@ -19,19 +19,22 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 7 } ], "_active": true, "_components": [ { - "__id__": 8 + "__id__": 13 }, { - "__id__": 9 + "__id__": 14 } ], "_prefab": { - "__id__": 10 + "__id__": 15 }, "_opacity": 255, "_color": { @@ -80,6 +83,184 @@ "groupIndex": 1, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "riseup", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 6 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 120 + }, + "_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__": 2 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "c22a3wcU/tBdJ/qjn/Q6uuA", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "auto_update_point": false, + "_id": "" + }, + { + "__type__": "d2addiRqXVKQ4YEp6sK5d6R", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "_draw_collide": false, + "can_move": false, + "_collide_shape": 1, + "collide_group_id": 0, + "collide_scle": 1, + "_radius": 50, + "_size": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_polygon_points": [ + { + "__type__": "cc.Vec2", + "x": -45, + "y": -45 + }, + { + "__type__": "cc.Vec2", + "x": 45, + "y": -45 + }, + { + "__type__": "cc.Vec2", + "x": 60, + "y": 40 + }, + { + "__type__": "cc.Vec2", + "x": 0, + "y": 70 + }, + { + "__type__": "cc.Vec2", + "x": -60, + "y": 40 + } + ], + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "data_string": "", + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "2ad95b5e-51fe-4864-ad40-6743b8fac9d5" + }, + "fileId": "54EhKJk8RO3ZqCwIuQNcqR", + "sync": false + }, { "__type__": "cc.Node", "_name": "risefall", @@ -89,17 +270,17 @@ }, "_children": [ { - "__id__": 3 + "__id__": 8 } ], "_active": false, "_components": [ { - "__id__": 6 + "__id__": 11 } ], "_prefab": { - "__id__": 7 + "__id__": 12 }, "_opacity": 255, "_color": { @@ -153,19 +334,19 @@ "_name": "color", "_objFlags": 0, "_parent": { - "__id__": 2 + "__id__": 7 }, "_children": [], "_active": true, "_components": [ { - "__id__": 4 + "__id__": 9 } ], "_prefab": { - "__id__": 5 + "__id__": 10 }, - "_opacity": 255, + "_opacity": 0, "_color": { "__type__": "cc.Color", "r": 0, @@ -217,7 +398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 3 + "__id__": 8 }, "_enabled": true, "_materials": [ @@ -248,7 +429,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 2 + "__id__": 7 }, "asset": { "__uuid__": "2ad95b5e-51fe-4864-ad40-6743b8fac9d5" @@ -261,7 +442,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 2 + "__id__": 7 }, "_enabled": true, "_materials": [ @@ -291,12 +472,12 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 2 + "__id__": 7 }, "asset": { "__uuid__": "2ad95b5e-51fe-4864-ad40-6743b8fac9d5" }, - "fileId": "54EhKJk8RO3ZqCwIuQNcqR", + "fileId": "3dMeOJ0YNFE7bL+Lq7EnZ/", "sync": false }, { @@ -343,6 +524,9 @@ "_enabled": true, "label": null, "block_Id": "", + "riseFall": { + "__uuid__": "3d019ed8-3019-436d-add0-ceeb02a5baaf" + }, "_id": "" }, { diff --git a/assets/resources/Json/CLICK_DATA.json b/assets/resources/Json/CLICK_DATA.json index d413b6c..98c9f9d 100644 --- a/assets/resources/Json/CLICK_DATA.json +++ b/assets/resources/Json/CLICK_DATA.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "1001", "map": [ 6, diff --git a/assets/resources/Json/level1.json b/assets/resources/Json/level1.json index 903c5df..066ff0f 100644 --- a/assets/resources/Json/level1.json +++ b/assets/resources/Json/level1.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "1", "map": [ 6, @@ -22,7 +23,6 @@ "z": 0 }, "id": 210 - }, { "block": 5, diff --git a/assets/resources/Json/level10.json b/assets/resources/Json/level10.json index 487edc5..feece63 100644 --- a/assets/resources/Json/level10.json +++ b/assets/resources/Json/level10.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "10", "map": [ 5, diff --git a/assets/resources/Json/level100.json b/assets/resources/Json/level100.json index b1b5faa..409fd20 100644 --- a/assets/resources/Json/level100.json +++ b/assets/resources/Json/level100.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "100", "map": [ 10, diff --git a/assets/resources/Json/level101.json b/assets/resources/Json/level101.json index 2d93f4a..ef89268 100644 --- a/assets/resources/Json/level101.json +++ b/assets/resources/Json/level101.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "101", "map": [ 8, diff --git a/assets/resources/Json/level102.json b/assets/resources/Json/level102.json index 82ac59d..a88f2c5 100644 --- a/assets/resources/Json/level102.json +++ b/assets/resources/Json/level102.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "102", "map": [ 8, diff --git a/assets/resources/Json/level103.json b/assets/resources/Json/level103.json index ebfc75e..ebc6992 100644 --- a/assets/resources/Json/level103.json +++ b/assets/resources/Json/level103.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "103", "map": [ 8, diff --git a/assets/resources/Json/level104.json b/assets/resources/Json/level104.json index 2a07332..28e0750 100644 --- a/assets/resources/Json/level104.json +++ b/assets/resources/Json/level104.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "104", "map": [ 10, diff --git a/assets/resources/Json/level105.json b/assets/resources/Json/level105.json index 98edce5..6197a4c 100644 --- a/assets/resources/Json/level105.json +++ b/assets/resources/Json/level105.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "105", "map": [ 7, diff --git a/assets/resources/Json/level106.json b/assets/resources/Json/level106.json index 7e562a0..2eaa738 100644 --- a/assets/resources/Json/level106.json +++ b/assets/resources/Json/level106.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "106", "map": [ 8, diff --git a/assets/resources/Json/level107.json b/assets/resources/Json/level107.json index d0fcf68..dff3259 100644 --- a/assets/resources/Json/level107.json +++ b/assets/resources/Json/level107.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "107", "map": [ 9, diff --git a/assets/resources/Json/level108.json b/assets/resources/Json/level108.json index 5537421..cfbff32 100644 --- a/assets/resources/Json/level108.json +++ b/assets/resources/Json/level108.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "108", "map": [ 8, diff --git a/assets/resources/Json/level109.json b/assets/resources/Json/level109.json index 4fb499a..271df1d 100644 --- a/assets/resources/Json/level109.json +++ b/assets/resources/Json/level109.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "109", "map": [ 11, diff --git a/assets/resources/Json/level11.json b/assets/resources/Json/level11.json index 482b8d6..9cb6d7e 100644 --- a/assets/resources/Json/level11.json +++ b/assets/resources/Json/level11.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "11", "map": [ 9, diff --git a/assets/resources/Json/level110.json b/assets/resources/Json/level110.json index 1b6479d..e275f7c 100644 --- a/assets/resources/Json/level110.json +++ b/assets/resources/Json/level110.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "110", "map": [ 9, diff --git a/assets/resources/Json/level111.json b/assets/resources/Json/level111.json index d2226de..2d12ac3 100644 --- a/assets/resources/Json/level111.json +++ b/assets/resources/Json/level111.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "111", "map": [ 7, diff --git a/assets/resources/Json/level112.json b/assets/resources/Json/level112.json index 969c813..bfb60f8 100644 --- a/assets/resources/Json/level112.json +++ b/assets/resources/Json/level112.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "112", "map": [ 8, diff --git a/assets/resources/Json/level113.json b/assets/resources/Json/level113.json index 90ff526..56bd633 100644 --- a/assets/resources/Json/level113.json +++ b/assets/resources/Json/level113.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "113", "map": [ 7, diff --git a/assets/resources/Json/level114.json b/assets/resources/Json/level114.json index ece71c6..2f98c9a 100644 --- a/assets/resources/Json/level114.json +++ b/assets/resources/Json/level114.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "114", "map": [ 9, diff --git a/assets/resources/Json/level115.json b/assets/resources/Json/level115.json index 335bb77..9e2be22 100644 --- a/assets/resources/Json/level115.json +++ b/assets/resources/Json/level115.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "115", "map": [ 9, diff --git a/assets/resources/Json/level116.json b/assets/resources/Json/level116.json index 559f92b..173218b 100644 --- a/assets/resources/Json/level116.json +++ b/assets/resources/Json/level116.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "116", "map": [ 10, diff --git a/assets/resources/Json/level118.json b/assets/resources/Json/level118.json index bc04762..2ad2721 100644 --- a/assets/resources/Json/level118.json +++ b/assets/resources/Json/level118.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "118", "map": [ 10, diff --git a/assets/resources/Json/level119.json b/assets/resources/Json/level119.json index 6b3f0da..359d6fc 100644 --- a/assets/resources/Json/level119.json +++ b/assets/resources/Json/level119.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "119", "map": [ 8, diff --git a/assets/resources/Json/level12.json b/assets/resources/Json/level12.json index 2a5efaa..7469d47 100644 --- a/assets/resources/Json/level12.json +++ b/assets/resources/Json/level12.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "12", "map": [ 7, diff --git a/assets/resources/Json/level120.json b/assets/resources/Json/level120.json index 99bf8c5..88b0bb0 100644 --- a/assets/resources/Json/level120.json +++ b/assets/resources/Json/level120.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "120", "map": [ 8, diff --git a/assets/resources/Json/level121.json b/assets/resources/Json/level121.json index f246dd8..958cf6f 100644 --- a/assets/resources/Json/level121.json +++ b/assets/resources/Json/level121.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "121", "map": [ 10, diff --git a/assets/resources/Json/level122.json b/assets/resources/Json/level122.json index fd3ea15..ca5d414 100644 --- a/assets/resources/Json/level122.json +++ b/assets/resources/Json/level122.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "122", "map": [ 10, diff --git a/assets/resources/Json/level123.json b/assets/resources/Json/level123.json index 3a129c0..6c4e8e4 100644 --- a/assets/resources/Json/level123.json +++ b/assets/resources/Json/level123.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "123", "map": [ 6, diff --git a/assets/resources/Json/level124.json b/assets/resources/Json/level124.json index bc57057..86cdef8 100644 --- a/assets/resources/Json/level124.json +++ b/assets/resources/Json/level124.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "124", "map": [ 11, diff --git a/assets/resources/Json/level125.json b/assets/resources/Json/level125.json index 543fc9b..07b32b5 100644 --- a/assets/resources/Json/level125.json +++ b/assets/resources/Json/level125.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "125", "map": [ 10, diff --git a/assets/resources/Json/level126.json b/assets/resources/Json/level126.json index 92c8e03..84bf32a 100644 --- a/assets/resources/Json/level126.json +++ b/assets/resources/Json/level126.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "126", "map": [ 8, diff --git a/assets/resources/Json/level127.json b/assets/resources/Json/level127.json index 66ec76c..243148b 100644 --- a/assets/resources/Json/level127.json +++ b/assets/resources/Json/level127.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "127", "map": [ 6, diff --git a/assets/resources/Json/level128.json b/assets/resources/Json/level128.json index 225f9c1..e276eb8 100644 --- a/assets/resources/Json/level128.json +++ b/assets/resources/Json/level128.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "128", "map": [ 10, diff --git a/assets/resources/Json/level13.json b/assets/resources/Json/level13.json index 6ad6716..747e5f7 100644 --- a/assets/resources/Json/level13.json +++ b/assets/resources/Json/level13.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "13", "map": [ 9, diff --git a/assets/resources/Json/level130.json b/assets/resources/Json/level130.json index 20704f1..c541fbc 100644 --- a/assets/resources/Json/level130.json +++ b/assets/resources/Json/level130.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "130", "map": [ 11, diff --git a/assets/resources/Json/level131.json b/assets/resources/Json/level131.json index 4b713ae..702fb61 100644 --- a/assets/resources/Json/level131.json +++ b/assets/resources/Json/level131.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "64", "map": [ 8, diff --git a/assets/resources/Json/level132.json b/assets/resources/Json/level132.json index 4a81f46..a2ae793 100644 --- a/assets/resources/Json/level132.json +++ b/assets/resources/Json/level132.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "132", "map": [ 7, diff --git a/assets/resources/Json/level133.json b/assets/resources/Json/level133.json index 63282e3..c0e6290 100644 --- a/assets/resources/Json/level133.json +++ b/assets/resources/Json/level133.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "133", "map": [ 11, diff --git a/assets/resources/Json/level134.json b/assets/resources/Json/level134.json index e37ff8a..b473db7 100644 --- a/assets/resources/Json/level134.json +++ b/assets/resources/Json/level134.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "134", "map": [ 9, diff --git a/assets/resources/Json/level135.json b/assets/resources/Json/level135.json index b3dc9f4..dc971a5 100644 --- a/assets/resources/Json/level135.json +++ b/assets/resources/Json/level135.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "135", "map": [ 11, diff --git a/assets/resources/Json/level137.json b/assets/resources/Json/level137.json index 8da917c..3e93600 100644 --- a/assets/resources/Json/level137.json +++ b/assets/resources/Json/level137.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "137", "map": [ 10, diff --git a/assets/resources/Json/level138.json b/assets/resources/Json/level138.json index 830d153..76014cd 100644 --- a/assets/resources/Json/level138.json +++ b/assets/resources/Json/level138.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "138", "map": [ 11, diff --git a/assets/resources/Json/level14.json b/assets/resources/Json/level14.json index 8dd1293..24eda1b 100644 --- a/assets/resources/Json/level14.json +++ b/assets/resources/Json/level14.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "14", "map": [ 8, diff --git a/assets/resources/Json/level140.json b/assets/resources/Json/level140.json index 73d9174..b1c26b4 100644 --- a/assets/resources/Json/level140.json +++ b/assets/resources/Json/level140.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "140", "map": [ 7, diff --git a/assets/resources/Json/level141.json b/assets/resources/Json/level141.json index acf1399..f765759 100644 --- a/assets/resources/Json/level141.json +++ b/assets/resources/Json/level141.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "141", "map": [ 8, diff --git a/assets/resources/Json/level143.json b/assets/resources/Json/level143.json index a09d492..e5e2fdd 100644 --- a/assets/resources/Json/level143.json +++ b/assets/resources/Json/level143.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "143", "map": [ 8, diff --git a/assets/resources/Json/level144.json b/assets/resources/Json/level144.json index bd997cb..86c7b3c 100644 --- a/assets/resources/Json/level144.json +++ b/assets/resources/Json/level144.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "144", "map": [ 10, diff --git a/assets/resources/Json/level145.json b/assets/resources/Json/level145.json index 918f718..2a27542 100644 --- a/assets/resources/Json/level145.json +++ b/assets/resources/Json/level145.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "145", "map": [ 8, diff --git a/assets/resources/Json/level146.json b/assets/resources/Json/level146.json index 54d56b4..c49d068 100644 --- a/assets/resources/Json/level146.json +++ b/assets/resources/Json/level146.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "146", "map": [ 11, diff --git a/assets/resources/Json/level147.json b/assets/resources/Json/level147.json index 232448b..9e708e9 100644 --- a/assets/resources/Json/level147.json +++ b/assets/resources/Json/level147.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "147", "map": [ 10, diff --git a/assets/resources/Json/level148.json b/assets/resources/Json/level148.json index 05233d3..eb9d8cf 100644 --- a/assets/resources/Json/level148.json +++ b/assets/resources/Json/level148.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "148", "map": [ 7, diff --git a/assets/resources/Json/level149.json b/assets/resources/Json/level149.json index e990e48..36965d6 100644 --- a/assets/resources/Json/level149.json +++ b/assets/resources/Json/level149.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "149", "map": [ 9, diff --git a/assets/resources/Json/level15.json b/assets/resources/Json/level15.json index 3c9fa3a..e9dbe58 100644 --- a/assets/resources/Json/level15.json +++ b/assets/resources/Json/level15.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "15", "map": [ 8, @@ -21,7 +22,7 @@ "y": -420, "z": 0 }, - "stacking": 9, + "stacking": 9, "id": 210 }, { @@ -33,7 +34,7 @@ "y": -180, "z": 0 }, - "stacking": 9, + "stacking": 9, "id": 220 }, { @@ -45,7 +46,7 @@ "y": -60, "z": 0 }, - "stacking": 5, + "stacking": 5, "id": 230 }, { @@ -68,7 +69,7 @@ "y": 180, "z": 0 }, - "stacking": 4, + "stacking": 4, "id": 250 }, { @@ -91,7 +92,7 @@ "y": -180, "z": 0 }, - "stacking": 6, + "stacking": 6, "id": 270 }, { @@ -103,7 +104,7 @@ "y": -540, "z": 0 }, - "stacking": 2, + "stacking": 2, "id": 280 }, { @@ -137,7 +138,7 @@ "y": -540, "z": 0 }, - "stacking": 6, + "stacking": 6, "id": 310 }, { diff --git a/assets/resources/Json/level150.json b/assets/resources/Json/level150.json index ebb8536..f261c74 100644 --- a/assets/resources/Json/level150.json +++ b/assets/resources/Json/level150.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "150", "map": [ 10, diff --git a/assets/resources/Json/level151.json b/assets/resources/Json/level151.json index 77777fc..b21b6b6 100644 --- a/assets/resources/Json/level151.json +++ b/assets/resources/Json/level151.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "151", "map": [ 7, diff --git a/assets/resources/Json/level152.json b/assets/resources/Json/level152.json index 14310b6..0aafa1e 100644 --- a/assets/resources/Json/level152.json +++ b/assets/resources/Json/level152.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "152", "map": [ 9, diff --git a/assets/resources/Json/level153.json b/assets/resources/Json/level153.json index 158726f..6f515d5 100644 --- a/assets/resources/Json/level153.json +++ b/assets/resources/Json/level153.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "153", "map": [ 11, diff --git a/assets/resources/Json/level154.json b/assets/resources/Json/level154.json index ead3f2c..1e0ad93 100644 --- a/assets/resources/Json/level154.json +++ b/assets/resources/Json/level154.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "154", "map": [ 8, diff --git a/assets/resources/Json/level155.json b/assets/resources/Json/level155.json index 09f773c..90bdf14 100644 --- a/assets/resources/Json/level155.json +++ b/assets/resources/Json/level155.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "155", "map": [ 9, diff --git a/assets/resources/Json/level156.json b/assets/resources/Json/level156.json index d709dc4..bc2fffa 100644 --- a/assets/resources/Json/level156.json +++ b/assets/resources/Json/level156.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "156", "map": [ 9, diff --git a/assets/resources/Json/level157.json b/assets/resources/Json/level157.json index 7d18237..5ddfe8a 100644 --- a/assets/resources/Json/level157.json +++ b/assets/resources/Json/level157.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "157", "map": [ 10, diff --git a/assets/resources/Json/level158.json b/assets/resources/Json/level158.json index 9889578..6d71b23 100644 --- a/assets/resources/Json/level158.json +++ b/assets/resources/Json/level158.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "158", "map": [ 7, diff --git a/assets/resources/Json/level159.json b/assets/resources/Json/level159.json index c67c50b..3a59a72 100644 --- a/assets/resources/Json/level159.json +++ b/assets/resources/Json/level159.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "159", "map": [ 7, diff --git a/assets/resources/Json/level16.json b/assets/resources/Json/level16.json index d3b7d39..e288c3d 100644 --- a/assets/resources/Json/level16.json +++ b/assets/resources/Json/level16.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "16", "map": [ 7, diff --git a/assets/resources/Json/level160.json b/assets/resources/Json/level160.json index 5281644..53f7b24 100644 --- a/assets/resources/Json/level160.json +++ b/assets/resources/Json/level160.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "160", "map": [ 8, diff --git a/assets/resources/Json/level161.json b/assets/resources/Json/level161.json index 435c291..05ce32d 100644 --- a/assets/resources/Json/level161.json +++ b/assets/resources/Json/level161.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "161", "map": [ 8, diff --git a/assets/resources/Json/level162.json b/assets/resources/Json/level162.json index e9e86d5..e6ffab6 100644 --- a/assets/resources/Json/level162.json +++ b/assets/resources/Json/level162.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "162", "map": [ 8, diff --git a/assets/resources/Json/level163.json b/assets/resources/Json/level163.json index a5f85fe..99430dc 100644 --- a/assets/resources/Json/level163.json +++ b/assets/resources/Json/level163.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "163", "map": [ 8, diff --git a/assets/resources/Json/level164.json b/assets/resources/Json/level164.json index 7fd06bf..296de6f 100644 --- a/assets/resources/Json/level164.json +++ b/assets/resources/Json/level164.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "164", "map": [ 10, diff --git a/assets/resources/Json/level165.json b/assets/resources/Json/level165.json index c1960c9..a76715c 100644 --- a/assets/resources/Json/level165.json +++ b/assets/resources/Json/level165.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "165", "map": [ 8, diff --git a/assets/resources/Json/level166.json b/assets/resources/Json/level166.json index f970978..cb51740 100644 --- a/assets/resources/Json/level166.json +++ b/assets/resources/Json/level166.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "166", "map": [ 8, diff --git a/assets/resources/Json/level167.json b/assets/resources/Json/level167.json index 430ff1c..17c49a6 100644 --- a/assets/resources/Json/level167.json +++ b/assets/resources/Json/level167.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "167", "map": [ 8, diff --git a/assets/resources/Json/level168.json b/assets/resources/Json/level168.json index d41f8e8..6b34272 100644 --- a/assets/resources/Json/level168.json +++ b/assets/resources/Json/level168.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "168", "map": [ 9, diff --git a/assets/resources/Json/level169.json b/assets/resources/Json/level169.json index 0e7465e..9658e6e 100644 --- a/assets/resources/Json/level169.json +++ b/assets/resources/Json/level169.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "169", "map": [ 8, diff --git a/assets/resources/Json/level17.json b/assets/resources/Json/level17.json index f3a1d63..ea87554 100644 --- a/assets/resources/Json/level17.json +++ b/assets/resources/Json/level17.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "17", "map": [ 7, @@ -21,7 +22,7 @@ "y": -300, "z": 0 }, - "stacking": 8, + "stacking": 8, "id": 210 }, { @@ -44,7 +45,7 @@ "y": -420, "z": 0 }, - "stacking": 3, + "stacking": 3, "id": 230 }, { @@ -111,7 +112,7 @@ "y": 60, "z": 0 }, - "stacking": 2, + "stacking": 2, "id": 290 } ] diff --git a/assets/resources/Json/level170.json b/assets/resources/Json/level170.json index 1536a48..d7953d7 100644 --- a/assets/resources/Json/level170.json +++ b/assets/resources/Json/level170.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "170", "map": [ 10, diff --git a/assets/resources/Json/level171.json b/assets/resources/Json/level171.json index 190ef5e..83a4780 100644 --- a/assets/resources/Json/level171.json +++ b/assets/resources/Json/level171.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "171", "map": [ 7, diff --git a/assets/resources/Json/level172.json b/assets/resources/Json/level172.json index 989b1d2..28c843e 100644 --- a/assets/resources/Json/level172.json +++ b/assets/resources/Json/level172.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "172", "map": [ 9, diff --git a/assets/resources/Json/level173.json b/assets/resources/Json/level173.json index ad17aeb..6d8a409 100644 --- a/assets/resources/Json/level173.json +++ b/assets/resources/Json/level173.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "173", "map": [ 9, diff --git a/assets/resources/Json/level174.json b/assets/resources/Json/level174.json index 3adce29..49a047e 100644 --- a/assets/resources/Json/level174.json +++ b/assets/resources/Json/level174.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "174", "map": [ 8, diff --git a/assets/resources/Json/level175.json b/assets/resources/Json/level175.json index accc012..5033bbb 100644 --- a/assets/resources/Json/level175.json +++ b/assets/resources/Json/level175.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "175", "map": [ 10, diff --git a/assets/resources/Json/level176.json b/assets/resources/Json/level176.json index 44a120c..aedecb5 100644 --- a/assets/resources/Json/level176.json +++ b/assets/resources/Json/level176.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "176", "map": [ 9, diff --git a/assets/resources/Json/level177.json b/assets/resources/Json/level177.json index e1da077..ac021f9 100644 --- a/assets/resources/Json/level177.json +++ b/assets/resources/Json/level177.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "177", "map": [ 8, diff --git a/assets/resources/Json/level178.json b/assets/resources/Json/level178.json index 614cc9a..8d51aec 100644 --- a/assets/resources/Json/level178.json +++ b/assets/resources/Json/level178.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "178", "map": [ 8, diff --git a/assets/resources/Json/level179.json b/assets/resources/Json/level179.json index 08c6816..fe5bd50 100644 --- a/assets/resources/Json/level179.json +++ b/assets/resources/Json/level179.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "179", "map": [ 8, diff --git a/assets/resources/Json/level18.json b/assets/resources/Json/level18.json index cefa6c3..507f330 100644 --- a/assets/resources/Json/level18.json +++ b/assets/resources/Json/level18.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "18", "map": [ 11, @@ -109,7 +110,7 @@ "y": 180, "z": 0 }, - "stacking": 8, + "stacking": 8, "id": 290 }, { @@ -165,7 +166,7 @@ "y": -60, "z": 0 }, - "stacking": 2, + "stacking": 2, "id": 340 }, { @@ -188,7 +189,7 @@ "y": -180, "z": 0 }, - "stacking": 8, + "stacking": 8, "id": 360 }, { diff --git a/assets/resources/Json/level180.json b/assets/resources/Json/level180.json index dfee71f..03567fd 100644 --- a/assets/resources/Json/level180.json +++ b/assets/resources/Json/level180.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "180", "map": [ 8, diff --git a/assets/resources/Json/level181.json b/assets/resources/Json/level181.json index 0a4ba8e..60b29f2 100644 --- a/assets/resources/Json/level181.json +++ b/assets/resources/Json/level181.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "181", "map": [ 8, diff --git a/assets/resources/Json/level182.json b/assets/resources/Json/level182.json index d1c0973..fb601ee 100644 --- a/assets/resources/Json/level182.json +++ b/assets/resources/Json/level182.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "182", "map": [ 8, diff --git a/assets/resources/Json/level183.json b/assets/resources/Json/level183.json index bad5b66..f24fd26 100644 --- a/assets/resources/Json/level183.json +++ b/assets/resources/Json/level183.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "183", "map": [ 8, diff --git a/assets/resources/Json/level184.json b/assets/resources/Json/level184.json index e26b47e..81c5659 100644 --- a/assets/resources/Json/level184.json +++ b/assets/resources/Json/level184.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "184", "map": [ 10, diff --git a/assets/resources/Json/level185.json b/assets/resources/Json/level185.json index 039ab06..72500da 100644 --- a/assets/resources/Json/level185.json +++ b/assets/resources/Json/level185.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "185", "map": [ 11, diff --git a/assets/resources/Json/level186.json b/assets/resources/Json/level186.json index c37e9b1..cbb023d 100644 --- a/assets/resources/Json/level186.json +++ b/assets/resources/Json/level186.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "175", "map": [ 8, diff --git a/assets/resources/Json/level187.json b/assets/resources/Json/level187.json index 9397c70..4bd0699 100644 --- a/assets/resources/Json/level187.json +++ b/assets/resources/Json/level187.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "187", "map": [ 10, diff --git a/assets/resources/Json/level188.json b/assets/resources/Json/level188.json index b374f54..55224ad 100644 --- a/assets/resources/Json/level188.json +++ b/assets/resources/Json/level188.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "188", "map": [ 9, diff --git a/assets/resources/Json/level189.json b/assets/resources/Json/level189.json index d440a7f..164611a 100644 --- a/assets/resources/Json/level189.json +++ b/assets/resources/Json/level189.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "189", "map": [ 10, diff --git a/assets/resources/Json/level19.json b/assets/resources/Json/level19.json index 986901e..b458a2d 100644 --- a/assets/resources/Json/level19.json +++ b/assets/resources/Json/level19.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "19", "map": [ 8, diff --git a/assets/resources/Json/level190.json b/assets/resources/Json/level190.json index c230d0d..333509a 100644 --- a/assets/resources/Json/level190.json +++ b/assets/resources/Json/level190.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "190", "map": [ 8, diff --git a/assets/resources/Json/level191.json b/assets/resources/Json/level191.json index 4ed0cb8..b6960f3 100644 --- a/assets/resources/Json/level191.json +++ b/assets/resources/Json/level191.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "191", "map": [ 8, diff --git a/assets/resources/Json/level192.json b/assets/resources/Json/level192.json index 49555b6..d5f0f0f 100644 --- a/assets/resources/Json/level192.json +++ b/assets/resources/Json/level192.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "192", "map": [ 10, diff --git a/assets/resources/Json/level193.json b/assets/resources/Json/level193.json index faef115..b58d14b 100644 --- a/assets/resources/Json/level193.json +++ b/assets/resources/Json/level193.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "193", "map": [ 10, diff --git a/assets/resources/Json/level194.json b/assets/resources/Json/level194.json index 8f0cddd..d0a10dc 100644 --- a/assets/resources/Json/level194.json +++ b/assets/resources/Json/level194.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "194", "map": [ 10, diff --git a/assets/resources/Json/level195.json b/assets/resources/Json/level195.json index d844951..eb898b4 100644 --- a/assets/resources/Json/level195.json +++ b/assets/resources/Json/level195.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "195", "map": [ 9, diff --git a/assets/resources/Json/level196.json b/assets/resources/Json/level196.json index 36160c7..1a083a6 100644 --- a/assets/resources/Json/level196.json +++ b/assets/resources/Json/level196.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "196", "map": [ 10, diff --git a/assets/resources/Json/level197.json b/assets/resources/Json/level197.json index f7b784c..f8e3f68 100644 --- a/assets/resources/Json/level197.json +++ b/assets/resources/Json/level197.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "197", "map": [ 11, diff --git a/assets/resources/Json/level198.json b/assets/resources/Json/level198.json index b4a3170..db08162 100644 --- a/assets/resources/Json/level198.json +++ b/assets/resources/Json/level198.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "198", "map": [ 9, diff --git a/assets/resources/Json/level199.json b/assets/resources/Json/level199.json index e63d998..b2bce93 100644 --- a/assets/resources/Json/level199.json +++ b/assets/resources/Json/level199.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "199", "map": [ 10, diff --git a/assets/resources/Json/level2.json b/assets/resources/Json/level2.json index 1a89117..2c9e761 100644 --- a/assets/resources/Json/level2.json +++ b/assets/resources/Json/level2.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "2", "map": [ 7, diff --git a/assets/resources/Json/level20.json b/assets/resources/Json/level20.json index 9d14b05..7207065 100644 --- a/assets/resources/Json/level20.json +++ b/assets/resources/Json/level20.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "20", "map": [ 9, diff --git a/assets/resources/Json/level200.json b/assets/resources/Json/level200.json index 4987987..23b619f 100644 --- a/assets/resources/Json/level200.json +++ b/assets/resources/Json/level200.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "200", "map": [ 10, diff --git a/assets/resources/Json/level201.json b/assets/resources/Json/level201.json index 85e9b2f..c1e51a4 100644 --- a/assets/resources/Json/level201.json +++ b/assets/resources/Json/level201.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "201", "map": [ 9, diff --git a/assets/resources/Json/level202.json b/assets/resources/Json/level202.json index 57237d3..becf80e 100644 --- a/assets/resources/Json/level202.json +++ b/assets/resources/Json/level202.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "202", "map": [ 9, diff --git a/assets/resources/Json/level203.json b/assets/resources/Json/level203.json index 46f5591..ae3260b 100644 --- a/assets/resources/Json/level203.json +++ b/assets/resources/Json/level203.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "203", "map": [ 9, diff --git a/assets/resources/Json/level204.json b/assets/resources/Json/level204.json index 761c406..e86bc72 100644 --- a/assets/resources/Json/level204.json +++ b/assets/resources/Json/level204.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "204", "map": [ 9, diff --git a/assets/resources/Json/level205.json b/assets/resources/Json/level205.json index 831b7be..7e8f1f2 100644 --- a/assets/resources/Json/level205.json +++ b/assets/resources/Json/level205.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "205", "map": [ 10, diff --git a/assets/resources/Json/level206.json b/assets/resources/Json/level206.json index d054ab0..a6c1770 100644 --- a/assets/resources/Json/level206.json +++ b/assets/resources/Json/level206.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "206", "map": [ 9, diff --git a/assets/resources/Json/level207.json b/assets/resources/Json/level207.json index 596cd6f..bc45839 100644 --- a/assets/resources/Json/level207.json +++ b/assets/resources/Json/level207.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "207", "map": [ 9, diff --git a/assets/resources/Json/level208.json b/assets/resources/Json/level208.json index cb56ab4..3a49803 100644 --- a/assets/resources/Json/level208.json +++ b/assets/resources/Json/level208.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "208", "map": [ 9, diff --git a/assets/resources/Json/level209.json b/assets/resources/Json/level209.json index 921b72a..ec5f259 100644 --- a/assets/resources/Json/level209.json +++ b/assets/resources/Json/level209.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "209", "map": [ 9, diff --git a/assets/resources/Json/level21.json b/assets/resources/Json/level21.json index 31f8ef9..8daed79 100644 --- a/assets/resources/Json/level21.json +++ b/assets/resources/Json/level21.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "21", "map": [ 10, diff --git a/assets/resources/Json/level210.json b/assets/resources/Json/level210.json index eec2fc2..9c35181 100644 --- a/assets/resources/Json/level210.json +++ b/assets/resources/Json/level210.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "210", "map": [ 9, diff --git a/assets/resources/Json/level211.json b/assets/resources/Json/level211.json index 667173a..0e43428 100644 --- a/assets/resources/Json/level211.json +++ b/assets/resources/Json/level211.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "211", "map": [ 8, diff --git a/assets/resources/Json/level212.json b/assets/resources/Json/level212.json index e25d20d..79a812c 100644 --- a/assets/resources/Json/level212.json +++ b/assets/resources/Json/level212.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "212", "map": [ 10, diff --git a/assets/resources/Json/level213.json b/assets/resources/Json/level213.json index ffdf134..37b12b9 100644 --- a/assets/resources/Json/level213.json +++ b/assets/resources/Json/level213.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "213", "map": [ 8, diff --git a/assets/resources/Json/level214.json b/assets/resources/Json/level214.json index 6a294e1..69f1fad 100644 --- a/assets/resources/Json/level214.json +++ b/assets/resources/Json/level214.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "214", "map": [ 10, diff --git a/assets/resources/Json/level215.json b/assets/resources/Json/level215.json index 4a3c73c..96e788e 100644 --- a/assets/resources/Json/level215.json +++ b/assets/resources/Json/level215.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "215", "map": [ 9, diff --git a/assets/resources/Json/level216.json b/assets/resources/Json/level216.json index c285f5c..8332f4c 100644 --- a/assets/resources/Json/level216.json +++ b/assets/resources/Json/level216.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "216", "map": [ 10, diff --git a/assets/resources/Json/level217.json b/assets/resources/Json/level217.json index 7e8ddc8..704e640 100644 --- a/assets/resources/Json/level217.json +++ b/assets/resources/Json/level217.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "217", "map": [ 10, diff --git a/assets/resources/Json/level218.json b/assets/resources/Json/level218.json index f764204..6f04183 100644 --- a/assets/resources/Json/level218.json +++ b/assets/resources/Json/level218.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "218", "map": [ 11, diff --git a/assets/resources/Json/level219.json b/assets/resources/Json/level219.json index 0b6c5d3..035e765 100644 --- a/assets/resources/Json/level219.json +++ b/assets/resources/Json/level219.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "219", "map": [ 8, diff --git a/assets/resources/Json/level22.json b/assets/resources/Json/level22.json index 26583e7..418bec7 100644 --- a/assets/resources/Json/level22.json +++ b/assets/resources/Json/level22.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "22", "map": [ 8, diff --git a/assets/resources/Json/level220.json b/assets/resources/Json/level220.json index 30d3ede..f96aa8c 100644 --- a/assets/resources/Json/level220.json +++ b/assets/resources/Json/level220.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "220", "map": [ 9, diff --git a/assets/resources/Json/level221.json b/assets/resources/Json/level221.json index f653a46..f5b6abf 100644 --- a/assets/resources/Json/level221.json +++ b/assets/resources/Json/level221.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "221", "map": [ 9, diff --git a/assets/resources/Json/level222.json b/assets/resources/Json/level222.json index 7a3618d..d07234d 100644 --- a/assets/resources/Json/level222.json +++ b/assets/resources/Json/level222.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "222", "map": [ 10, diff --git a/assets/resources/Json/level223.json b/assets/resources/Json/level223.json index c539dbb..eb8ce80 100644 --- a/assets/resources/Json/level223.json +++ b/assets/resources/Json/level223.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "223", "map": [ 10, diff --git a/assets/resources/Json/level224.json b/assets/resources/Json/level224.json index 1eb88e4..7c52f05 100644 --- a/assets/resources/Json/level224.json +++ b/assets/resources/Json/level224.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "224", "map": [ 8, diff --git a/assets/resources/Json/level225.json b/assets/resources/Json/level225.json index 78a9545..7b1517b 100644 --- a/assets/resources/Json/level225.json +++ b/assets/resources/Json/level225.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "225", "map": [ 8, diff --git a/assets/resources/Json/level226.json b/assets/resources/Json/level226.json index 21d9ca4..21364f3 100644 --- a/assets/resources/Json/level226.json +++ b/assets/resources/Json/level226.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "226", "map": [ 9, diff --git a/assets/resources/Json/level227.json b/assets/resources/Json/level227.json index b88b48e..4d4dc21 100644 --- a/assets/resources/Json/level227.json +++ b/assets/resources/Json/level227.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "227", "map": [ 11, diff --git a/assets/resources/Json/level228.json b/assets/resources/Json/level228.json index 5de46eb..27e95d7 100644 --- a/assets/resources/Json/level228.json +++ b/assets/resources/Json/level228.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "229", "map": [ 11, diff --git a/assets/resources/Json/level229.json b/assets/resources/Json/level229.json index 03493fe..97182b4 100644 --- a/assets/resources/Json/level229.json +++ b/assets/resources/Json/level229.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "229", "map": [ 9, diff --git a/assets/resources/Json/level23.json b/assets/resources/Json/level23.json index 913657e..2dd44ca 100644 --- a/assets/resources/Json/level23.json +++ b/assets/resources/Json/level23.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "23", "map": [ 9, @@ -300,7 +301,7 @@ "special": 0, "length": 0 }, - { + { "id": 11, "num": 23, "color": 9, diff --git a/assets/resources/Json/level230.json b/assets/resources/Json/level230.json index 461a224..4f09744 100644 --- a/assets/resources/Json/level230.json +++ b/assets/resources/Json/level230.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "264", "map": [ 11, diff --git a/assets/resources/Json/level231.json b/assets/resources/Json/level231.json index c817071..a2698ba 100644 --- a/assets/resources/Json/level231.json +++ b/assets/resources/Json/level231.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "231", "map": [ 9, diff --git a/assets/resources/Json/level232.json b/assets/resources/Json/level232.json index 644a38d..ca7c6d7 100644 --- a/assets/resources/Json/level232.json +++ b/assets/resources/Json/level232.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "232", "map": [ 8, diff --git a/assets/resources/Json/level234.json b/assets/resources/Json/level234.json index 4257f96..c2f382b 100644 --- a/assets/resources/Json/level234.json +++ b/assets/resources/Json/level234.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "234", "map": [ 10, diff --git a/assets/resources/Json/level235.json b/assets/resources/Json/level235.json index 75443e4..c4d0d63 100644 --- a/assets/resources/Json/level235.json +++ b/assets/resources/Json/level235.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "235", "map": [ 9, diff --git a/assets/resources/Json/level236.json b/assets/resources/Json/level236.json index ca00f41..3c13c6d 100644 --- a/assets/resources/Json/level236.json +++ b/assets/resources/Json/level236.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "236", "map": [ 10, diff --git a/assets/resources/Json/level237.json b/assets/resources/Json/level237.json index b6a4b01..92dd9a4 100644 --- a/assets/resources/Json/level237.json +++ b/assets/resources/Json/level237.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "237", "map": [ 8, diff --git a/assets/resources/Json/level238.json b/assets/resources/Json/level238.json index 69f76e2..014d8c2 100644 --- a/assets/resources/Json/level238.json +++ b/assets/resources/Json/level238.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "238", "map": [ 10, diff --git a/assets/resources/Json/level239.json b/assets/resources/Json/level239.json index 509ee45..8db7d5b 100644 --- a/assets/resources/Json/level239.json +++ b/assets/resources/Json/level239.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "239", "map": [ 7, diff --git a/assets/resources/Json/level24.json b/assets/resources/Json/level24.json index 9b2d1f9..89a14c3 100644 --- a/assets/resources/Json/level24.json +++ b/assets/resources/Json/level24.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "24", "map": [ 7, diff --git a/assets/resources/Json/level240.json b/assets/resources/Json/level240.json index 92f74ea..742a927 100644 --- a/assets/resources/Json/level240.json +++ b/assets/resources/Json/level240.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "240", "map": [ 8, diff --git a/assets/resources/Json/level241.json b/assets/resources/Json/level241.json index 7ce5206..0f55270 100644 --- a/assets/resources/Json/level241.json +++ b/assets/resources/Json/level241.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "241", "map": [ 8, diff --git a/assets/resources/Json/level242.json b/assets/resources/Json/level242.json index 0815479..35629cc 100644 --- a/assets/resources/Json/level242.json +++ b/assets/resources/Json/level242.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "242", "map": [ 9, diff --git a/assets/resources/Json/level243.json b/assets/resources/Json/level243.json index 55c8ba0..1fbc532 100644 --- a/assets/resources/Json/level243.json +++ b/assets/resources/Json/level243.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "243", "map": [ 9, diff --git a/assets/resources/Json/level244.json b/assets/resources/Json/level244.json index a3d9d5e..aef4d34 100644 --- a/assets/resources/Json/level244.json +++ b/assets/resources/Json/level244.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "244", "map": [ 11, diff --git a/assets/resources/Json/level245.json b/assets/resources/Json/level245.json index 04e48e1..ef26cad 100644 --- a/assets/resources/Json/level245.json +++ b/assets/resources/Json/level245.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "245", "map": [ 10, diff --git a/assets/resources/Json/level246.json b/assets/resources/Json/level246.json index f30ab01..d9a980f 100644 --- a/assets/resources/Json/level246.json +++ b/assets/resources/Json/level246.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "246", "map": [ 9, diff --git a/assets/resources/Json/level247.json b/assets/resources/Json/level247.json index 16c97d4..181e14c 100644 --- a/assets/resources/Json/level247.json +++ b/assets/resources/Json/level247.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "247", "map": [ 9, diff --git a/assets/resources/Json/level248.json b/assets/resources/Json/level248.json index 3ac32dd..c9333b8 100644 --- a/assets/resources/Json/level248.json +++ b/assets/resources/Json/level248.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "248", "map": [ 10, diff --git a/assets/resources/Json/level249.json b/assets/resources/Json/level249.json index d3a34ca..347aa92 100644 --- a/assets/resources/Json/level249.json +++ b/assets/resources/Json/level249.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "249", "map": [ 10, diff --git a/assets/resources/Json/level25.json b/assets/resources/Json/level25.json index dac7012..a389100 100644 --- a/assets/resources/Json/level25.json +++ b/assets/resources/Json/level25.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "25", "map": [ 7, diff --git a/assets/resources/Json/level250.json b/assets/resources/Json/level250.json index 297fc33..26217e6 100644 --- a/assets/resources/Json/level250.json +++ b/assets/resources/Json/level250.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "250", "map": [ 10, diff --git a/assets/resources/Json/level26.json b/assets/resources/Json/level26.json index 34860e0..3ef1c04 100644 --- a/assets/resources/Json/level26.json +++ b/assets/resources/Json/level26.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "26", "map": [ 10, diff --git a/assets/resources/Json/level27.json b/assets/resources/Json/level27.json index ad9b837..4b80fea 100644 --- a/assets/resources/Json/level27.json +++ b/assets/resources/Json/level27.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "27", "map": [ 9, diff --git a/assets/resources/Json/level28.json b/assets/resources/Json/level28.json index 8f37c58..cfbd5e3 100644 --- a/assets/resources/Json/level28.json +++ b/assets/resources/Json/level28.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "28", "map": [ 9, diff --git a/assets/resources/Json/level29.json b/assets/resources/Json/level29.json index a7ebe29..23a5974 100644 --- a/assets/resources/Json/level29.json +++ b/assets/resources/Json/level29.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "29", "map": [ 11, diff --git a/assets/resources/Json/level3.json b/assets/resources/Json/level3.json index d5ff457..e725107 100644 --- a/assets/resources/Json/level3.json +++ b/assets/resources/Json/level3.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "3", "map": [ 7, diff --git a/assets/resources/Json/level30.json b/assets/resources/Json/level30.json index 4732c47..a048b92 100644 --- a/assets/resources/Json/level30.json +++ b/assets/resources/Json/level30.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "30", "map": [ 11, @@ -241,7 +242,7 @@ "y": -540, "z": 0 }, - "stacking":8, + "stacking": 8, "id": 410 }, { @@ -253,7 +254,7 @@ "y": -540, "z": 0 }, - "stacking": 6, + "stacking": 6, "id": 420 }, { diff --git a/assets/resources/Json/level31.json b/assets/resources/Json/level31.json index c1f0a1b..d80ec96 100644 --- a/assets/resources/Json/level31.json +++ b/assets/resources/Json/level31.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "31", "map": [ 6, diff --git a/assets/resources/Json/level32.json b/assets/resources/Json/level32.json index 39b79a7..1f1f70b 100644 --- a/assets/resources/Json/level32.json +++ b/assets/resources/Json/level32.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "32", "map": [ 8, diff --git a/assets/resources/Json/level33.json b/assets/resources/Json/level33.json index 7d0b949..3012111 100644 --- a/assets/resources/Json/level33.json +++ b/assets/resources/Json/level33.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "33", "map": [ 9, diff --git a/assets/resources/Json/level34.json b/assets/resources/Json/level34.json index e0aacbc..231530a 100644 --- a/assets/resources/Json/level34.json +++ b/assets/resources/Json/level34.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "34", "map": [ 8, diff --git a/assets/resources/Json/level35.json b/assets/resources/Json/level35.json index fe82f8d..dbc68ff 100644 --- a/assets/resources/Json/level35.json +++ b/assets/resources/Json/level35.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "35", "map": [ 7, diff --git a/assets/resources/Json/level36.json b/assets/resources/Json/level36.json index c547857..e1bd270 100644 --- a/assets/resources/Json/level36.json +++ b/assets/resources/Json/level36.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "36", "map": [ 7, diff --git a/assets/resources/Json/level37.json b/assets/resources/Json/level37.json index 42b5fe4..5a67497 100644 --- a/assets/resources/Json/level37.json +++ b/assets/resources/Json/level37.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "37", "map": [ 9, diff --git a/assets/resources/Json/level38.json b/assets/resources/Json/level38.json index 74d718b..e161f46 100644 --- a/assets/resources/Json/level38.json +++ b/assets/resources/Json/level38.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "38", "map": [ 8, diff --git a/assets/resources/Json/level39.json b/assets/resources/Json/level39.json index 43def74..6560544 100644 --- a/assets/resources/Json/level39.json +++ b/assets/resources/Json/level39.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "39", "map": [ 9, @@ -218,7 +219,7 @@ "y": -360, "z": 0 }, - "stacking": 5, + "stacking": 5, "id": 370 }, { @@ -285,7 +286,7 @@ "y": 240, "z": 0 }, - "stacking": 8, + "stacking": 8, "id": 430 }, { diff --git a/assets/resources/Json/level4.json b/assets/resources/Json/level4.json index d10bdaa..b05db9c 100644 --- a/assets/resources/Json/level4.json +++ b/assets/resources/Json/level4.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "4", "map": [ 7, diff --git a/assets/resources/Json/level40.json b/assets/resources/Json/level40.json index 78fcb5d..4ecbef0 100644 --- a/assets/resources/Json/level40.json +++ b/assets/resources/Json/level40.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "40", "map": [ 10, @@ -72,7 +73,7 @@ "y": 300, "z": 0 }, - "stacking": 3, + "stacking": 3, "id": 210 }, { @@ -84,7 +85,7 @@ "y": 300, "z": 0 }, - "stacking": 8, + "stacking": 8, "id": 220 }, { diff --git a/assets/resources/Json/level41.json b/assets/resources/Json/level41.json index f58f154..dbcbebf 100644 --- a/assets/resources/Json/level41.json +++ b/assets/resources/Json/level41.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "41", "map": [ 10, diff --git a/assets/resources/Json/level42.json b/assets/resources/Json/level42.json index df8260a..1083bec 100644 --- a/assets/resources/Json/level42.json +++ b/assets/resources/Json/level42.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "42", "map": [ 8, diff --git a/assets/resources/Json/level42_1.json b/assets/resources/Json/level42_1.json index df8260a..1083bec 100644 --- a/assets/resources/Json/level42_1.json +++ b/assets/resources/Json/level42_1.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "42", "map": [ 8, diff --git a/assets/resources/Json/level43.json b/assets/resources/Json/level43.json index 102b213..21c2b2d 100644 --- a/assets/resources/Json/level43.json +++ b/assets/resources/Json/level43.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "43", "map": [ 10, diff --git a/assets/resources/Json/level44.json b/assets/resources/Json/level44.json index 60d0e1a..e1c96ef 100644 --- a/assets/resources/Json/level44.json +++ b/assets/resources/Json/level44.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "44", "map": [ 8, diff --git a/assets/resources/Json/level45.json b/assets/resources/Json/level45.json index 1df4850..2c04ba7 100644 --- a/assets/resources/Json/level45.json +++ b/assets/resources/Json/level45.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "45", "map": [ 9, diff --git a/assets/resources/Json/level46.json b/assets/resources/Json/level46.json index a03f9f7..ff944e1 100644 --- a/assets/resources/Json/level46.json +++ b/assets/resources/Json/level46.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "46", "map": [ 11, @@ -607,7 +608,6 @@ "special": 0, "length": 0 } - ] ] } \ No newline at end of file diff --git a/assets/resources/Json/level47.json b/assets/resources/Json/level47.json index f909948..58d3eec 100644 --- a/assets/resources/Json/level47.json +++ b/assets/resources/Json/level47.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "47", "map": [ 6, diff --git a/assets/resources/Json/level48.json b/assets/resources/Json/level48.json index 24abcd6..43b9335 100644 --- a/assets/resources/Json/level48.json +++ b/assets/resources/Json/level48.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "48", "map": [ 11, diff --git a/assets/resources/Json/level49.json b/assets/resources/Json/level49.json index 514ab5d..e93b8db 100644 --- a/assets/resources/Json/level49.json +++ b/assets/resources/Json/level49.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "49", "map": [ 9, diff --git a/assets/resources/Json/level5.json b/assets/resources/Json/level5.json index 5f5811e..36da20d 100644 --- a/assets/resources/Json/level5.json +++ b/assets/resources/Json/level5.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "5", "map": [ 7, diff --git a/assets/resources/Json/level50.json b/assets/resources/Json/level50.json index 20934fa..7bf4d3e 100644 --- a/assets/resources/Json/level50.json +++ b/assets/resources/Json/level50.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "50", "map": [ 8, diff --git a/assets/resources/Json/level51.json b/assets/resources/Json/level51.json index dcc5cb2..e368435 100644 --- a/assets/resources/Json/level51.json +++ b/assets/resources/Json/level51.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "51", "map": [ 11, @@ -425,148 +426,148 @@ } ] ], - "WALL_INFO": [ - [ - { - "id": 52, - "num": 20, - "color": 1, - "special": 0, - "length": 1 - }, - { - "id": 53, - "num": 29, - "color": 5, - "special": 0, - "length": 2 - }, - { - "id": 54, - "num": 30, - "color": 5, - "special": 0, - "length": 0 - }, - { - "id": 55, - "num": 25, - "color": 4, - "special": 0, - "length": 2 - }, - { - "id": 56, - "num": 27, - "color": 4, - "special": 0, - "length": 0 - }, - { - "id": 57, - "num": 26, - "color": 6, - "special": 0, - "length": 2 - }, - { - "id": 58, - "num": 28, - "color": 6, - "special": 0, - "length": 0 - }, - { - "id": 59, - "num": 12, - "color": 2, - "special": 0, - "length": 2 - }, - { - "id": 60, - "num": 14, - "color": 2, - "special": 0, - "length": 0 - }, - { - "id": 61, - "num": 11, - "color": 8, - "special": 0, - "length": 2 - }, - { - "id": 62, - "num": 13, - "color": 8, - "special": 0, - "length": 0 - }, - { - "id": 63, - "num": 0, - "color": 3, - "special": 0, - "length": 2 - }, - { - "id": 64, - "num": 1, - "color": 3, - "special": 0, - "length": 0 - }, - { - "id": 65, - "num": 19, - "color": 10, - "special": 0, - "length": 1 - }, - { - "id": 66, - "num": 4, - "color": 9, - "special": 0, - "length": 3 - }, - { - "id": 67, - "num": 5, - "color": 9, - "special": 0, - "length": 0 - }, - { - "id": 68, - "num": 6, - "color": 9, - "special": 0, - "length": 0 - }, - { - "id": 69, - "num": 34, - "color": 7, - "special": 0, - "length": 3 - }, - { - "id": 70, - "num": 35, - "color": 7, - "special": 0, - "length": 0 - }, - { - "id": 71, - "num": 36, - "color": 7, - "special": 0, - "length": 0 - } + "WALL_INFO": [ + [ + { + "id": 52, + "num": 20, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 53, + "num": 29, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 54, + "num": 30, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 55, + "num": 25, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 56, + "num": 27, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 57, + "num": 26, + "color": 6, + "special": 0, + "length": 2 + }, + { + "id": 58, + "num": 28, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 59, + "num": 12, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 60, + "num": 14, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 61, + "num": 11, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 62, + "num": 13, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 63, + "num": 0, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 64, + "num": 1, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 65, + "num": 19, + "color": 10, + "special": 0, + "length": 1 + }, + { + "id": 66, + "num": 4, + "color": 9, + "special": 0, + "length": 3 + }, + { + "id": 67, + "num": 5, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 68, + "num": 6, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 69, + "num": 34, + "color": 7, + "special": 0, + "length": 3 + }, + { + "id": 70, + "num": 35, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 71, + "num": 36, + "color": 7, + "special": 0, + "length": 0 + } + ] ] - ] } \ No newline at end of file diff --git a/assets/resources/Json/level52.json b/assets/resources/Json/level52.json index 5f3c39b..1fc4127 100644 --- a/assets/resources/Json/level52.json +++ b/assets/resources/Json/level52.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "52", "map": [ 6, diff --git a/assets/resources/Json/level53.json b/assets/resources/Json/level53.json index 33f5067..0e6ca8e 100644 --- a/assets/resources/Json/level53.json +++ b/assets/resources/Json/level53.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "53", "map": [ 7, diff --git a/assets/resources/Json/level55.json b/assets/resources/Json/level55.json index cb87243..ed3b2ad 100644 --- a/assets/resources/Json/level55.json +++ b/assets/resources/Json/level55.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "55", "map": [ 9, diff --git a/assets/resources/Json/level56.json b/assets/resources/Json/level56.json index 122e16d..14d4bc3 100644 --- a/assets/resources/Json/level56.json +++ b/assets/resources/Json/level56.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "56", "map": [ 8, diff --git a/assets/resources/Json/level57.json b/assets/resources/Json/level57.json index c3441a9..18a2de4 100644 --- a/assets/resources/Json/level57.json +++ b/assets/resources/Json/level57.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "57", "map": [ 8, diff --git a/assets/resources/Json/level58.json b/assets/resources/Json/level58.json index cbaaa8b..1463138 100644 --- a/assets/resources/Json/level58.json +++ b/assets/resources/Json/level58.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "58", "map": [ 10, diff --git a/assets/resources/Json/level59.json b/assets/resources/Json/level59.json index 13b0511..fb99ab4 100644 --- a/assets/resources/Json/level59.json +++ b/assets/resources/Json/level59.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "59", "map": [ 10, diff --git a/assets/resources/Json/level6.json b/assets/resources/Json/level6.json index bb119a2..79ab8a0 100644 --- a/assets/resources/Json/level6.json +++ b/assets/resources/Json/level6.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "6", "map": [ 8, diff --git a/assets/resources/Json/level60.json b/assets/resources/Json/level60.json index e7103fa..21ce44e 100644 --- a/assets/resources/Json/level60.json +++ b/assets/resources/Json/level60.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "60", "map": [ 6, diff --git a/assets/resources/Json/level61.json b/assets/resources/Json/level61.json index 0b72dcf..36f8479 100644 --- a/assets/resources/Json/level61.json +++ b/assets/resources/Json/level61.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "61", "map": [ 7, diff --git a/assets/resources/Json/level62.json b/assets/resources/Json/level62.json index a4bb149..c9176a1 100644 --- a/assets/resources/Json/level62.json +++ b/assets/resources/Json/level62.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "62", "map": [ 10, diff --git a/assets/resources/Json/level63.json b/assets/resources/Json/level63.json index 0ce20a0..1a68532 100644 --- a/assets/resources/Json/level63.json +++ b/assets/resources/Json/level63.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "63", "map": [ 6, diff --git a/assets/resources/Json/level64.json b/assets/resources/Json/level64.json index 0a1df6b..56f7513 100644 --- a/assets/resources/Json/level64.json +++ b/assets/resources/Json/level64.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "64", "map": [ 8, diff --git a/assets/resources/Json/level65.json b/assets/resources/Json/level65.json index 00ebbb5..6651cac 100644 --- a/assets/resources/Json/level65.json +++ b/assets/resources/Json/level65.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "65", "map": [ 7, @@ -255,4 +256,4 @@ } ] ] -} +} \ No newline at end of file diff --git a/assets/resources/Json/level66.json b/assets/resources/Json/level66.json index c79cb12..26b26cd 100644 --- a/assets/resources/Json/level66.json +++ b/assets/resources/Json/level66.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "66", "map": [ 10, @@ -315,4 +316,4 @@ } ] ] -} +} \ No newline at end of file diff --git a/assets/resources/Json/level67.json b/assets/resources/Json/level67.json index 16baa2d..45fc21f 100644 --- a/assets/resources/Json/level67.json +++ b/assets/resources/Json/level67.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "67", "map": [ 6, diff --git a/assets/resources/Json/level68.json b/assets/resources/Json/level68.json index 112e500..f2a2fef 100644 --- a/assets/resources/Json/level68.json +++ b/assets/resources/Json/level68.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "68", "map": [ 11, @@ -496,7 +497,6 @@ "special": 0, "length": 0 }, - { "id": 7, "num": 16, diff --git a/assets/resources/Json/level69.json b/assets/resources/Json/level69.json index 5665408..a9f8870 100644 --- a/assets/resources/Json/level69.json +++ b/assets/resources/Json/level69.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "69", "map": [ 10, diff --git a/assets/resources/Json/level7.json b/assets/resources/Json/level7.json index fdf3f90..a0a57e9 100644 --- a/assets/resources/Json/level7.json +++ b/assets/resources/Json/level7.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "7", "map": [ 7, diff --git a/assets/resources/Json/level70.json b/assets/resources/Json/level70.json index 0457584..874561a 100644 --- a/assets/resources/Json/level70.json +++ b/assets/resources/Json/level70.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "69", "map": [ 7, diff --git a/assets/resources/Json/level71.json b/assets/resources/Json/level71.json index 4514396..3a243b4 100644 --- a/assets/resources/Json/level71.json +++ b/assets/resources/Json/level71.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "71", "map": [ 9, diff --git a/assets/resources/Json/level72.json b/assets/resources/Json/level72.json index 9725c1e..c604333 100644 --- a/assets/resources/Json/level72.json +++ b/assets/resources/Json/level72.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "72", "map": [ 7, diff --git a/assets/resources/Json/level73.json b/assets/resources/Json/level73.json index c0e18fd..54daf87 100644 --- a/assets/resources/Json/level73.json +++ b/assets/resources/Json/level73.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "73", "map": [ 6, diff --git a/assets/resources/Json/level74.json b/assets/resources/Json/level74.json index 8a143f3..9c03f31 100644 --- a/assets/resources/Json/level74.json +++ b/assets/resources/Json/level74.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "74", "map": [ 8, diff --git a/assets/resources/Json/level75.json b/assets/resources/Json/level75.json index 1906949..25a6087 100644 --- a/assets/resources/Json/level75.json +++ b/assets/resources/Json/level75.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "75", "map": [ 9, diff --git a/assets/resources/Json/level76.json b/assets/resources/Json/level76.json index 8148b65..aaf08b9 100644 --- a/assets/resources/Json/level76.json +++ b/assets/resources/Json/level76.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "76", "map": [ 7, diff --git a/assets/resources/Json/level77.json b/assets/resources/Json/level77.json index 8cd3481..cba5fd3 100644 --- a/assets/resources/Json/level77.json +++ b/assets/resources/Json/level77.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "77", "map": [ 10, diff --git a/assets/resources/Json/level78.json b/assets/resources/Json/level78.json index e3f4615..78c6528 100644 --- a/assets/resources/Json/level78.json +++ b/assets/resources/Json/level78.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "78", "map": [ 9, diff --git a/assets/resources/Json/level79.json b/assets/resources/Json/level79.json index d877692..55e24ff 100644 --- a/assets/resources/Json/level79.json +++ b/assets/resources/Json/level79.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "79", "map": [ 10, diff --git a/assets/resources/Json/level8.json b/assets/resources/Json/level8.json index 52aafd1..1d28060 100644 --- a/assets/resources/Json/level8.json +++ b/assets/resources/Json/level8.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "8", "map": [ 7, diff --git a/assets/resources/Json/level80.json b/assets/resources/Json/level80.json index 935e112..d813383 100644 --- a/assets/resources/Json/level80.json +++ b/assets/resources/Json/level80.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "80", "map": [ 8, diff --git a/assets/resources/Json/level81.json b/assets/resources/Json/level81.json index 84ac710..c01e68d 100644 --- a/assets/resources/Json/level81.json +++ b/assets/resources/Json/level81.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "81", "map": [ 9, diff --git a/assets/resources/Json/level82.json b/assets/resources/Json/level82.json index 9aa94c7..11ad894 100644 --- a/assets/resources/Json/level82.json +++ b/assets/resources/Json/level82.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "82", "map": [ 11, diff --git a/assets/resources/Json/level83.json b/assets/resources/Json/level83.json index 7aa3b23..684998a 100644 --- a/assets/resources/Json/level83.json +++ b/assets/resources/Json/level83.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "83", "map": [ 10, diff --git a/assets/resources/Json/level84.json b/assets/resources/Json/level84.json index 4f38251..addd84a 100644 --- a/assets/resources/Json/level84.json +++ b/assets/resources/Json/level84.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "84", "map": [ 11, diff --git a/assets/resources/Json/level85.json b/assets/resources/Json/level85.json index 0504eb4..f799ee1 100644 --- a/assets/resources/Json/level85.json +++ b/assets/resources/Json/level85.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "86", "map": [ 8, diff --git a/assets/resources/Json/level86.json b/assets/resources/Json/level86.json index fb14956..cc6bd05 100644 --- a/assets/resources/Json/level86.json +++ b/assets/resources/Json/level86.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "86", "map": [ 9, diff --git a/assets/resources/Json/level87.json b/assets/resources/Json/level87.json index 116ea09..194c019 100644 --- a/assets/resources/Json/level87.json +++ b/assets/resources/Json/level87.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "87", "map": [ 9, diff --git a/assets/resources/Json/level88.json b/assets/resources/Json/level88.json index ddfea3e..cc7112b 100644 --- a/assets/resources/Json/level88.json +++ b/assets/resources/Json/level88.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "88", "map": [ 10, diff --git a/assets/resources/Json/level89.json b/assets/resources/Json/level89.json index 3a5a31b..2f19866 100644 --- a/assets/resources/Json/level89.json +++ b/assets/resources/Json/level89.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "89", "map": [ 8, diff --git a/assets/resources/Json/level9.json b/assets/resources/Json/level9.json index 1a8e800..9322fbf 100644 --- a/assets/resources/Json/level9.json +++ b/assets/resources/Json/level9.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "9", "map": [ 8, diff --git a/assets/resources/Json/level90.json b/assets/resources/Json/level90.json index 5bc7f2e..4423cae 100644 --- a/assets/resources/Json/level90.json +++ b/assets/resources/Json/level90.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "90", "map": [ 9, diff --git a/assets/resources/Json/level91.json b/assets/resources/Json/level91.json index 7743369..f6c970d 100644 --- a/assets/resources/Json/level91.json +++ b/assets/resources/Json/level91.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "91", "map": [ 9, diff --git a/assets/resources/Json/level92.json b/assets/resources/Json/level92.json index e4dc1d2..3dfb786 100644 --- a/assets/resources/Json/level92.json +++ b/assets/resources/Json/level92.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "92", "map": [ 7, diff --git a/assets/resources/Json/level93.json b/assets/resources/Json/level93.json index 17df216..3897ed1 100644 --- a/assets/resources/Json/level93.json +++ b/assets/resources/Json/level93.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "93", "map": [ 7, diff --git a/assets/resources/Json/level94.json b/assets/resources/Json/level94.json index 88ea30f..0ba6e9a 100644 --- a/assets/resources/Json/level94.json +++ b/assets/resources/Json/level94.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "94", "map": [ 8, diff --git a/assets/resources/Json/level95.json b/assets/resources/Json/level95.json index 79d77d4..8e7153a 100644 --- a/assets/resources/Json/level95.json +++ b/assets/resources/Json/level95.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "95", "map": [ 10, diff --git a/assets/resources/Json/level96.json b/assets/resources/Json/level96.json index 0c6c2ce..c0aea80 100644 --- a/assets/resources/Json/level96.json +++ b/assets/resources/Json/level96.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "96", "map": [ 7, diff --git a/assets/resources/Json/level97.json b/assets/resources/Json/level97.json index 373adb7..f1c8ce9 100644 --- a/assets/resources/Json/level97.json +++ b/assets/resources/Json/level97.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "97", "map": [ 8, diff --git a/assets/resources/Json/level97_1.json b/assets/resources/Json/level97_1.json deleted file mode 100644 index 720823e..0000000 --- a/assets/resources/Json/level97_1.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "LEVEL_INFO": [ - { - "id": "97", - "map": [ - 8, - 8 - ], - "time": 275, - "gap": [] - } - ], - "BLOCK_INFO": [ - [ - { - "block": 0, - "color": 2, - "type": 0, - "position": { - "x": -240, - "y": 120, - "z": 0 - }, - "id": 210 - }, - { - "block": 1, - "color": 2, - "type": 0, - "position": { - "x": 360, - "y": 0, - "z": 0 - }, - "id": 220, - "adhesive":1 - }, - { - "block": 1, - "color": 7, - "type": 0, - "position": { - "x": -120, - "y": 0, - "z": 0 - }, - "id": 240 - }, - { - "block": 0, - "color": 3, - "type": 0, - "position": { - "x": 240, - "y": -120, - "z": 0 - }, - "id": 260 - }, - { - "block": 22, - "color": 7, - "type": 0, - "position": { - "x": -120, - "y": 120, - "z": 0 - }, - "id": 230, - "adhesive":1 - }, - { - "block": 21, - "color": 3, - "type": 9, - "position": { - "x": 240, - "y": 120, - "z": 0 - }, - "id": 250, - "adhesive":1 - }, - { - "block": 0, - "color": 1, - "type": 9, - "position": { - "x": 360, - "y": 120, - "z": 0 - }, - "id": 270 - }, - { - "block": 2, - "color": 10, - "type": 0, - "position": { - "x": -240, - "y": -360, - "z": 0 - }, - "id": 280 - }, - { - "block": 2, - "color": 1, - "type": 0, - "position": { - "x": 360, - "y": -360, - "z": 0 - }, - "id": 290 - }, - { - "block": 1, - "color": 8, - "type": 0, - "position": { - "x": 120, - "y": 120, - "z": 0 - }, - "id": 300 - }, - { - "block": 0, - "color": 8, - "type": 0, - "position": { - "x": -120, - "y": -120, - "z": 0 - }, - "id": 310 - }, - { - "block": 0, - "color": 8, - "type": 0, - "position": { - "x": 240, - "y": -240, - "z": 0 - }, - "id": 320 - }, - { - "block": 5, - "color": 6, - "type": 0, - "position": { - "x": 120, - "y": -240, - "z": 0 - }, - "id": 330 - }, - { - "block": 0, - "color": 6, - "type": 0, - "position": { - "x": -120, - "y": -240, - "z": 0 - }, - "id": 340 - } - ] - ], - "WALL_INFO": [ - [ - { - "id": 1, - "num": 7, - "color": 1, - "special": 2, - "length": 2, - "lock": false - }, - { - "id": 2, - "num": 7, - "color": 6, - "special": 2, - "length": 2, - "lock": false - }, - { - "id": 3, - "num": 9, - "color": 6, - "special": 2, - "length": 0, - "lock": false - }, - { - "id": 4, - "num": 15, - "color": 8, - "special": 2, - "length": 2, - "lock": false - }, - { - "id": 5, - "num": 17, - "color": 8, - "special": 2, - "length": 0, - "lock": false - }, - { - "id": 6, - "num": 11, - "color": 2, - "special": 0, - "length": 2 - }, - { - "id": 7, - "num": 13, - "color": 2, - "special": 0, - "length": 0 - }, - { - "id": 8, - "num": 21, - "color": 7, - "special": 0, - "length": 2 - }, - { - "id": 9, - "num": 20, - "color": 7, - "special": 0, - "length": 0 - }, - { - "id": 10, - "num": 2, - "color": 3, - "special": 0, - "length": 2 - }, - { - "id": 11, - "num": 3, - "color": 3, - "special": 0, - "length": 0 - }, - { - "id": 12, - "num": 6, - "color": 1, - "special": 0, - "length": 2 - }, - { - "id": 13, - "num": 8, - "color": 1, - "special": 0, - "length": 0 - }, - { - "id": 14, - "num": 14, - "color": 10, - "special": 0, - "length": 2 - }, - { - "id": 15, - "num": 16, - "color": 10, - "special": 0, - "length": 0 - } - ] - ] -} \ No newline at end of file diff --git a/assets/resources/Json/level97_1.json.meta b/assets/resources/Json/level97_1.json.meta deleted file mode 100644 index cec509d..0000000 --- a/assets/resources/Json/level97_1.json.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ver": "1.0.2", - "uuid": "613e8900-5acd-4d64-af09-04e3a3bcd4b1", - "importer": "json", - "subMetas": {} -} \ No newline at end of file diff --git a/assets/resources/Json/level98.json b/assets/resources/Json/level98.json index 00f8bb0..42452be 100644 --- a/assets/resources/Json/level98.json +++ b/assets/resources/Json/level98.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "98", "map": [ 9, diff --git a/assets/resources/Json/level99.json b/assets/resources/Json/level99.json index 174945f..95f7f9e 100644 --- a/assets/resources/Json/level99.json +++ b/assets/resources/Json/level99.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "99", "map": [ 10, diff --git a/assets/resources/level51.json b/assets/resources/level51.json index dcc5cb2..e368435 100644 --- a/assets/resources/level51.json +++ b/assets/resources/level51.json @@ -1,6 +1,7 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "51", "map": [ 11, @@ -425,148 +426,148 @@ } ] ], - "WALL_INFO": [ - [ - { - "id": 52, - "num": 20, - "color": 1, - "special": 0, - "length": 1 - }, - { - "id": 53, - "num": 29, - "color": 5, - "special": 0, - "length": 2 - }, - { - "id": 54, - "num": 30, - "color": 5, - "special": 0, - "length": 0 - }, - { - "id": 55, - "num": 25, - "color": 4, - "special": 0, - "length": 2 - }, - { - "id": 56, - "num": 27, - "color": 4, - "special": 0, - "length": 0 - }, - { - "id": 57, - "num": 26, - "color": 6, - "special": 0, - "length": 2 - }, - { - "id": 58, - "num": 28, - "color": 6, - "special": 0, - "length": 0 - }, - { - "id": 59, - "num": 12, - "color": 2, - "special": 0, - "length": 2 - }, - { - "id": 60, - "num": 14, - "color": 2, - "special": 0, - "length": 0 - }, - { - "id": 61, - "num": 11, - "color": 8, - "special": 0, - "length": 2 - }, - { - "id": 62, - "num": 13, - "color": 8, - "special": 0, - "length": 0 - }, - { - "id": 63, - "num": 0, - "color": 3, - "special": 0, - "length": 2 - }, - { - "id": 64, - "num": 1, - "color": 3, - "special": 0, - "length": 0 - }, - { - "id": 65, - "num": 19, - "color": 10, - "special": 0, - "length": 1 - }, - { - "id": 66, - "num": 4, - "color": 9, - "special": 0, - "length": 3 - }, - { - "id": 67, - "num": 5, - "color": 9, - "special": 0, - "length": 0 - }, - { - "id": 68, - "num": 6, - "color": 9, - "special": 0, - "length": 0 - }, - { - "id": 69, - "num": 34, - "color": 7, - "special": 0, - "length": 3 - }, - { - "id": 70, - "num": 35, - "color": 7, - "special": 0, - "length": 0 - }, - { - "id": 71, - "num": 36, - "color": 7, - "special": 0, - "length": 0 - } + "WALL_INFO": [ + [ + { + "id": 52, + "num": 20, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 53, + "num": 29, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 54, + "num": 30, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 55, + "num": 25, + "color": 4, + "special": 0, + "length": 2 + }, + { + "id": 56, + "num": 27, + "color": 4, + "special": 0, + "length": 0 + }, + { + "id": 57, + "num": 26, + "color": 6, + "special": 0, + "length": 2 + }, + { + "id": 58, + "num": 28, + "color": 6, + "special": 0, + "length": 0 + }, + { + "id": 59, + "num": 12, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 60, + "num": 14, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 61, + "num": 11, + "color": 8, + "special": 0, + "length": 2 + }, + { + "id": 62, + "num": 13, + "color": 8, + "special": 0, + "length": 0 + }, + { + "id": 63, + "num": 0, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 64, + "num": 1, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 65, + "num": 19, + "color": 10, + "special": 0, + "length": 1 + }, + { + "id": 66, + "num": 4, + "color": 9, + "special": 0, + "length": 3 + }, + { + "id": 67, + "num": 5, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 68, + "num": 6, + "color": 9, + "special": 0, + "length": 0 + }, + { + "id": 69, + "num": 34, + "color": 7, + "special": 0, + "length": 3 + }, + { + "id": 70, + "num": 35, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 71, + "num": 36, + "color": 7, + "special": 0, + "length": 0 + } + ] ] - ] } \ No newline at end of file diff --git a/assets/shop/prefab/shop.prefab b/assets/shop/prefab/shop.prefab index d4d6937..97d1ef3 100644 --- a/assets/shop/prefab/shop.prefab +++ b/assets/shop/prefab/shop.prefab @@ -437,7 +437,7 @@ "ctor": "Float64Array", "array": [ 0, - -290, + -443.25800000000004, 0, 0, 0, @@ -765,7 +765,7 @@ "ctor": "Float64Array", "array": [ 0, - 660, + 900, 0, 0, 0, @@ -821,7 +821,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1500 + "height": 2000 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -833,7 +833,7 @@ "ctor": "Float64Array", "array": [ 0, - 40.697, + -73.284, 0, 0, 0, @@ -10517,7 +10517,7 @@ "_alignFlags": 1, "_left": 0, "_right": 0, - "_top": 500, + "_top": 653.258, "_bottom": 0, "_verticalCenter": 0, "_horizontalCenter": 0, diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index af50017..2b457de 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -37,6 +37,7 @@ export default class NewClass extends cc.Component { private iosPrice: number = 0; private iosProductId: string = ""; private iosCount: number = 1; + scheduleCallback3: any; onLoad() { @@ -60,6 +61,11 @@ export default class NewClass extends cc.Component { init() { this.btn_Touch = true; + var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); + // 同步显示 + if (this.Stamina && this.Stamina.getChildByName("time")) { + this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp; + } } //打开商店界面 openShop() { @@ -270,7 +276,7 @@ export default class NewClass extends cc.Component { } startTimeCutDown() { - this.scheduleCallback = function () { + this.scheduleCallback3 = function () { if (this.pause) return; if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) { this.stopTimeCutDown(); @@ -286,7 +292,9 @@ export default class NewClass extends cc.Component { }) } else { - cc.fx.GameConfig.GM_INFO.min_Time -= 1; + if (this.node.parent.getComponent("JiaZai")) { + } + else cc.fx.GameConfig.GM_INFO.min_Time -= 1; var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); // 同步显示 if (this.Stamina && this.Stamina.getChildByName("time")) { @@ -294,13 +302,13 @@ export default class NewClass extends cc.Component { } } }.bind(this); - this.schedule(this.scheduleCallback, 1); + this.schedule(this.scheduleCallback3, 1); } // 停止倒计时 stopTimeCutDown() { - if (this.scheduleCallback) { - this.unschedule(this.scheduleCallback); + if (this.scheduleCallback3) { + this.unschedule(this.scheduleCallback3); } } @@ -376,17 +384,9 @@ export default class NewClass extends cc.Component { }); } else { - const data = { - outTradeNo: Utils.outTradeNo, - price: price, - payment_name: productId, - payment_num: 1, - type: systemType, - } - cc.fx.GameTool.shushu_Track("init_order", data); this.openLoad(); //console.log("7.14_____________________", "调用充值接口"); - Utils.buyProp(id, count, price, (res) => { + Utils.buyProp(id, count, price, systemType, productId, (res) => { //console.log("获得充值结果", res); if (res == null) { MiniGameSdk.API.showToast("充值失败"); @@ -453,12 +453,12 @@ export default class NewClass extends cc.Component { cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name) - //console.log("7.14_______________充值成功，轮训成功，准备发货"); + console.log("7.14_______________充值成功，轮训成功，准备发货"); Utils.setPayInfo( (res) => { - //console.log("设置轮训结果:", res); + console.log("设置轮训结果:", res); if (res.code === 1) { - //console.log("7.14_________正式发货"); + console.log("7.14_________正式发货"); MiniGameSdk.API.showToast("充值成功"); cc.fx.GameTool.shopBuy(productId); //console.log("充值成功获得金币"); @@ -481,7 +481,7 @@ export default class NewClass extends cc.Component { else if (this.node.parent.getComponent("SceneManager")) { this.node.parent.getComponent("SceneManager").updateCoin(); } - }, null) + }, Utils.outTradeNo) } else { NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true);