diff --git a/project/floors/CETAI.js b/project/floors/CETAI.js index 8e08be1..6af71f4 100644 --- a/project/floors/CETAI.js +++ b/project/floors/CETAI.js @@ -671,7 +671,7 @@ main.floors.CETAI= "2,6": { "floorId": "MT9", "loc": [ - 11, + 12, 4 ], "time": 200 diff --git a/project/floors/MT1.js b/project/floors/MT1.js index dbf3e64..945be93 100644 --- a/project/floors/MT1.js +++ b/project/floors/MT1.js @@ -13,13 +13,13 @@ main.floors.MT1= "12,3": [ { "type": "if", - "condition": "flag:271==1", + "condition": "(flag:271==1)", "true": [ { "type": "changeFloor", "floorId": "shenhai", "loc": [ - 8, + 7, 11 ], "time": 0 diff --git a/project/floors/MT25.js b/project/floors/MT25.js index 425faea..021b594 100644 --- a/project/floors/MT25.js +++ b/project/floors/MT25.js @@ -2851,7 +2851,7 @@ main.floors.MT25= "floorId": "xietu", "loc": [ 7, - 10 + 11 ], "direction": "up" } diff --git a/project/floors/MT36.js b/project/floors/MT36.js index a49d731..2f93f02 100644 --- a/project/floors/MT36.js +++ b/project/floors/MT36.js @@ -48,7 +48,7 @@ main.floors.MT36= "floorId": "xuetan", "loc": [ 7, - 8 + 9 ] } }, diff --git a/project/floors/PIANTOU1.js b/project/floors/PIANTOU1.js index b26d902..91ff21c 100644 --- a/project/floors/PIANTOU1.js +++ b/project/floors/PIANTOU1.js @@ -33,7 +33,7 @@ main.floors.PIANTOU1= "type": "animate", "name": "dazhaofadong", "loc": [ - 6, + 7, 7 ] }, @@ -44,7 +44,7 @@ main.floors.PIANTOU1= { "type": "changePos", "loc": [ - 6, + 7, -1 ] }, @@ -52,7 +52,7 @@ main.floors.PIANTOU1= "type": "animate", "name": "shijian", "loc": [ - 6, + 7, 7 ], "async": true @@ -118,7 +118,7 @@ main.floors.PIANTOU1= { "type": "move", "loc": [ - 6, + 7, 7 ], "time": 500, diff --git a/project/floors/PIANTOU10.js b/project/floors/PIANTOU10.js index c9e0571..7e05c42 100644 --- a/project/floors/PIANTOU10.js +++ b/project/floors/PIANTOU10.js @@ -64,7 +64,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 5, + 6, 5 ] ] @@ -108,7 +108,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 7, + 8, 5 ] ] @@ -152,7 +152,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 6, + 7, 6 ] ] @@ -196,7 +196,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 4, + 5, 6 ] ] @@ -205,7 +205,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 8, + 9, 6 ] ] @@ -245,15 +245,6 @@ main.floors.PIANTOU10= "time": 500, "keep": true }, - { - "type": "show", - "loc": [ - [ - 9, - 7 - ] - ] - }, { "type": "show", "loc": [ @@ -276,8 +267,8 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 9, - 8 + 12, + 7 ] ] }, @@ -303,8 +294,8 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 9, - 9 + 12, + 8 ] ] }, @@ -326,6 +317,15 @@ main.floors.PIANTOU10= ] ] }, + { + "type": "show", + "loc": [ + [ + 12, + 9 + ] + ] + }, { "type": "setCurtain", "time": 500 @@ -365,7 +365,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 3, + 4, 7 ] ] @@ -409,7 +409,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 12, + 13, 9 ] ] @@ -453,7 +453,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 2, + 3, 8 ] ] @@ -497,7 +497,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 8, + 9, 7 ] ] @@ -506,7 +506,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 8, + 9, 8 ] ] @@ -515,7 +515,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 8, + 9, 9 ] ] @@ -570,7 +570,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 3, + 4, 8 ] ] @@ -579,7 +579,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 4, + 5, 8 ] ] @@ -634,7 +634,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 12, + 13, 7 ] ] @@ -643,7 +643,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 12, + 13, 8 ] ] @@ -698,7 +698,7 @@ main.floors.PIANTOU10= "type": "show", "loc": [ [ - 3, + 4, 9 ] ] @@ -742,7 +742,7 @@ main.floors.PIANTOU10= "type": "changeFloor", "floorId": "PIANTOU11", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -750,7 +750,7 @@ main.floors.PIANTOU10= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/PIANTOU11.js b/project/floors/PIANTOU11.js index 023385f..709a000 100644 --- a/project/floors/PIANTOU11.js +++ b/project/floors/PIANTOU11.js @@ -90,7 +90,7 @@ main.floors.PIANTOU11= "type": "changeFloor", "floorId": "nandu", "loc": [ - -1, + 0, 11 ], "direction": "up", @@ -104,7 +104,7 @@ main.floors.PIANTOU11= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/PIANTOU2.js b/project/floors/PIANTOU2.js index 9291b80..6f0c76d 100644 --- a/project/floors/PIANTOU2.js +++ b/project/floors/PIANTOU2.js @@ -44,7 +44,7 @@ main.floors.PIANTOU2= { "type": "changePos", "loc": [ - 8, + 9, 11 ], "direction": "left" @@ -67,7 +67,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "jian", "loc": [ - 5, + 6, 11 ] }, @@ -75,7 +75,7 @@ main.floors.PIANTOU2= "type": "hide", "loc": [ [ - 5, + 6, 11 ] ], @@ -84,7 +84,7 @@ main.floors.PIANTOU2= { "type": "jumpHero", "loc": [ - 1, + 2, 9 ], "time": 1000 @@ -93,7 +93,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "jian", "loc": [ - 2, + 3, 10 ] }, @@ -101,7 +101,7 @@ main.floors.PIANTOU2= "type": "hide", "loc": [ [ - 2, + 3, 10 ] ], @@ -121,7 +121,7 @@ main.floors.PIANTOU2= { "type": "jumpHero", "loc": [ - 4, + 5, 5 ], "time": 500 @@ -130,7 +130,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "jian", "loc": [ - 4, + 5, 8 ] }, @@ -138,7 +138,7 @@ main.floors.PIANTOU2= "type": "hide", "loc": [ [ - 4, + 5, 8 ] ], @@ -161,7 +161,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "dazhaofadong", "loc": [ - 8, + 9, 5 ] }, @@ -169,7 +169,7 @@ main.floors.PIANTOU2= "type": "hide", "loc": [ [ - 8, + 9, 5 ] ], @@ -179,14 +179,14 @@ main.floors.PIANTOU2= "type": "animate", "name": "wangyangtiao", "loc": [ - 8, + 9, 5 ] }, { "type": "changePos", "loc": [ - -1, + 0, 5 ], "direction": "left" @@ -195,7 +195,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "shaohutiaoyou", "loc": [ - 4, + 5, 5 ] }, @@ -207,7 +207,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "fengmuxuantian", "loc": [ - 6, + 7, 5 ] }, @@ -215,14 +215,14 @@ main.floors.PIANTOU2= "type": "animate", "name": "shaohutiaohuiyou", "loc": [ - 3, + 4, 5 ] }, { "type": "changePos", "loc": [ - 3, + 4, 5 ], "direction": "right" @@ -231,7 +231,7 @@ main.floors.PIANTOU2= "type": "animate", "name": "wangyangtiaohui", "loc": [ - 9, + 10, 5 ] }, @@ -239,7 +239,7 @@ main.floors.PIANTOU2= "type": "show", "loc": [ [ - 9, + 10, 5 ] ], @@ -273,7 +273,7 @@ main.floors.PIANTOU2= { "type": "openDoor", "loc": [ - 8, + 9, 8 ] }, @@ -289,7 +289,7 @@ main.floors.PIANTOU2= "type": "changeFloor", "floorId": "PIANTOU3", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -297,7 +297,7 @@ main.floors.PIANTOU2= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/PIANTOU3.js b/project/floors/PIANTOU3.js index 35bedb1..c2eac08 100644 --- a/project/floors/PIANTOU3.js +++ b/project/floors/PIANTOU3.js @@ -21,7 +21,7 @@ main.floors.PIANTOU3= { "type": "move", "loc": [ - 6, + 7, 9 ], "time": 500, @@ -35,7 +35,7 @@ main.floors.PIANTOU3= { "type": "changePos", "loc": [ - 6, + 7, 9 ], "direction": "up" @@ -43,7 +43,7 @@ main.floors.PIANTOU3= { "type": "jumpHero", "loc": [ - 6, + 7, 5 ], "time": 1000 @@ -109,7 +109,7 @@ main.floors.PIANTOU3= { "type": "jumpHero", "loc": [ - 8, + 9, 6 ], "time": 1000, @@ -139,7 +139,7 @@ main.floors.PIANTOU3= { "type": "jumpHero", "loc": [ - 4, + 5, 2 ], "time": 1000, @@ -169,7 +169,7 @@ main.floors.PIANTOU3= { "type": "move", "loc": [ - 8, + 9, 2 ], "time": 500, @@ -208,7 +208,7 @@ main.floors.PIANTOU3= { "type": "jumpHero", "loc": [ - 8, + 9, 10 ], "time": 1000, @@ -238,7 +238,7 @@ main.floors.PIANTOU3= { "type": "jumpHero", "loc": [ - 9, + 10, 9 ], "time": 500 @@ -281,7 +281,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 7, + 8, 6 ] }, @@ -289,7 +289,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 4, + 5, 5 ] }, @@ -297,7 +297,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 8, + 9, 9 ] }, @@ -305,7 +305,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 1, + 2, 2 ] }, @@ -313,7 +313,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 2, + 3, 9 ] }, @@ -321,31 +321,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 12, - 7 - ] - }, - { - "type": "animate", - "name": "jiaochajian", - "loc": [ - 1, - 4 - ] - }, - { - "type": "animate", - "name": "jiaochajian", - "loc": [ - 9, - 10 - ] - }, - { - "type": "animate", - "name": "jiaochajian", - "loc": [ - 4, + 13, 7 ] }, @@ -361,16 +337,16 @@ main.floors.PIANTOU3= "type": "animate", "name": "jiaochajian", "loc": [ - 9, - 1 + 10, + 10 ] }, { "type": "animate", "name": "jiaochajian", "loc": [ - 4, - 12 + 5, + 7 ] }, { @@ -378,6 +354,30 @@ main.floors.PIANTOU3= "name": "jiaochajian", "loc": [ 3, + 4 + ] + }, + { + "type": "animate", + "name": "jiaochajian", + "loc": [ + 10, + 1 + ] + }, + { + "type": "animate", + "name": "jiaochajian", + "loc": [ + 5, + 12 + ] + }, + { + "type": "animate", + "name": "jiaochajian", + "loc": [ + 4, 7 ] }, @@ -385,7 +385,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "wangyangtiaohui", "loc": [ - 6, + 7, 5 ] }, @@ -393,7 +393,7 @@ main.floors.PIANTOU3= "type": "setBlock", "number": 301, "loc": [ - 6, + 7, 5 ] }, @@ -401,14 +401,14 @@ main.floors.PIANTOU3= "type": "animate", "name": "shaohutiaohuishang", "loc": [ - 6, + 7, 7 ] }, { "type": "changePos", "loc": [ - 6, + 7, 7 ], "direction": "up" @@ -428,7 +428,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "hainazhijian", "loc": [ - 6, + 7, 6 ] }, @@ -436,7 +436,7 @@ main.floors.PIANTOU3= "type": "animate", "name": "youpenxue", "loc": [ - 6, + 7, 5 ] }, @@ -459,7 +459,7 @@ main.floors.PIANTOU3= "type": "hide", "loc": [ [ - 6, + 7, 5 ] ], @@ -491,7 +491,7 @@ main.floors.PIANTOU3= "type": "changeFloor", "floorId": "PIANTOU4", "loc": [ - 6, + 7, 8 ], "time": 0 @@ -499,7 +499,7 @@ main.floors.PIANTOU3= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/PIANTOU4.js b/project/floors/PIANTOU4.js index 5e071ff..a86bc3a 100644 --- a/project/floors/PIANTOU4.js +++ b/project/floors/PIANTOU4.js @@ -55,7 +55,7 @@ main.floors.PIANTOU4= "type": "setBlock", "number": 341, "loc": [ - 6, + 7, 3 ] }, @@ -87,7 +87,7 @@ main.floors.PIANTOU4= "type": "hide", "loc": [ [ - 6, + 7, 3 ] ] @@ -95,7 +95,7 @@ main.floors.PIANTOU4= { "type": "changePos", "loc": [ - 6, + 7, 3 ], "direction": "down" @@ -104,7 +104,7 @@ main.floors.PIANTOU4= "type": "show", "loc": [ [ - 5, + 6, 6 ] ] @@ -113,7 +113,7 @@ main.floors.PIANTOU4= "type": "show", "loc": [ [ - 6, + 7, 7 ] ] @@ -122,7 +122,7 @@ main.floors.PIANTOU4= "type": "show", "loc": [ [ - 7, + 8, 7 ] ] @@ -155,7 +155,7 @@ main.floors.PIANTOU4= "type": "hide", "loc": [ [ - 5, + 6, 6 ] ] @@ -164,7 +164,7 @@ main.floors.PIANTOU4= "type": "hide", "loc": [ [ - 6, + 7, 7 ] ] @@ -173,37 +173,11 @@ main.floors.PIANTOU4= "type": "hide", "loc": [ [ - 7, + 8, 7 ] ] }, - { - "type": "show", - "loc": [ - [ - 5, - 3 - ] - ] - }, - { - "type": "show", - "loc": [ - [ - 7, - 3 - ] - ] - }, - { - "type": "setBlock", - "number": 341, - "loc": [ - 6, - 3 - ] - }, { "type": "show", "loc": [ @@ -213,10 +187,36 @@ main.floors.PIANTOU4= ] ] }, + { + "type": "show", + "loc": [ + [ + 8, + 3 + ] + ] + }, + { + "type": "setBlock", + "number": 341, + "loc": [ + 7, + 3 + ] + }, + { + "type": "show", + "loc": [ + [ + 7, + 3 + ] + ] + }, { "type": "changePos", "loc": [ - -1, + 0, 0 ], "direction": "down" @@ -239,14 +239,14 @@ main.floors.PIANTOU4= "type": "changeFloor", "floorId": "tawai", "loc": [ - -1, + 0, 0 ] }, { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/PIANTOU7.js b/project/floors/PIANTOU7.js index 5eeaded..e6bb4f7 100644 --- a/project/floors/PIANTOU7.js +++ b/project/floors/PIANTOU7.js @@ -69,7 +69,7 @@ main.floors.PIANTOU7= "type": "show", "loc": [ [ - 5, + 6, 2 ] ] @@ -115,7 +115,7 @@ main.floors.PIANTOU7= "type": "show", "loc": [ [ - 6, + 7, 4 ] ] @@ -123,7 +123,7 @@ main.floors.PIANTOU7= { "type": "changePos", "loc": [ - -1, + 0, 0 ] }, diff --git a/project/floors/PIANTOU8.js b/project/floors/PIANTOU8.js index 3787cab..3a1a77e 100644 --- a/project/floors/PIANTOU8.js +++ b/project/floors/PIANTOU8.js @@ -21,7 +21,7 @@ main.floors.PIANTOU8= "type": "animate", "name": "youcezhan", "loc": [ - 8, + 9, 8 ] }, @@ -29,7 +29,7 @@ main.floors.PIANTOU8= "type": "hide", "loc": [ [ - 8, + 9, 8 ] ] @@ -41,7 +41,7 @@ main.floors.PIANTOU8= { "type": "jumpHero", "loc": [ - 5, + 6, 8 ], "time": 500 @@ -50,7 +50,7 @@ main.floors.PIANTOU8= "type": "animate", "name": "leijian", "loc": [ - 4, + 5, 9 ] }, @@ -58,7 +58,7 @@ main.floors.PIANTOU8= "type": "hide", "loc": [ [ - 4, + 5, 8 ] ] @@ -67,7 +67,7 @@ main.floors.PIANTOU8= "type": "hide", "loc": [ [ - 4, + 5, 9 ] ] @@ -76,7 +76,7 @@ main.floors.PIANTOU8= "type": "hide", "loc": [ [ - 5, + 6, 7 ] ] @@ -88,7 +88,7 @@ main.floors.PIANTOU8= { "type": "jumpHero", "loc": [ - 8, + 9, 7 ], "time": 500 @@ -97,7 +97,7 @@ main.floors.PIANTOU8= "type": "animate", "name": "leijian", "loc": [ - 9, + 10, 7 ] }, @@ -105,7 +105,7 @@ main.floors.PIANTOU8= "type": "hide", "loc": [ [ - 9, + 10, 6 ] ] @@ -114,7 +114,7 @@ main.floors.PIANTOU8= "type": "hide", "loc": [ [ - 9, + 10, 7 ] ] @@ -122,7 +122,7 @@ main.floors.PIANTOU8= { "type": "openDoor", "loc": [ - 6, + 7, 6 ] }, @@ -164,7 +164,7 @@ main.floors.PIANTOU8= "type": "changeFloor", "floorId": "PIANTOU9", "loc": [ - 11, + 12, 11 ], "time": 0 @@ -172,7 +172,7 @@ main.floors.PIANTOU8= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/XIANJIE.js b/project/floors/XIANJIE.js index 55f9e6c..e723ffd 100644 --- a/project/floors/XIANJIE.js +++ b/project/floors/XIANJIE.js @@ -22,7 +22,7 @@ main.floors.XIANJIE= "7,11": { "floorId": "MT16", "loc": [ - 11, + 12, 1 ], "time": 500 diff --git a/project/floors/bishi.js b/project/floors/bishi.js index 435e51b..5639f49 100644 --- a/project/floors/bishi.js +++ b/project/floors/bishi.js @@ -26,7 +26,7 @@ main.floors.bishi= "12,9": { "floorId": "MT49", "loc": [ - 8, + 9, 1 ], "direction": "down" diff --git a/project/floors/duwei1.js b/project/floors/duwei1.js index 9e81dda..0a87b62 100644 --- a/project/floors/duwei1.js +++ b/project/floors/duwei1.js @@ -93,7 +93,7 @@ main.floors.duwei1= "type": "changeFloor", "floorId": "duwei2", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -101,7 +101,7 @@ main.floors.duwei1= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/duwei2.js b/project/floors/duwei2.js index 2979802..297927e 100644 --- a/project/floors/duwei2.js +++ b/project/floors/duwei2.js @@ -90,7 +90,7 @@ main.floors.duwei2= "type": "changeFloor", "floorId": "duwei3", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -98,7 +98,7 @@ main.floors.duwei2= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/duwei3.js b/project/floors/duwei3.js index a6ba123..0c231cd 100644 --- a/project/floors/duwei3.js +++ b/project/floors/duwei3.js @@ -160,7 +160,7 @@ main.floors.duwei3= "type": "changeFloor", "floorId": "duwei4", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -168,7 +168,7 @@ main.floors.duwei3= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/duwei4.js b/project/floors/duwei4.js index 1341929..545f922 100644 --- a/project/floors/duwei4.js +++ b/project/floors/duwei4.js @@ -71,7 +71,7 @@ main.floors.duwei4= "type": "changeFloor", "floorId": "MT20", "loc": [ - 6, + 7, 5 ], "time": 500 @@ -79,7 +79,7 @@ main.floors.duwei4= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/huxiao1.js b/project/floors/huxiao1.js index d7fc0a9..c9c1dc8 100644 --- a/project/floors/huxiao1.js +++ b/project/floors/huxiao1.js @@ -92,7 +92,7 @@ main.floors.huxiao1= "type": "changeFloor", "floorId": "huxiao2", "loc": [ - -1, + 0, -1 ], "time": 0 @@ -100,7 +100,7 @@ main.floors.huxiao1= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/huxiao2.js b/project/floors/huxiao2.js index 0d23e6b..40d4cc1 100644 --- a/project/floors/huxiao2.js +++ b/project/floors/huxiao2.js @@ -74,7 +74,7 @@ main.floors.huxiao2= "type": "changeFloor", "floorId": "huxiao3", "loc": [ - -1, + 0, -1 ], "time": 0 @@ -82,7 +82,7 @@ main.floors.huxiao2= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/huxiao3.js b/project/floors/huxiao3.js index e35005f..143db20 100644 --- a/project/floors/huxiao3.js +++ b/project/floors/huxiao3.js @@ -69,7 +69,7 @@ main.floors.huxiao3= "type": "changeFloor", "floorId": "MT10", "loc": [ - 7, + 8, 8 ], "direction": "up", @@ -78,7 +78,7 @@ main.floors.huxiao3= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/jiange.js b/project/floors/jiange.js index 72a0801..d11fd10 100644 --- a/project/floors/jiange.js +++ b/project/floors/jiange.js @@ -15,7 +15,7 @@ main.floors.jiange= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } @@ -28,7 +28,7 @@ main.floors.jiange= "type": "changeFloor", "floorId": "MT64", "loc": [ - 1, + 2, 5 ] }, @@ -61,7 +61,7 @@ main.floors.jiange= "type": "changeFloor", "floorId": "jiange", "loc": [ - 8, + 9, 9 ], "direction": "right" @@ -83,7 +83,7 @@ main.floors.jiange= { "type": "changePos", "loc": [ - 8, + 9, 9 ], "direction": "up" @@ -160,7 +160,7 @@ main.floors.jiange= "type": "animate", "name": "haizhitiejian", "loc": [ - 8, + 9, 8 ] }, @@ -174,7 +174,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 8, + 9, 8 ], "time": 500, @@ -195,7 +195,7 @@ main.floors.jiange= "type": "animate", "name": "tiejian", "loc": [ - 8, + 9, 8 ] }, @@ -209,7 +209,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 8, + 9, 7 ], "time": 500, @@ -225,7 +225,7 @@ main.floors.jiange= { "type": "changePos", "loc": [ - 8, + 9, 9 ], "direction": "up" @@ -241,7 +241,7 @@ main.floors.jiange= "type": "animate", "name": "haizhitiejian", "loc": [ - 8, + 9, 8 ], "alignWindow": true @@ -256,7 +256,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 8, + 9, 8 ], "time": 500, @@ -277,7 +277,7 @@ main.floors.jiange= "type": "animate", "name": "tiejian", "loc": [ - 8, + 9, 8 ] }, @@ -291,7 +291,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 8, + 9, 7 ], "time": 500, @@ -307,7 +307,7 @@ main.floors.jiange= { "type": "changePos", "loc": [ - 8, + 9, 9 ], "direction": "up" @@ -323,7 +323,7 @@ main.floors.jiange= "type": "animate", "name": "shenlansebaofa", "loc": [ - 8, + 9, 9 ] }, @@ -335,7 +335,7 @@ main.floors.jiange= "type": "animate", "name": "shangzhanjian", "loc": [ - 8, + 9, 8 ], "async": true @@ -379,7 +379,7 @@ main.floors.jiange= { "type": "changePos", "loc": [ - 8, + 9, 7 ], "direction": "down" @@ -902,7 +902,7 @@ main.floors.jiange= "type": "animate", "name": "STshengfa2", "loc": [ - 8, + 9, 8 ] }, @@ -911,7 +911,7 @@ main.floors.jiange= "type": "animate", "name": "STshengfa2", "loc": [ - 8, + 9, 8 ] }, @@ -925,7 +925,7 @@ main.floors.jiange= "number": "blueKnight", "loc": [ [ - 8, + 9, 8 ] ], @@ -1000,7 +1000,7 @@ main.floors.jiange= { "type": "changePos", "loc": [ - 7, + 8, 7 ], "direction": "up" @@ -1210,7 +1210,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 6, + 7, 6 ], "time": 500, @@ -1224,7 +1224,7 @@ main.floors.jiange= "type": "animate", "name": "hainazhijian", "loc": [ - 6, + 7, 6 ] }, @@ -1246,7 +1246,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 7, + 8, 7 ], "time": 500, @@ -1282,7 +1282,7 @@ main.floors.jiange= "number": "yellowKnight", "loc": [ [ - 6, + 7, 6 ] ] @@ -1329,7 +1329,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 6, + 7, 6 ], "time": 500, @@ -1350,7 +1350,7 @@ main.floors.jiange= { "type": "changePos", "loc": [ - 7, + 8, 7 ], "direction": "down" @@ -1461,7 +1461,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 9, + 10, 9 ], "time": 500, @@ -1491,7 +1491,7 @@ main.floors.jiange= { "type": "move", "loc": [ - 10, + 11, 10 ], "time": 500, @@ -1504,7 +1504,7 @@ main.floors.jiange= "type": "hide", "loc": [ [ - 11, + 12, 10 ] ], @@ -1514,7 +1514,7 @@ main.floors.jiange= "type": "hide", "loc": [ [ - 6, + 7, 1 ] ], @@ -1537,7 +1537,7 @@ main.floors.jiange= "number": "redGem", "loc": [ [ - 6, + 7, 10 ] ], @@ -1548,7 +1548,7 @@ main.floors.jiange= "number": "redGem", "loc": [ [ - 6, + 7, 11 ] ], @@ -1559,23 +1559,12 @@ main.floors.jiange= "number": "redGem", "loc": [ [ - 5, + 6, 11 ] ], "async": true }, - { - "type": "setBlock", - "number": "blueGem", - "loc": [ - [ - 10, - 6 - ] - ], - "async": true - }, { "type": "setBlock", "number": "blueGem", @@ -1592,7 +1581,18 @@ main.floors.jiange= "number": "blueGem", "loc": [ [ - 11, + 12, + 6 + ] + ], + "async": true + }, + { + "type": "setBlock", + "number": "blueGem", + "loc": [ + [ + 12, 5 ] ], @@ -1603,29 +1603,29 @@ main.floors.jiange= "number": "bluePotion", "loc": [ [ - 5, + 6, 5 ] ], "async": true }, - { - "type": "setBlock", - "number": "bluePotion", - "loc": [ - [ - 3, - 3 - ] - ], - "async": true - }, { "type": "setBlock", "number": "bluePotion", "loc": [ [ 4, + 3 + ] + ], + "async": true + }, + { + "type": "setBlock", + "number": "bluePotion", + "loc": [ + [ + 5, 4 ] ], @@ -1636,7 +1636,7 @@ main.floors.jiange= "number": "redKey", "loc": [ [ - 2, + 3, 2 ] ], diff --git a/project/floors/jieke1.js b/project/floors/jieke1.js index cae314c..293f284 100644 --- a/project/floors/jieke1.js +++ b/project/floors/jieke1.js @@ -95,7 +95,7 @@ main.floors.jieke1= "type": "changeFloor", "floorId": "jieke2", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -103,7 +103,7 @@ main.floors.jieke1= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } @@ -194,7 +194,7 @@ main.floors.jieke1= "type": "changeFloor", "floorId": "jieke4", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -202,7 +202,7 @@ main.floors.jieke1= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/jieke2.js b/project/floors/jieke2.js index 58c0a78..c0e0120 100644 --- a/project/floors/jieke2.js +++ b/project/floors/jieke2.js @@ -255,7 +255,7 @@ main.floors.jieke2= "type": "changeFloor", "floorId": "jieke3", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -263,7 +263,7 @@ main.floors.jieke2= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/jieke3.js b/project/floors/jieke3.js index 0545bce..91e16bc 100644 --- a/project/floors/jieke3.js +++ b/project/floors/jieke3.js @@ -295,7 +295,7 @@ main.floors.jieke3= "type": "changeFloor", "floorId": "jieke1", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -303,7 +303,7 @@ main.floors.jieke3= { "type": "trigger", "loc": [ - 1, + 2, 0 ] } diff --git a/project/floors/jieke4.js b/project/floors/jieke4.js index 6811468..8101a05 100644 --- a/project/floors/jieke4.js +++ b/project/floors/jieke4.js @@ -121,7 +121,7 @@ main.floors.jieke4= "type": "changeFloor", "floorId": "jieke5", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -129,7 +129,7 @@ main.floors.jieke4= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/jieke5.js b/project/floors/jieke5.js index 65713b6..4f0fad2 100644 --- a/project/floors/jieke5.js +++ b/project/floors/jieke5.js @@ -496,7 +496,7 @@ main.floors.jieke5= "type": "changeFloor", "floorId": "MT13", "loc": [ - 8, + 9, 8 ], "time": 0 @@ -504,7 +504,7 @@ main.floors.jieke5= { "type": "trigger", "loc": [ - 12, + 13, 0 ] } diff --git a/project/floors/shenhai.js b/project/floors/shenhai.js index 7552b5e..f1b9b64 100644 --- a/project/floors/shenhai.js +++ b/project/floors/shenhai.js @@ -99,7 +99,7 @@ main.floors.shenhai= { "type": "changePos", "loc": [ - 5, + 6, 3 ], "direction": "up" @@ -120,7 +120,7 @@ main.floors.shenhai= "number": "npc0", "loc": [ [ - 5, + 6, 2 ] ] @@ -296,7 +296,7 @@ main.floors.shenhai= "type": "animate", "name": "sangang", "loc": [ - 9, + 10, 3 ] }, @@ -381,7 +381,7 @@ main.floors.shenhai= "type": "animate", "name": "shenglvehao", "loc": [ - 9, + 10, 3 ] }, diff --git a/project/floors/tading.js b/project/floors/tading.js index 06495b4..6bb1a7c 100644 --- a/project/floors/tading.js +++ b/project/floors/tading.js @@ -130,7 +130,7 @@ main.floors.tading= "type": "animate", "name": "meiqishibianshen", "loc": [ - 6, + 7, 3 ] }, @@ -139,7 +139,7 @@ main.floors.tading= "number": "341", "loc": [ [ - 6, + 7, 3 ] ] @@ -210,7 +210,7 @@ main.floors.tading= "type": "animate", "name": "xiaoshi", "loc": [ - 5, + 6, 3 ] }, @@ -219,7 +219,7 @@ main.floors.tading= "number": "E342", "loc": [ [ - 5, + 6, 3 ] ] @@ -245,7 +245,7 @@ main.floors.tading= "type": "animate", "name": "xiaoshi", "loc": [ - 7, + 8, 4 ] }, @@ -254,7 +254,7 @@ main.floors.tading= "number": "E340", "loc": [ [ - 7, + 8, 4 ] ] @@ -283,7 +283,7 @@ main.floors.tading= { "type": "move", "loc": [ - 6, + 7, 3 ], "time": 500, @@ -296,7 +296,7 @@ main.floors.tading= { "type": "move", "loc": [ - 5, + 6, 3 ], "time": 500, @@ -309,7 +309,7 @@ main.floors.tading= { "type": "move", "loc": [ - 7, + 8, 4 ], "time": 500, @@ -351,7 +351,7 @@ main.floors.tading= "type": "animate", "name": "gantanhao", "loc": [ - 6, + 7, 4 ], "async": true @@ -360,7 +360,7 @@ main.floors.tading= "type": "animate", "name": "gantanhao", "loc": [ - 5, + 6, 5 ], "async": true @@ -369,7 +369,7 @@ main.floors.tading= "type": "animate", "name": "gantanhao", "loc": [ - 7, + 8, 5 ], "async": true @@ -384,7 +384,7 @@ main.floors.tading= { "type": "jumpHero", "loc": [ - 7, + 8, 4 ], "time": 300 @@ -392,7 +392,7 @@ main.floors.tading= { "type": "jumpHero", "loc": [ - 6, + 7, 3 ], "time": 300 @@ -400,7 +400,7 @@ main.floors.tading= { "type": "jumpHero", "loc": [ - 6, + 7, 1 ], "time": 300 @@ -417,7 +417,7 @@ main.floors.tading= { "type": "move", "loc": [ - 6, + 7, 4 ], "time": 500, @@ -430,7 +430,7 @@ main.floors.tading= { "type": "move", "loc": [ - 5, + 6, 5 ], "time": 500, @@ -443,7 +443,7 @@ main.floors.tading= { "type": "move", "loc": [ - 7, + 8, 5 ], "time": 500, @@ -460,15 +460,6 @@ main.floors.tading= "type": "sleep", "time": 500 }, - { - "type": "animate", - "name": "shenglvehao", - "loc": [ - 5, - 3 - ], - "async": true - }, { "type": "animate", "name": "shenglvehao", @@ -487,6 +478,15 @@ main.floors.tading= ], "async": true }, + { + "type": "animate", + "name": "shenglvehao", + "loc": [ + 8, + 3 + ], + "async": true + }, { "type": "waitAsync" }, @@ -541,7 +541,7 @@ main.floors.tading= "number": "thief", "loc": [ [ - 6, + 7, 7 ] ] @@ -549,7 +549,7 @@ main.floors.tading= { "type": "move", "loc": [ - 6, + 7, 7 ], "time": 500, @@ -719,7 +719,7 @@ main.floors.tading= "type": "animate", "name": "shenglvehao", "loc": [ - 6, + 7, 6 ] }, @@ -784,7 +784,7 @@ main.floors.tading= { "type": "move", "loc": [ - 6, + 7, 6 ], "time": 500, @@ -811,7 +811,7 @@ main.floors.tading= "type": "setBlockOpacity", "loc": [ [ - 2, + 3, 4 ] ], @@ -826,7 +826,7 @@ main.floors.tading= "type": "animate", "name": "gantanhao", "loc": [ - 6, + 7, 3 ] }, @@ -889,7 +889,7 @@ main.floors.tading= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/tawai.js b/project/floors/tawai.js index 8d677b5..cab4ecf 100644 --- a/project/floors/tawai.js +++ b/project/floors/tawai.js @@ -120,7 +120,7 @@ main.floors.tawai= "type": "changeFloor", "floorId": "PIANTOU1", "loc": [ - -1, + 0, 0 ], "time": 0 @@ -128,7 +128,7 @@ main.floors.tawai= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } diff --git a/project/floors/wangyang30.js b/project/floors/wangyang30.js index c22238f..dbba0b0 100644 --- a/project/floors/wangyang30.js +++ b/project/floors/wangyang30.js @@ -23,7 +23,7 @@ main.floors.wangyang30= { "type": "trigger", "loc": [ - 0, + 1, 0 ] } @@ -521,14 +521,14 @@ main.floors.wangyang30= "type": "changeFloor", "floorId": "MT30", "loc": [ - 5, + 6, 2 ] }, { "type": "trigger", "loc": [ - 12, + 13, 0 ] } diff --git a/project/floors/xietu.js b/project/floors/xietu.js index 3055bab..b974adf 100644 --- a/project/floors/xietu.js +++ b/project/floors/xietu.js @@ -19,8 +19,8 @@ main.floors.xietu= "7,11": { "floorId": "MT25", "loc": [ - 1, - 11 + 2, + 10 ] } }, diff --git a/project/floors/xuetan.js b/project/floors/xuetan.js index e22623e..0de6e9d 100644 --- a/project/floors/xuetan.js +++ b/project/floors/xuetan.js @@ -19,7 +19,7 @@ main.floors.xuetan= "7,9": { "floorId": "MT36", "loc": [ - 11, + 12, 1 ] } diff --git a/project/floors/yanjiusuo.js b/project/floors/yanjiusuo.js index cef71e6..03c0f64 100644 --- a/project/floors/yanjiusuo.js +++ b/project/floors/yanjiusuo.js @@ -308,7 +308,7 @@ main.floors.yanjiusuo= "12,11": { "floorId": "MT4", "loc": [ - 7, + 9, 4 ], "time": 200 diff --git a/project/floors/zhenhong.js b/project/floors/zhenhong.js index af39703..f1b52a1 100644 --- a/project/floors/zhenhong.js +++ b/project/floors/zhenhong.js @@ -12,7 +12,7 @@ main.floors.zhenhong= { "type": "trigger", "loc": [ - 6, + 7, 4 ] } @@ -64,7 +64,7 @@ main.floors.zhenhong= "type": "animate", "name": "dian", "loc": [ - 6, + 7, 4 ] }, @@ -89,7 +89,7 @@ main.floors.zhenhong= "type": "animate", "name": "dian", "loc": [ - 6, + 7, 4 ] }, @@ -152,7 +152,7 @@ main.floors.zhenhong= "type": "animate", "name": "dian", "loc": [ - 6, + 7, 4 ] }, @@ -245,7 +245,7 @@ main.floors.zhenhong= "type": "animate", "name": "dian", "loc": [ - 6, + 7, 7 ] }, @@ -306,7 +306,7 @@ main.floors.zhenhong= { "type": "move", "loc": [ - 6, + 7, 4 ], "time": 500, @@ -319,14 +319,14 @@ main.floors.zhenhong= "type": "animate", "name": "hand", "loc": [ - 6, + 7, 7 ] }, { "type": "jumpHero", "loc": [ - 6, + 7, 5 ], "time": 500 @@ -339,7 +339,7 @@ main.floors.zhenhong= "type": "animate", "name": "dajian", "loc": [ - 6, + 7, 5 ], "async": true @@ -347,7 +347,7 @@ main.floors.zhenhong= { "type": "changePos", "loc": [ - 6, + 7, 5 ], "direction": "down" @@ -362,14 +362,14 @@ main.floors.zhenhong= "type": "animate", "name": "dajian", "loc": [ - 6, + 7, 4 ] }, { "type": "changePos", "loc": [ - 6, + 7, 4 ], "direction": "down" @@ -384,14 +384,14 @@ main.floors.zhenhong= "type": "animate", "name": "dajian", "loc": [ - 6, + 7, 3 ] }, { "type": "changePos", "loc": [ - 6, + 7, 3 ], "direction": "down" @@ -406,7 +406,7 @@ main.floors.zhenhong= "type": "animate", "name": "dajian", "loc": [ - 6, + 7, 2 ] }, @@ -417,7 +417,7 @@ main.floors.zhenhong= { "type": "jumpHero", "loc": [ - 5, + 6, 3 ], "time": 500 @@ -431,7 +431,7 @@ main.floors.zhenhong= { "type": "changePos", "loc": [ - 5, + 6, 6 ], "direction": "right" @@ -451,7 +451,7 @@ main.floors.zhenhong= { "type": "move", "loc": [ - 6, + 7, 6 ], "time": 500, @@ -467,7 +467,7 @@ main.floors.zhenhong= { "type": "changePos", "loc": [ - 5, + 6, 5 ], "direction": "down" @@ -475,7 +475,7 @@ main.floors.zhenhong= { "type": "jumpHero", "loc": [ - 6, + 7, 5 ], "time": 500, @@ -508,7 +508,7 @@ main.floors.zhenhong= "type": "animate", "name": "haizhitiejian", "loc": [ - 6, + 7, 7 ] }, @@ -520,7 +520,7 @@ main.floors.zhenhong= "type": "animate", "name": "fadong1", "loc": [ - 6, + 7, 7 ] }, @@ -528,7 +528,7 @@ main.floors.zhenhong= "type": "animate", "name": "dajian", "loc": [ - 6, + 7, 5 ] }, @@ -556,7 +556,7 @@ main.floors.zhenhong= "type": "animate", "name": "haizhitiejian", "loc": [ - 6, + 7, 7 ] }, @@ -568,7 +568,7 @@ main.floors.zhenhong= "type": "animate", "name": "fadong1", "loc": [ - 6, + 7, 7 ] }, @@ -576,7 +576,7 @@ main.floors.zhenhong= "type": "animate", "name": "dajian", "loc": [ - 6, + 7, 5 ] }, @@ -593,7 +593,7 @@ main.floors.zhenhong= { "type": "move", "loc": [ - 6, + 7, 7 ], "time": 500, @@ -656,7 +656,7 @@ main.floors.zhenhong= { "type": "move", "loc": [ - 6, + 7, 3 ], "time": 500, @@ -669,7 +669,7 @@ main.floors.zhenhong= "type": "animate", "name": "zhendajian", "loc": [ - 6, + 7, 5 ] }, @@ -680,7 +680,7 @@ main.floors.zhenhong= { "type": "changePos", "loc": [ - 6, + 7, 5 ], "direction": "up" @@ -705,7 +705,7 @@ main.floors.zhenhong= "type": "animate", "name": "haizhitiejian", "loc": [ - 6, + 7, 4 ] }, @@ -717,7 +717,7 @@ main.floors.zhenhong= "type": "animate", "name": "zhendajian", "loc": [ - 6, + 7, 5 ] }, @@ -741,7 +741,7 @@ main.floors.zhenhong= "type": "animate", "name": "haizhitiejian", "loc": [ - 6, + 7, 4 ] }, @@ -753,14 +753,14 @@ main.floors.zhenhong= "type": "animate", "name": "zhendajian", "loc": [ - 6, + 7, 5 ] }, { "type": "changePos", "loc": [ - 6, + 7, 5 ], "direction": "up" @@ -775,7 +775,7 @@ main.floors.zhenhong= "type": "animate", "name": "fadong4", "loc": [ - 6, + 7, 8 ] }, @@ -822,7 +822,7 @@ main.floors.zhenhong= "type": "animate", "name": "hainazhijian", "loc": [ - 6, + 7, 4 ] }, @@ -833,7 +833,7 @@ main.floors.zhenhong= { "type": "move", "loc": [ - 6, + 7, 4 ], "time": 500, @@ -888,7 +888,7 @@ main.floors.zhenhong= { "type": "move", "loc": [ - 6, + 7, 3 ], "time": 500, @@ -902,7 +902,7 @@ main.floors.zhenhong= "number": "ground", "loc": [ [ - 6, + 7, 7 ] ] @@ -944,7 +944,7 @@ main.floors.zhenhong= "number": "pickaxe", "loc": [ [ - 6, + 7, 3 ] ] @@ -953,7 +953,7 @@ main.floors.zhenhong= "type": "hide", "loc": [ [ - 6, + 7, 7 ] ], @@ -963,7 +963,7 @@ main.floors.zhenhong= "type": "hide", "loc": [ [ - 6, + 7, 4 ] ], @@ -976,7 +976,7 @@ main.floors.zhenhong= "7,9": { "floorId": "MT19", "loc": [ - 10, + 11, 2 ] }