Merge branch 'noAnimate' into hasAnimate
This commit is contained in:
commit
c1004a7f3b
@ -213,6 +213,50 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
|
||||
"type": "function",
|
||||
"function": "function(){\ncore.replaceBlock(378, 538, core.floorIds);\n}"
|
||||
}
|
||||
],
|
||||
"40回忆汪洋": [
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 38,
|
||||
"image": "30juqing.png",
|
||||
"loc": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"opacity": 0.7,
|
||||
"time": 500,
|
||||
"async": true
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 39,
|
||||
"image": "wangyangqianxiao.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
],
|
||||
"opacity": 0.7,
|
||||
"time": 500,
|
||||
"async": true
|
||||
},
|
||||
{
|
||||
"type": "waitAsync"
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 38,
|
||||
"time": 500,
|
||||
"async": true
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 39,
|
||||
"time": 500,
|
||||
"async": true
|
||||
},
|
||||
{
|
||||
"type": "waitAsync"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
@ -578,172 +578,108 @@ main.floors.MT40=
|
||||
"code": 38,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "insert",
|
||||
"name": "40回忆汪洋"
|
||||
},
|
||||
"\t[邵虎]剑,依人所指!",
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 39,
|
||||
"image": "30juqing.png",
|
||||
"image": "shaohusikao.png",
|
||||
"loc": [
|
||||
0,
|
||||
0
|
||||
-30,
|
||||
20
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 40,
|
||||
"image": "wangyangqianxiao.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "sleep",
|
||||
"time": 500
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 40,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20]剑依人所指!",
|
||||
{
|
||||
"type": "animate",
|
||||
"name": "STmoqiang",
|
||||
"loc": "hero"
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20](能够战胜的契机。)",
|
||||
"\t[邵虎](能够战胜的契机。)",
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 43,
|
||||
"image": "30juqing.png",
|
||||
"loc": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 44,
|
||||
"image": "wangyangqianxiao.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "sleep",
|
||||
"type": "hideImage",
|
||||
"code": 39,
|
||||
"time": 500
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 43,
|
||||
"time": 0
|
||||
"type": "insert",
|
||||
"name": "40回忆汪洋"
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 44,
|
||||
"type": "showImage2",
|
||||
"code": 39,
|
||||
"image": "shaohusikao.png",
|
||||
"loc": [
|
||||
-30,
|
||||
20
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20]剑于我心,欲解前路之阻碍。",
|
||||
"\t[邵虎]剑于我心,欲解前路之阻碍。",
|
||||
{
|
||||
"type": "animate",
|
||||
"name": "fadong2",
|
||||
"loc": "hero"
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20](在我的把握之中。)",
|
||||
"\t[邵虎](在我的把握之中。)",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "insert",
|
||||
"name": "40回忆汪洋"
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 47,
|
||||
"image": "30juqing.png",
|
||||
"code": 39,
|
||||
"image": "shaohusikao.png",
|
||||
"loc": [
|
||||
0,
|
||||
0
|
||||
-30,
|
||||
20
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 48,
|
||||
"image": "wangyangqianxiao.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "sleep",
|
||||
"time": 500
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 47,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 48,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20]剑陌峥嵘,若海洋之心。",
|
||||
"\t[邵虎]剑陌峥嵘,若海洋之心。",
|
||||
{
|
||||
"type": "animate",
|
||||
"name": "fadong3",
|
||||
"loc": "hero"
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20](散发出海之真谛的峥嵘之剑啊。)",
|
||||
"\t[邵虎](散发出海之真谛的峥嵘之剑啊。)",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "insert",
|
||||
"name": "40回忆汪洋"
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 50,
|
||||
"image": "30juqing.png",
|
||||
"code": 39,
|
||||
"image": "shaohusikao.png",
|
||||
"loc": [
|
||||
0,
|
||||
0
|
||||
-30,
|
||||
20
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 51,
|
||||
"image": "wangyangqianxiao.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "sleep",
|
||||
"time": 500
|
||||
},
|
||||
"\t[邵虎]天道无常,剑知天道。苍穹之海,为我辟路。",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 50,
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 51,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\f[shaohusikao.png,-30,20]天道无常,剑知天道。苍穹之海,为我辟路。",
|
||||
{
|
||||
"type": "animate",
|
||||
"name": "fadong4",
|
||||
@ -772,7 +708,7 @@ main.floors.MT40=
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 53,
|
||||
"code": 39,
|
||||
"image": "fuyi.png",
|
||||
"loc": [
|
||||
200,
|
||||
@ -784,47 +720,47 @@ main.floors.MT40=
|
||||
"\t[腐翼]什........什么!!!",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 53,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\f[shaohuziya.png,-30,20](就是现在!)",
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 55,
|
||||
"image": "30juqing.png",
|
||||
"loc": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"opacity": 1,
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 56,
|
||||
"image": "wangyangqianxiao.png",
|
||||
"code": 39,
|
||||
"image": "shaohuziya.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
-30,
|
||||
20
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "sleep",
|
||||
"time": 500
|
||||
},
|
||||
"\t[邵虎](就是现在!)",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 55,
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 56,
|
||||
"type": "insert",
|
||||
"name": "40回忆汪洋"
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 39,
|
||||
"image": "shaohuziya.png",
|
||||
"loc": [
|
||||
-30,
|
||||
20
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\\c[30]以剑化海!!海纳之剑!!",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]\f[shaohuziya.png,-30,20]\\c[30]以剑化海!!海纳之剑!!",
|
||||
{
|
||||
"type": "animate",
|
||||
"name": "hainazhijian",
|
||||
@ -835,7 +771,7 @@ main.floors.MT40=
|
||||
},
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 58,
|
||||
"code": 39,
|
||||
"image": "fuyi.png",
|
||||
"loc": [
|
||||
200,
|
||||
@ -847,7 +783,7 @@ main.floors.MT40=
|
||||
"\t[腐翼]不......不要啊!!!!",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 58,
|
||||
"code": 39,
|
||||
"time": 0
|
||||
},
|
||||
{
|
||||
@ -1475,9 +1411,20 @@ main.floors.MT40=
|
||||
"name": "flag:119",
|
||||
"value": "1"
|
||||
},
|
||||
"\t[邵虎]\f[shaohuzixin.png,-30,20]杰克说,要想取得31层的解衰药瓶,就要拿到破墙镐..........",
|
||||
"\t[邵虎]\f[shaohuzixin.png,-30,20]他还说他有点累了,想休息一会,让我有事情的话去4层找他。",
|
||||
"\t[邵虎]\f[shaohuzixin.png,-30,20]现在......先把衰弱解了吧。",
|
||||
{
|
||||
"type": "showImage2",
|
||||
"code": 59,
|
||||
"image": "shaohuzixin.png",
|
||||
"loc": [
|
||||
200,
|
||||
40
|
||||
],
|
||||
"opacity": 1,
|
||||
"time": 0
|
||||
},
|
||||
"\t[邵虎]杰克说,要想取得31层的解衰药瓶,就要拿到破墙镐..........",
|
||||
"\t[邵虎]他还说他有点累了,想休息一会,让我有事情的话去4层找他。",
|
||||
"\t[邵虎]现在......先把衰弱解了吧。",
|
||||
{
|
||||
"type": "hideImage",
|
||||
"code": 59,
|
||||
|
@ -423,9 +423,9 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
|
||||
"535": {"cls":"items","id":"I535"},
|
||||
"536": {"cls":"items","id":"I536"},
|
||||
"537": {"cls":"items","id":"I537"},
|
||||
"538": {"cls":"animates","id":"A538","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"yellowKey":1}},"trigger":"openDoor","animate":1},
|
||||
"539": {"cls":"animates","id":"A539","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"blueKey":1}},"trigger":"openDoor","animate":1},
|
||||
"540": {"cls":"animates","id":"A540","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"redKey":1}},"trigger":"openDoor","animate":1},
|
||||
"538": {"cls":"animates","id":"A538","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"yellowKey":1}},"trigger":"openDoor","animate":1,"script":"if (core.itemCount('yellowKey') > 0) {\n\tcore.mydoor34();\n\tflags.door_34 = { x: core.nextX(), y: core.nextY(), door: core.getBlockId(core.nextX(), core.nextY()) }\n}"},
|
||||
"539": {"cls":"animates","id":"A539","doorInfo":{"time":160,"openSound":"door.ogg","closeSound":"door.ogg","keys":{"blueKey":1}},"trigger":"openDoor","animate":1,"script":"if (core.itemCount('blueKey') > 0) {\n\tcore.mydoor34();\n\tflags.door_34 = { x: core.nextX(), y: core.nextY(), door: core.getBlockId(core.nextX(), core.nextY()) }\n}"},
|
||||
"540": {"cls":"animates","id":"A540","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"redKey":1}},"trigger":"openDoor","animate":1,"script":"if (core.itemCount('redKey') > 0) {\n\tcore.mydoor34();\n\tflags.door_34 = { x: core.nextX(), y: core.nextY(), door: core.getBlockId(core.nextX(), core.nextY()) }\n}"},
|
||||
"541": {"cls":"animates","id":"A541"},
|
||||
"542": {"cls":"animates","id":"A542"},
|
||||
"543": {"cls":"animates","id":"A543"},
|
||||
|
@ -1545,6 +1545,26 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
||||
return ids.indexOf(blockId) >= 0;
|
||||
}
|
||||
|
||||
core.mydoor34 = function () {
|
||||
if (flags.door_34) {
|
||||
var x = flags.door_34.x,
|
||||
y = flags.door_34.y;
|
||||
switch (flags.door_34.door) {
|
||||
case 'A538':
|
||||
core.setBlock('A539', x, y);
|
||||
break;
|
||||
case 'A539':
|
||||
core.setBlock('A540', x, y);
|
||||
break;
|
||||
case 'A540':
|
||||
core.setBlock('A538', x, y);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
"drawLight": function () {
|
||||
|
Loading…
Reference in New Issue
Block a user