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

merge

Browse Source
This commit is contained in:
YouWei Zhao 2019-04-16 11:07:58 -04:00
commit 7deec138ed
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/editor.js
View File

@ -460,7 +460,7 @@ editor.prototype.setSelectBoxFromInfo=function(thisevent){
pos.y=thisevent.y; pos.y=thisevent.y;
if(thisevent.x)pos.x+=thisevent.x; if(thisevent.x)pos.x+=thisevent.x;
if(thisevent.images=='terrains')pos.y+=2; if(thisevent.images=='terrains')pos.y+=2;
ysize = thisevent.images.indexOf('48') === -1 ? 32 : 48; ysize = thisevent.images.endsWith('48') ? 48 : 32;
} }
var dataSelection = document.getElementById('dataSelection'); var dataSelection = document.getElementById('dataSelection');
dataSelection.style.left = pos.x * 32 + 'px'; dataSelection.style.left = pos.x * 32 + 'px';

2
_server/editor_file.js
View File

@ -269,7 +269,7 @@ editor_file = function (editor, callback) {
} }
}) })
var per_height = image.indexOf('48')>=0?48:32; var per_height = image.endsWith('48')?48:32;
var idnum=300; var idnum=300;
for (var y=0; y<editor.widthsX[image][3]/per_height;y++) { for (var y=0; y<editor.widthsX[image][3]/per_height;y++) {

10
_server/editor_unsorted_2.js
View File

@ -204,7 +204,7 @@ editor_unsorted_2_wrapper=function(editor_mode){
return; return;
} }
var ysize = selectAppend.value.indexOf('48') === -1 ? 32 : 48; var ysize = selectAppend.value.endsWith('48') ? 48 : 32;
editor_mode.appendPic.imageName = value; editor_mode.appendPic.imageName = value;
var img = core.material.images[value]; var img = core.material.images[value];
editor_mode.appendPic.toImg = img; editor_mode.appendPic.toImg = img;
@ -281,7 +281,7 @@ editor_unsorted_2_wrapper=function(editor_mode){
*/ */
// Step 2: 检测长宽比 // Step 2: 检测长宽比
var ysize = selectAppend.value.indexOf('48') === -1 ? 32 : 48; var ysize = selectAppend.value.endsWith('48') ? 48 : 32;
if ((image.width%32!=0 || image.height%ysize!=0) && (image.width<=128 && image.height<=ysize*4) if ((image.width%32!=0 || image.height%ysize!=0) && (image.width<=128 && image.height<=ysize*4)
&& confirm("目标长宽不符合条件，是否自动进行调整？")) { && confirm("目标长宽不符合条件，是否自动进行调整？")) {
var ncanvas = document.createElement('canvas').getContext('2d'); var ncanvas = document.createElement('canvas').getContext('2d');
@ -344,7 +344,7 @@ editor_unsorted_2_wrapper=function(editor_mode){
sprite_ctx.drawImage(image, 0, 0); sprite_ctx.drawImage(image, 0, 0);
} }
else { else {
var ysize = selectAppend.value.indexOf('48') === -1 ? 32 : 48; var ysize = selectAppend.value.endsWith('48') ? 48 : 32;
for (var ii = 0; ii < 3; ii++) { for (var ii = 0; ii < 3; ii++) {
var newsprite = appendPicCanvas.children[ii]; var newsprite = appendPicCanvas.children[ii];
newsprite.style.width = (newsprite.width = Math.floor(image.width / 32) * 32) / ratio + 'px'; newsprite.style.width = (newsprite.width = Math.floor(image.width / 32) * 32) / ratio + 'px';
@ -413,7 +413,7 @@ editor_unsorted_2_wrapper=function(editor_mode){
'x': scrollLeft + e.clientX + appendPicCanvas.scrollLeft - left1.offsetLeft - appendPicCanvas.offsetLeft, 'x': scrollLeft + e.clientX + appendPicCanvas.scrollLeft - left1.offsetLeft - appendPicCanvas.offsetLeft,
'y': scrollTop + e.clientY + appendPicCanvas.scrollTop - left1.offsetTop - appendPicCanvas.offsetTop, 'y': scrollTop + e.clientY + appendPicCanvas.scrollTop - left1.offsetTop - appendPicCanvas.offsetTop,
'size': 32, 'size': 32,
'ysize': selectAppend.value.indexOf('48') === -1 ? 32 : 48 'ysize': selectAppend.value.endsWith('48') ? 48 : 32
}; };
return loc; return loc;
}//返回可用的组件内坐标 }//返回可用的组件内坐标
@ -492,7 +492,7 @@ editor_unsorted_2_wrapper=function(editor_mode){
return; return;
} }
var ysize = selectAppend.value.indexOf('48') === -1 ? 32 : 48; var ysize = selectAppend.value.endsWith('48') ? 48 : 32;
for (var ii = 0, v; v = editor_mode.appendPic.selectPos[ii]; ii++) { for (var ii = 0, v; v = editor_mode.appendPic.selectPos[ii]; ii++) {
// var imgData = source_ctx.getImageData(v.x * 32, v.y * ysize, 32, ysize); // var imgData = source_ctx.getImageData(v.x * 32, v.y * ysize, 32, ysize);
// sprite_ctx.putImageData(imgData, ii * 32, sprite.height - ysize); // sprite_ctx.putImageData(imgData, ii * 32, sprite.height - ysize);