Compare commits

..

No commits in common. "a590a0b5b43dc1a3a4574d19ea70a0e514bfa08c" and "11be7597190eddf798876b7642d1283ec2009362" have entirely different histories.

7 changed files with 234 additions and 274 deletions

View File

@ -195,24 +195,6 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 =
}
]
}
],
"34door": [
{
"type": "function",
"function": "function(){\ncore.replaceBlock(540, 378, core.floorIds);\n}"
},
{
"type": "function",
"function": "function(){\ncore.replaceBlock(539, 540, core.floorIds);\n}"
},
{
"type": "function",
"function": "function(){\ncore.replaceBlock(538, 539, core.floorIds);\n}"
},
{
"type": "function",
"function": "function(){\ncore.replaceBlock(378, 538, core.floorIds);\n}"
}
]
}
}

View File

@ -87,40 +87,16 @@ main.floors.CETAI=
"condition": "(flag:cetaiJack != 1)",
"true": [
{
"type": "if",
"condition": "(core.isReplaying()||flag:SkipThePlot)",
"true": [
"type": "choices",
"text": "是否跳过剧情",
"choices": [
{
"type": "setValue",
"name": "flag:SkipThePlot",
"value": "false"
"text": "是",
"action": []
},
{
"type": "setBlock",
"number": "23",
"loc": [
[
9,
3
]
]
},
{
"type": "setValue",
"name": "flag:juqing",
"value": "flag:juqing+1"
},
{
"type": "setValue",
"name": "flag:cetaiJack",
"value": "1"
}
],
"false": [
{
"type": "function",
"function": "function(){\ncore.Confirmskip_On();\n}"
},
"text": "否",
"action": [
{
"type": "showImage2",
"code": 1,
@ -216,7 +192,7 @@ main.floors.CETAI=
"\t[邵虎]..........你也看出来了?我也不知道怎么回事,感觉全身上下使不上力气。",
"\t[杰克]........你是不是被腐翼咬到了?",
"\t[邵虎]..........嗯。是这个缘故吗?",
"\t[杰克]没错,腐翼的毒牙拥有衰弱的能力。\r[#fb928b]在衰弱状态下老大的能力将会减半。",
"\t[杰克]没错,腐翼的毒牙拥有衰弱的能力。在衰弱状态下老大的能力将会减半。",
"\t[杰克]要想解除,恐怕老大要拿到【解衰药水】才行。",
"\t[邵虎]【解衰药水】......好吧。我会留意的。",
{
@ -301,10 +277,6 @@ main.floors.CETAI=
"\t[邵虎]这不是一开始就说好了的吗?我一定留心。你自己小心。",
"\t[杰克]知道了。",
"\t[杰克]那这把红钥匙给老大用吧。老大也....小心点。",
{
"type": "function",
"function": "function(){\ncore.Confirmskip_Off();\n}"
},
{
"type": "hideImage",
"code": 1,
@ -314,6 +286,10 @@ main.floors.CETAI=
"type": "hideImage",
"code": 2,
"time": 0
}
]
}
]
},
{
"type": "setBlock",
@ -335,8 +311,6 @@ main.floors.CETAI=
"name": "flag:cetaiJack",
"value": "1"
}
]
}
],
"false": [
{

View File

@ -42,7 +42,6 @@ main.floors.MT33=
"time": 0
},
"\t[老人]34层的门阵想通过必须记住\n黄门开过变成蓝门。\n蓝门开过变成红门。\n红门开过变成黄门。",
"\t[老人]记住,所有的门都是三次一循环。",
{
"type": "hideImage",
"code": 1,

View File

@ -18,7 +18,7 @@ main.floors.MT34=
[ 0,348, 4, 2,540, 2,539, 2,538, 2,540, 2, 4,352, 0],
[ 0,348, 4, 2, 21,538, 21,539, 22,540, 21, 2, 4,352, 0],
[ 0,348, 4, 2,539, 2,540, 2,539, 2,539, 2, 4,352, 0],
[ 0,348, 4, 2, 21,538, 22,538, 22,540, 23, 2, 4,352, 0],
[ 0,348, 4, 2, 21,538, 22,538, 22,539, 23, 2, 4,352, 0],
[ 0,348, 4, 2,539, 2,539, 2,539, 2,539, 2, 4,352, 0],
[ 0,348, 4, 2, 23,540, 21,538, 22,539, 22, 2, 4,352, 0],
[ 0,348, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4,352, 0],

View File

@ -332,7 +332,7 @@ main.floors.MT39=
{
"type": "jump",
"from": [
3,
2,
4
],
"dxy": [

View File

@ -367,7 +367,7 @@ main.floors.MT40=
"time": 0
},
"\t[杰克]好。给你一瓶吧。要算是借的话,老大可没有机会还我呢。",
"\t[杰克]就当是为老大的\r[#fb928b]命运之役\r推波助澜吧。",
"\t[杰克]就当是为老大的命运之役推波助澜吧。",
{
"type": "hideImage",
"code": 33,
@ -1470,6 +1470,20 @@ main.floors.MT40=
}
]
},
{
"type": "choices",
"text": "是否跳过剧情",
"choices": [
{
"text": "是",
"action": []
},
{
"text": "否",
"action": []
}
]
},
{
"type": "setValue",
"name": "flag:119",

View File

@ -1536,15 +1536,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
}
}
////// 某个点是否存在楼梯 //////
maps.prototype.stairExists = function (x, y, floorId) {
var blockId = this.getBlockId(x, y, floorId);
if (blockId == null) return false;
var ids = ['upFloor', 'downFloor'];
ids = ids.concat(['leftPortal', 'rightPortal', 'upPortal', 'downPortal']); ///密室入口不为楼梯不可楼传portal
return ids.indexOf(blockId) >= 0;
}
},
"drawLight": function () {