合并2_10_3分支
添加战斗停顿 修复手机打开黑屏 修复0层仙子剧情重复
This commit is contained in:
parent
15ef13c1f4
commit
95d24b114d
@ -907,6 +907,11 @@ main.floors.MT0=
|
|||||||
"steps": [
|
"steps": [
|
||||||
"right:1"
|
"right:1"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "hide",
|
||||||
|
"remove": true,
|
||||||
|
"time": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -326,12 +326,12 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
|
|||||||
core.status.hero.exp += exp;
|
core.status.hero.exp += exp;
|
||||||
core.status.hero.statistics.exp += exp;
|
core.status.hero.statistics.exp += exp;
|
||||||
|
|
||||||
var hint = "打败 " + core.getEnemyValue(enemy, "name", x, y);
|
var hint = "打败 " + core.getEnemyValue(enemy, "name", x, y);
|
||||||
if (core.flags.statusBarItems.indexOf('enableMoney') >= 0)
|
if (core.flags.statusBarItems.indexOf('enableMoney') >= 0)
|
||||||
hint += ',' + core.getStatusLabel('money') + '+' + money; // hint += ",金币+" + money;
|
hint += ',' + core.getStatusLabel('money') + '+' + money; // hint += ",金币+" + money;
|
||||||
if (core.flags.statusBarItems.indexOf('enableExp') >= 0)
|
if (core.flags.statusBarItems.indexOf('enableExp') >= 0)
|
||||||
hint += ',' + core.getStatusLabel('exp') + '+' + exp; // hint += ",经验+" + exp;
|
hint += ',' + core.getStatusLabel('exp') + '+' + exp; // hint += ",经验+" + exp;
|
||||||
if (!core.getFlag("isNoTip")) core.drawTip(hint, enemy.id);
|
if (!core.getFlag("isNoTip")) core.drawTip(hint, enemy.id);
|
||||||
|
|
||||||
// 中毒
|
// 中毒
|
||||||
if (core.enemys.hasSpecial(special, 12)) {
|
if (core.enemys.hasSpecial(special, 12)) {
|
||||||
@ -388,6 +388,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
|
|||||||
core.push(todo, [{ "type": "insert", "name": "加点事件", "args": [point] }]);
|
core.push(todo, [{ "type": "insert", "name": "加点事件", "args": [point] }]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//等待动画执行完毕
|
||||||
|
core.push(todo, [{ "type": "waitAsync" }]);
|
||||||
// 战后事件
|
// 战后事件
|
||||||
if (core.status.floorId != null) {
|
if (core.status.floorId != null) {
|
||||||
core.push(todo, core.floors[core.status.floorId].afterBattle[x + "," + y]);
|
core.push(todo, core.floors[core.status.floorId].afterBattle[x + "," + y]);
|
||||||
|
@ -42,7 +42,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
|
|||||||
if (clientWidth - 3 * BORDER >= core._PX_ + BAR_WIDTH || (clientWidth > clientHeight && horizontalMaxRatio < 1)) {
|
if (clientWidth - 3 * BORDER >= core._PX_ + BAR_WIDTH || (clientWidth > clientHeight && horizontalMaxRatio < 1)) {
|
||||||
core.domStyle.isVertical = false;
|
core.domStyle.isVertical = false;
|
||||||
core.clearMap('Vertical');
|
core.clearMap('Vertical');
|
||||||
} else {
|
} else if (core.status.played) {
|
||||||
// 竖屏
|
// 竖屏
|
||||||
core.domStyle.isVertical = true;
|
core.domStyle.isVertical = true;
|
||||||
core.createCanvas('Vertical', 0, 0, 480, 480, 200);
|
core.createCanvas('Vertical', 0, 0, 480, 480, 200);
|
||||||
|
Loading…
Reference in New Issue
Block a user