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

Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0

Browse Source
This commit is contained in:
oc 2019-02-25 01:41:22 +08:00
commit 5594f4e76f
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/events.js
View File

@ -1814,7 +1814,7 @@ events.prototype.moveImage = function (code, to, opacityVal, time, callback) {
var animate = setInterval(function () { var animate = setInterval(function () {
step++; step++;
moveStep(); moveStep();
if (step > steps) { if (step == steps) {
if (core.isset(opacityVal)) if (core.isset(opacityVal))
core.setOpacity(name, opacityVal); core.setOpacity(name, opacityVal);
delete core.animateFrame.asyncId[animate]; delete core.animateFrame.asyncId[animate];

5
libs/maps.js
View File

@ -208,13 +208,14 @@ maps.prototype.decompressMap = function (mapArr, floorId) {
var mw = core.floors[floorId].width || 13; var mw = core.floors[floorId].width || 13;
var mh = core.floors[floorId].height || 13; var mh = core.floors[floorId].height || 13;
for (var x=0;x<mh;x++) { for (var x=0;x<mh;x++) {
var floorMap = core.floors.map[x] || [];
if (mapArr[x] === 0) { if (mapArr[x] === 0) {
mapArr[x] = core.clone(core.floors[floorId].map[x]); mapArr[x] = floorMap;
} }
else { else {
for (var y=0;y<mw;y++) { for (var y=0;y<mw;y++) {
if (mapArr[x][y] === -1) { if (mapArr[x][y] === -1) {
mapArr[x][y] = core.floors[floorId].map[x][y]; mapArr[x][y] = floorMap[y] || 0;
} }
} }
} }

18
libs/ui.js
View File

@ -505,6 +505,7 @@ ui.prototype.calTextBoxWidth = function (canvas, content, min_width, max_width)
ui.prototype.__drawText = function (canvas, content, content_left, content_top, valid_width, ui.prototype.__drawText = function (canvas, content, content_left, content_top, valid_width,
color, per_height, time) { color, per_height, time) {
core.setTextAlign(canvas, 'left');
var offsetx = content_left, offsety = content_top; var offsetx = content_left, offsety = content_top;
core.setFillStyle(canvas, color); core.setFillStyle(canvas, color);
@ -543,14 +544,12 @@ ui.prototype.__drawText = function (canvas, content, content_left, content_top,
return drawNext(); return drawNext();
} }
// 检查是不是自动换行 // 检查是不是自动换行
if (core.isset(valid_width)) { var charwidth = core.calWidth(canvas, ch);
var charwidth = core.calWidth(canvas, ch); if (core.isset(valid_width) && offsetx + charwidth > content_left + valid_width) {
if (offsetx + charwidth > content_left + valid_width) { index--;
index--; offsetx = content_left;
offsetx = content_left; offsety += per_height;
offsety += per_height; return drawNext();
return drawNext();
}
} }
// 输出 // 输出
core.fillText(canvas, ch, offsetx, offsety); core.fillText(canvas, ch, offsetx, offsety);
@ -831,7 +830,7 @@ ui.prototype.drawScrollText = function (content, time, callback) {
tempCanvas.clearRect(0, 0, width, height); tempCanvas.clearRect(0, 0, width, height);
tempCanvas.font = font; tempCanvas.font = font;
this.__drawText(tempCanvas, content, 0, textfont, null, textColor, 1.4*textfont, 0); this.__drawText(tempCanvas, content, offset, textfont, null, textColor, 1.4*textfont, 0);
// 开始绘制到UI上 // 开始绘制到UI上
core.clearMap('ui'); core.clearMap('ui');
@ -967,7 +966,6 @@ ui.prototype.drawChoices = function(content, choices) {
} }
} }
core.setTextAlign('ui', 'left');
core.setFont('ui', 'bold 15px '+globalFont); core.setFont('ui', 'bold 15px '+globalFont);
this.__drawText('ui', content, content_left, content_top, validWidth, textColor, 20, 0); this.__drawText('ui', content, content_left, content_top, validWidth, textColor, 20, 0);
} }

2
main.js
View File

@ -316,7 +316,7 @@ main.prototype.setMainTipsText = function (text) {
main.prototype.log = function (e) { main.prototype.log = function (e) {
if (e) { if (e) {
if (main.core && main.core.platform && !main.core.platform.isPC) { if (main.core && main.core.platform && !main.core.platform.isPC) {
console.log((e.stack || e.toString()).replace("\n", " --- ")); console.log((e.stack || e.toString()));
} }
else { else {
console.log(e); console.log(e);