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

Fix setFg Bug

Browse Source
This commit is contained in:
oc 2018-12-01 19:38:20 +08:00
parent fd245019fd
commit c029388e30
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/control.js
View File

@ -1467,10 +1467,8 @@ control.prototype.setFg = function(color, time, callback) {
if (!core.isset(color)) if (!core.isset(color))
color = [0,0,0,0]; color = [0,0,0,0];
if (color.length==3) if (!core.isset(color[3])) color[3] = 1;
color.push(1); color[3] = core.clamp(color[3],0,1);
if (color[3]<0) color[3]=0;
if (color[3]>1) color[3]=1;
if (time==0) { if (time==0) {
// 直接变色 // 直接变色
@ -2524,6 +2522,7 @@ control.prototype.getLvName = function () {
////// 设置某个自定义变量或flag ////// ////// 设置某个自定义变量或flag //////
control.prototype.setFlag = function(flag, value) { control.prototype.setFlag = function(flag, value) {
if (!core.isset(value)) return this.removeFlag(flag);
if (!core.isset(core.status.hero)) return; if (!core.isset(core.status.hero)) return;
core.status.hero.flags[flag]=value; core.status.hero.flags[flag]=value;
} }

7
libs/events.js
View File

@ -1414,13 +1414,10 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
if (core.isset(color)) { if (core.isset(color)) {
// 直接变色 // 直接变色
core.clearMap('curtain'); core.clearMap('curtain');
core.fillRect('curtain',0,0,416,core.arrayToRGBA(color)); core.fillRect('curtain',0,0,416,416,core.arrayToRGBA(color));
core.status.curtainColor = color; core.status.curtainColor = color;
} }
else { else core.clearMap('curtain');
core.clearMap('curtain');
core.setAlpha('curtain', 0);
}
// 更改天气 // 更改天气
var weather = core.getFlag('__weather__', null); var weather = core.getFlag('__weather__', null);

2
project/functions.js
View File

@ -1121,8 +1121,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
ctx.msImageSmoothingEnabled = false; ctx.msImageSmoothingEnabled = false;
ctx.imageSmoothingEnabled = false; ctx.imageSmoothingEnabled = false;
core.clearMap('curtain'); core.clearMap('curtain');
core.setOpacity('curtain', 1);
core.setAlpha('curtain', 1);
// 绘制色调层，默认不透明度 // 绘制色调层，默认不透明度
if (!core.isset(color)) color = 0.9; if (!core.isset(color)) color = 0.9;