jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

setFg & setWeather

Browse Source
This commit is contained in:
oc 2018-10-11 23:48:54 +08:00
parent 6aed9a63d3
commit 76a84c5f8f
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/control.js
View File

@ -1514,7 +1514,7 @@ control.prototype.updateDamage = function () {
// 判断显伤 // 判断显伤
var event = core.floors[core.status.floorId].events[x+","+y]; var event = core.floors[core.status.floorId].events[x+","+y];
if (core.isset(event) && !(event instanceof Array)) { if (core.isset(event) && !(event instanceof Array)) {
if (core.isset(event.displayDamage) && !event.displayDamage) if (event.displayDamage === false)
continue; continue;
} }
} }
@ -2441,9 +2441,7 @@ control.prototype.getStatus = function (statusName) {
////// 获得某个等级的名称 ////// ////// 获得某个等级的名称 //////
control.prototype.getLvName = function () { control.prototype.getLvName = function () {
if (!core.isset(core.firstData.levelUp) || core.status.hero.lv<=0 return ((core.firstData.levelUp||[])[core.status.hero.lv-1]||{}).name || core.status.hero.lv;
|| core.status.hero.lv>core.firstData.levelUp.length) return core.status.hero.lv;
return core.firstData.levelUp[core.status.hero.lv-1].name || core.status.hero.lv;
} }
////// 设置某个自定义变量或flag ////// ////// 设置某个自定义变量或flag //////

26
libs/events.js
View File

@ -657,16 +657,21 @@ events.prototype.doAction = function() {
case "setFg": // 颜色渐变 case "setFg": // 颜色渐变
if (data.async) { if (data.async) {
core.setFg(data.color, data.time); core.setFg(data.color, data.time);
core.setFlag('color', data.color||null);
this.doAction(); this.doAction();
} }
else { else {
core.setFg(data.color, data.time, function() { core.setFg(data.color, data.time, function() {
core.setFlag('color', data.color||null);
core.events.doAction(); core.events.doAction();
}); });
} }
break; break;
case "setWeather": // 更改天气 case "setWeather": // 更改天气
core.setWeather(data.name, data.level); core.setWeather(data.name, data.level);
if (core.isset(data.name))
core.setFlag('weather', [data.name, data.level]);
else core.setFlag('weather', null);
this.doAction(); this.doAction();
break; break;
case "openDoor": // 开一个门，包括暗墙 case "openDoor": // 开一个门，包括暗墙
@ -1272,11 +1277,11 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
} }
// 不存在事件时，更改画面色调 // 不存在事件时，更改画面色调
if (core.status.event.id == null) { var color = core.getFlag('color', null);
// 默认画面色调 if (!core.isset(color) && core.isset(core.floors[floorId].color)) {
if (core.isset(core.floors[floorId].color)) { color = core.floors[floorId].color;
var color = core.floors[floorId].color; }
if (core.isset(color)) {
// 直接变色 // 直接变色
core.clearMap('curtain'); core.clearMap('curtain');
if (core.isset(color[3])) if (core.isset(color[3]))
@ -1290,11 +1295,14 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
core.clearMap('curtain'); core.clearMap('curtain');
core.setAlpha('curtain', 0); core.setAlpha('curtain', 0);
} }
}
// 更改天气 // 更改天气
if (core.isset(core.floors[floorId].weather)) { var weather = core.getFlag('weather', null);
core.setWeather(core.floors[floorId].weather[0], core.floors[floorId].weather[1]) if (!core.isset(weather) && core.isset(core.floors[floorId].weather)) {
weather = core.floors[floorId].weather;
}
if (core.isset(weather)) {
core.setWeather(weather[0], weather[1])
} }
else core.setWeather(); else core.setWeather();
@ -1582,7 +1590,7 @@ events.prototype.checkLvUp = function () {
if (!core.flags.enableLevelUp || !core.isset(core.firstData.levelUp) if (!core.flags.enableLevelUp || !core.isset(core.firstData.levelUp)
|| core.status.hero.lv>=core.firstData.levelUp.length) return; || core.status.hero.lv>=core.firstData.levelUp.length) return;
// 计算下一个所需要的数值 // 计算下一个所需要的数值
var need=core.firstData.levelUp[core.status.hero.lv].need; var need=(core.firstData.levelUp[core.status.hero.lv]||{}).need;
if (!core.isset(need)) return; if (!core.isset(need)) return;
if (core.status.hero.experience>=need) { if (core.status.hero.experience>=need) {
// 升级 // 升级

2
project/functions.js
View File

@ -344,7 +344,7 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// 返回null代表可以使用 // 返回null代表可以使用
// 检查当前楼层的canUseQuickShop选项是否为false // 检查当前楼层的canUseQuickShop选项是否为false
if (core.isset(core.floors[core.status.floorId].canUseQuickShop) && !core.floors[core.status.floorId].canUseQuickShop) if (core.floors[core.status.floorId].canUseQuickShop === false)
return '当前楼层不能使用快捷商店。'; return '当前楼层不能使用快捷商店。';
return null; return null;