Merge branch 'noAnimate' into hasAnimate

This commit is contained in:
爱的天使Erdnase 2023-04-04 11:48:09 +08:00
commit 249597d14c
4 changed files with 100 additions and 116 deletions

View File

@ -772,74 +772,9 @@ main.floors.MT20=
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
}, },
{ "\t[毒尾]..............哼.......还是输了么...",
"type": "setCurtain", "\t[毒尾].........意识........已经模糊了呢..........",
"color": [ "\t[毒尾]想起了好多东西呢.......嗜骨.....",
0,
0,
0,
0.2
],
"time": 500,
"keep": true
},
"\t[毒尾]还是,输了么",
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.4
],
"time": 500,
"keep": true
},
"\t[毒尾]嗜骨,杀你的人已经中了我毕生所聚之毒,离死想必也不远了",
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.6
],
"time": 500,
"keep": true
},
"\t[毒尾]看吧,我对你多好,这样一个可能颠覆联盟为我妖社所用的人,说杀就杀了",
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.8
],
"time": 500,
"keep": true
},
"\t[毒尾]想起了,好多事呢...........",
{
"type": "setCurtain",
"color": [
0,
0,
0,
1
],
"time": 500,
"keep": true
},
{
"type": "setText",
"position": "center"
},
"嗜骨.......................",
{
"type": "setText",
"position": "down"
},
{ {
"type": "hideImage", "type": "hideImage",
"code": 1, "code": 1,

View File

@ -304,7 +304,7 @@ main.floors.MT21=
{ {
"type": "jump", "type": "jump",
"from": [ "from": [
12, 13,
2 2
], ],
"to": [ "to": [
@ -472,7 +472,7 @@ main.floors.MT21=
}, },
"\t[腐翼]嗯?你捣什么乱?我还没玩够呢!", "\t[腐翼]嗯?你捣什么乱?我还没玩够呢!",
"\t[夜兽人乙]这......腐翼大人您不是......想要杀了他吗......", "\t[夜兽人乙]这......腐翼大人您不是......想要杀了他吗......",
"\t[腐翼]胡说!!!!我明明是想要你们打着打着\n同归于尽的谁占了上风我就“帮”他一下~你\n破坏了我的计划,就给我去死吧!!", "\t[腐翼]胡说!!!!我明明是想要你们打着打着\n同归于尽的谁占了上风我就“帮”他一下~你破坏了我的计划,就给我去死吧!!",
"\t[夜兽人乙]这......腐翼大人饶命啊!!!", "\t[夜兽人乙]这......腐翼大人饶命啊!!!",
"\t[腐翼]哈哈~~~让我开心一下吧~~~", "\t[腐翼]哈哈~~~让我开心一下吧~~~",
{ {
@ -487,7 +487,7 @@ main.floors.MT21=
8 8
], ],
"to": [ "to": [
10, 11,
3 3
], ],
"time": 500, "time": 500,
@ -556,12 +556,12 @@ main.floors.MT21=
{ {
"type": "jump", "type": "jump",
"from": [ "from": [
10, 11,
3 3
], ],
"to": [ "to": [
12, 13,
2 3
], ],
"time": 500, "time": 500,
"keep": true "keep": true
@ -571,7 +571,7 @@ main.floors.MT21=
"loc": [ "loc": [
[ [
13, 13,
2 3
] ]
], ],
"remove": true "remove": true
@ -662,6 +662,11 @@ main.floors.MT21=
"time": 0 "time": 0
}, },
"\t[杰克]那是当然了。那家伙可是“腐翼”啊。", "\t[杰克]那是当然了。那家伙可是“腐翼”啊。",
{
"type": "hideImage",
"code": 6,
"time": 0
},
{ {
"type": "hideImage", "type": "hideImage",
"code": 9, "code": 9,
@ -801,6 +806,26 @@ main.floors.MT21=
2 2
] ]
] ]
},
{
"type": "setBlock",
"number": "whiteWall",
"loc": [
[
12,
2
]
]
},
{
"type": "setBlock",
"number": "whiteWall",
"loc": [
[
10,
3
]
]
} }
] ]
}, },
@ -987,14 +1012,37 @@ main.floors.MT21=
}, },
"afterBattle": {}, "afterBattle": {},
"afterGetItem": {}, "afterGetItem": {},
"afterOpenDoor": {}, "afterOpenDoor": {
"9,2": [
{
"type": "if",
"condition": "(switch:A===1)",
"true": [],
"false": [
{
"type": "playSound",
"name": "se86.ogg"
},
{
"type": "setBlock",
"number": "81"
},
{
"type": "setValue",
"name": "switch:A",
"value": "1"
}
]
}
]
},
"cannotMove": {}, "cannotMove": {},
"ratio": 1, "ratio": 1,
"bgmap": [ "bgmap": [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0,10255, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0,10255, 0, 0, 0, 0, 2, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0,10247, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0,10247, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],

View File

@ -515,11 +515,11 @@ main.floors.MT23=
{ {
"type": "jump", "type": "jump",
"from": [ "from": [
5, 6,
9 9
], ],
"to": [ "to": [
5, 6,
9 9
], ],
"time": 500, "time": 500,

View File

@ -1579,44 +1579,45 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// core.stopAutomaticRoute(); // core.stopAutomaticRoute();
}, },
"moveDirectly": function (x, y, ignoreSteps) { "moveDirectly": function (x, y, ignoreSteps) {
// 瞬间移动x,y为要瞬间移动的点ignoreSteps为减少的步数可能之前已经被计算过 // 瞬间移动x,y为要瞬间移动的点ignoreSteps为减少的步数可能之前已经被计算过
// 返回true代表成功瞬移false代表没有成功瞬移 // 返回true代表成功瞬移false代表没有成功瞬移
// 判定能否瞬移到该点 // 判定能否瞬移到该点
if (ignoreSteps == null) ignoreSteps = core.canMoveDirectly(x, y); if (ignoreSteps == null) ignoreSteps = core.canMoveDirectly(x, y);
if (ignoreSteps >= 0) { if (ignoreSteps >= 0) {
// 中毒也允许瞬移 // 中毒也允许瞬移
if (core.hasFlag('poison')) { if (core.hasFlag('poison')) {
var damage = ignoreSteps * core.values.poisonDamage;
if (damage >= core.status.hero.hp) return false;
core.status.hero.statistics.poisonDamage += damage;
core.status.hero.hp -= damage;
}
core.clearMap('hero');
// 获得勇士最后的朝向
var lastDirection = core.status.route[core.status.route.length - 1];
if (['left', 'right', 'up', 'down'].indexOf(lastDirection) >= 0)
core.setHeroLoc('direction', lastDirection);
// 设置坐标,并绘制
core.control._moveDirectyFollowers(x, y);
core.status.hero.loc.x = x;
core.status.hero.loc.y = y;
core.drawHero();
// 记录录像
core.status.route.push("move:" + x + ":" + y);
// 统计信息
core.status.hero.statistics.moveDirectly++;
core.status.hero.statistics.ignoreSteps += ignoreSteps;
if (core.hasFlag('poison')) {
core.updateStatusBar(false, true);
}
core.ui.drawStatusBar();
core.checkRouteFolding();
return true;
}
return false; return false;
}, //var damage = ignoreSteps * core.values.poisonDamage;
//if (damage >= core.status.hero.hp) return false;
//core.status.hero.statistics.poisonDamage += damage;
//core.status.hero.hp -= damage;
}
core.clearMap('hero');
// 获得勇士最后的朝向
var lastDirection = core.status.route[core.status.route.length - 1];
if (['left', 'right', 'up', 'down'].indexOf(lastDirection) >= 0)
core.setHeroLoc('direction', lastDirection);
// 设置坐标,并绘制
core.control._moveDirectyFollowers(x, y);
core.status.hero.loc.x = x;
core.status.hero.loc.y = y;
core.drawHero();
// 记录录像
core.status.route.push("move:" + x + ":" + y);
// 统计信息
core.status.hero.statistics.moveDirectly++;
core.status.hero.statistics.ignoreSteps += ignoreSteps;
if (core.hasFlag('poison')) {
core.updateStatusBar(false, true);
}
core.ui.drawStatusBar();
core.checkRouteFolding();
return true;
}
return false;
},
"parallelDo": function (timestamp) { "parallelDo": function (timestamp) {
// 并行事件处理,可以在这里写任何需要并行处理的脚本或事件 // 并行事件处理,可以在这里写任何需要并行处理的脚本或事件
// 该函数将被系统反复执行每次执行间隔视浏览器或设备性能而定一般约为16.6ms一次 // 该函数将被系统反复执行每次执行间隔视浏览器或设备性能而定一般约为16.6ms一次