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

editor __SIZE__

Browse Source
This commit is contained in:
oc 2019-03-17 01:54:58 +08:00
parent 415267fc25
commit e710804297
3 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
_server/editor.js
View File

@ -195,7 +195,7 @@ editor.prototype.fetchMapFromCore = function(){
editor.map = mapArray.map(function (v) { editor.map = mapArray.map(function (v) {
return v.map(function (v) { return v.map(function (v) {
var x = parseInt(v), y = editor.indexs[x]; var x = parseInt(v), y = editor.indexs[x];
if (!core.isset(y)) { if (y == null) {
printe("素材数字"+x+"未定义。是不是忘了注册，或者接档时没有覆盖icons.js和maps.js？"); printe("素材数字"+x+"未定义。是不是忘了注册，或者接档时没有覆盖icons.js和maps.js？");
y = [0]; y = [0];
} }
@ -213,7 +213,7 @@ editor.prototype.fetchMapFromCore = function(){
editor[name]=mapArray.map(function (v) { editor[name]=mapArray.map(function (v) {
return v.map(function (v) { return v.map(function (v) {
var x = parseInt(v), y = editor.indexs[x]; var x = parseInt(v), y = editor.indexs[x];
if (!core.isset(y)) { if (y == null) {
printe("素材数字"+x+"未定义。是不是忘了注册，或者接档时没有覆盖icons.js和maps.js？"); printe("素材数字"+x+"未定义。是不是忘了注册，或者接档时没有覆盖icons.js和maps.js？");
y = [0]; y = [0];
} }
@ -242,7 +242,7 @@ editor.prototype.changeFloor = function (floorId, callback) {
editor.updateMap(); editor.updateMap();
editor_mode.floor(); editor_mode.floor();
editor.drawEventBlock(); editor.drawEventBlock();
if (core.isset(callback)) callback(); if (callback) callback();
}); });
} }
@ -251,22 +251,22 @@ editor.prototype.changeFloor = function (floorId, callback) {
editor.prototype.drawEventBlock = function () { editor.prototype.drawEventBlock = function () {
var fg=document.getElementById('efg').getContext('2d'); var fg=document.getElementById('efg').getContext('2d');
fg.clearRect(0, 0, 416, 416); fg.clearRect(0, 0, core.__PIXELS__, core.__PIXELS__);
for (var i=0;i<13;i++) { for (var i=0;i<core.__SIZE__;i++) {
for (var j=0;j<13;j++) { for (var j=0;j<core.__SIZE__;j++) {
var color=[]; var color=[];
var loc=(i+core.bigmap.offsetX/32)+","+(j+core.bigmap.offsetY/32); var loc=(i+core.bigmap.offsetX/32)+","+(j+core.bigmap.offsetY/32);
if (core.isset(editor.currentFloorData.events[loc])) if (editor.currentFloorData.events[loc])
color.push('#FF0000'); color.push('#FF0000');
if (core.isset(editor.currentFloorData.changeFloor[loc])) if (editor.currentFloorData.changeFloor[loc])
color.push('#00FF00'); color.push('#00FF00');
if (core.isset(editor.currentFloorData.afterBattle[loc])) if (editor.currentFloorData.afterBattle[loc])
color.push('#FFFF00'); color.push('#FFFF00');
if (core.isset(editor.currentFloorData.afterGetItem[loc])) if (editor.currentFloorData.afterGetItem[loc])
color.push('#00FFFF'); color.push('#00FFFF');
if (core.isset(editor.currentFloorData.afterOpenDoor[loc])) if (editor.currentFloorData.afterOpenDoor[loc])
color.push('#FF00FF'); color.push('#FF00FF');
if (core.isset(editor.currentFloorData.cannotMove[loc])) if (editor.currentFloorData.cannotMove[loc])
color.push('#0000FF'); color.push('#0000FF');
for(var kk=0,cc;cc=color[kk];kk++){ for(var kk=0,cc;cc=color[kk];kk++){
fg.fillStyle = cc; fg.fillStyle = cc;
@ -347,8 +347,8 @@ editor.prototype.updateMap = function () {
} }
editor.prototype.moveViewport=function(x,y){ editor.prototype.moveViewport=function(x,y){
core.bigmap.offsetX = core.clamp(core.bigmap.offsetX+32*x, 0, 32*core.bigmap.width-416); core.bigmap.offsetX = core.clamp(core.bigmap.offsetX+32*x, 0, 32*core.bigmap.width-core.__PIXELS__);
core.bigmap.offsetY = core.clamp(core.bigmap.offsetY+32*y, 0, 32*core.bigmap.height-416); core.bigmap.offsetY = core.clamp(core.bigmap.offsetY+32*y, 0, 32*core.bigmap.height-core.__PIXELS__);
core.control.updateViewport(); core.control.updateViewport();
editor.buildMark(); editor.buildMark();
editor.drawPosSelection(); editor.drawPosSelection();
@ -506,14 +506,14 @@ editor.prototype.buildMark = function(){
var mapRowMark=document.getElementById('mapRowMark'); var mapRowMark=document.getElementById('mapRowMark');
var buildMark = function (offsetX,offsetY) { var buildMark = function (offsetX,offsetY) {
var colNum = ' '; var colNum = ' ';
for (var i = 0; i < 13; i++) { for (var i = 0; i < core.__SIZE__; i++) {
var tpl = '<td>' + (i+offsetX) + '<div class="colBlock" style="left:' + (i * 32 + 1) + 'px;"></div></td>'; var tpl = '<td>' + (i+offsetX) + '<div class="colBlock" style="left:' + (i * 32 + 1) + 'px;"></div></td>';
colNum += tpl; colNum += tpl;
} }
arrColMark.innerHTML = '<tr>' + colNum + '</tr>'; arrColMark.innerHTML = '<tr>' + colNum + '</tr>';
mapColMark.innerHTML = '<tr>' + colNum + '</tr>'; mapColMark.innerHTML = '<tr>' + colNum + '</tr>';
var rowNum = ' '; var rowNum = ' ';
for (var i = 0; i < 13; i++) { for (var i = 0; i < core.__SIZE__; i++) {
var tpl = '<tr><td>' + (i+offsetY) + '<div class="rowBlock" style="top:' + (i * 32 + 1) + 'px;"></div></td></tr>'; var tpl = '<tr><td>' + (i+offsetY) + '<div class="rowBlock" style="top:' + (i * 32 + 1) + 'px;"></div></td></tr>';
rowNum += tpl; rowNum += tpl;
} }
@ -522,29 +522,29 @@ editor.prototype.buildMark = function(){
} }
var buildMark_mobile = function (offsetX,offsetY) { var buildMark_mobile = function (offsetX,offsetY) {
var colNum = ' '; var colNum = ' ';
for (var i = 0; i < 13; i++) { for (var i = 0; i < core.__SIZE__; i++) {
var tpl = '<td>' + (' '+i).slice(-2).replace(' ','&nbsp;') + '<div class="colBlock" style="left:' + (i * 96/13 ) + 'vw;"></div></td>'; var tpl = '<td>' + (' '+i).slice(-2).replace(' ','&nbsp;') + '<div class="colBlock" style="left:' + (i * 96/core.__SIZE__) + 'vw;"></div></td>';
colNum += tpl; colNum += tpl;
} }
arrColMark.innerHTML = '<tr>' + colNum + '</tr>'; arrColMark.innerHTML = '<tr>' + colNum + '</tr>';
//mapColMark.innerHTML = '<tr>' + colNum + '</tr>'; //mapColMark.innerHTML = '<tr>' + colNum + '</tr>';
var rowNum = ' '; var rowNum = ' ';
for (var i = 0; i < 13; i++) { for (var i = 0; i < core.__SIZE__; i++) {
var tpl = '<tr><td>' + (' '+i).slice(-2).replace(' ','&nbsp;') + '<div class="rowBlock" style="top:' + (i * 96/13 ) + 'vw;"></div></td></tr>'; var tpl = '<tr><td>' + (' '+i).slice(-2).replace(' ','&nbsp;') + '<div class="rowBlock" style="top:' + (i * 96/core.__SIZE__) + 'vw;"></div></td></tr>';
rowNum += tpl; rowNum += tpl;
} }
arrRowMark.innerHTML = rowNum; arrRowMark.innerHTML = rowNum;
//mapRowMark.innerHTML = rowNum; //mapRowMark.innerHTML = rowNum;
//===== //=====
var colNum = ' '; var colNum = ' ';
for (var i = 0; i < 13; i++) { for (var i = 0; i < core.__SIZE__; i++) {
var tpl = '<div class="coltd" style="left:' + (i * 96/13 ) + 'vw;"><div class="coltext">' + (' '+(i+offsetX)).slice(-2).replace(' ','&nbsp;') + '</div><div class="colBlock"></div></div>'; var tpl = '<div class="coltd" style="left:' + (i * 96/core.__SIZE__) + 'vw;"><div class="coltext">' + (' '+(i+offsetX)).slice(-2).replace(' ','&nbsp;') + '</div><div class="colBlock"></div></div>';
colNum += tpl; colNum += tpl;
} }
mapColMark.innerHTML = '<div class="coltr">' + colNum + '</div>'; mapColMark.innerHTML = '<div class="coltr">' + colNum + '</div>';
var rowNum = ' '; var rowNum = ' ';
for (var i = 0; i < 13; i++) { for (var i = 0; i < core.__SIZE__; i++) {
var tpl = '<div class="rowtr"><div class="rowtd" style="top:' + (i * 96/13 ) + 'vw;"><div class="rowtext">' + (' '+(i+offsetY)).slice(-2).replace(' ','&nbsp;') + '</div><div class="rowBlock"></div></div></div>'; var tpl = '<div class="rowtr"><div class="rowtd" style="top:' + (i * 96/core.__SIZE__) + 'vw;"><div class="rowtext">' + (' '+(i+offsetY)).slice(-2).replace(' ','&nbsp;') + '</div><div class="rowBlock"></div></div></div>';
rowNum += tpl; rowNum += tpl;
} }
mapRowMark.innerHTML = rowNum; mapRowMark.innerHTML = rowNum;
@ -657,7 +657,7 @@ editor.prototype.listen = function () {
editor.loc = { editor.loc = {
'x': scrollLeft + xx - mid.offsetLeft - mapEdit.offsetLeft, 'x': scrollLeft + xx - mid.offsetLeft - mapEdit.offsetLeft,
'y': scrollTop + yy - mid.offsetTop - mapEdit.offsetTop, 'y': scrollTop + yy - mid.offsetTop - mapEdit.offsetTop,
'size': editor.isMobile?(32*innerWidth*0.96/416):32 'size': editor.isMobile?(32*innerWidth*0.96/core.__PIXELS__):32
}; };
return editor.loc; return editor.loc;
}//返回可用的组件内坐标 }//返回可用的组件内坐标
@ -685,7 +685,7 @@ editor.prototype.listen = function () {
} }
holdingPath = 0; holdingPath = 0;
stepPostfix = []; stepPostfix = [];
uc.clearRect(0, 0, 416, 416); uc.clearRect(0, 0, core.__PIXELS__, core.__PIXELS__);
}//用于鼠标移出canvas时的自动清除状态 }//用于鼠标移出canvas时的自动清除状态
eui.oncontextmenu=function(e){e.preventDefault()} eui.oncontextmenu=function(e){e.preventDefault()}
@ -807,7 +807,7 @@ editor.prototype.listen = function () {
editor.updateMap(); editor.updateMap();
holdingPath = 0; holdingPath = 0;
stepPostfix = []; stepPostfix = [];
uc.clearRect(0, 0, 416, 416); uc.clearRect(0, 0, core.__PIXELS__, core.__PIXELS__);
} }
} }

12
_server/editor_file.js
View File

@ -154,7 +154,7 @@ editor_file = function (editor, callback) {
cannotMove: {} cannotMove: {}
}; };
Object.keys(editor.currentFloorData).forEach(function (t) { Object.keys(editor.currentFloorData).forEach(function (t) {
if (!core.isset(editor.currentFloorData[t])) if (editor.currentFloorData[t] == null)
delete editor.currentFloorData[t]; delete editor.currentFloorData[t];
}) })
editor.currentFloorData.map = "new"; editor.currentFloorData.map = "new";
@ -216,7 +216,7 @@ editor_file = function (editor, callback) {
cannotMove: {} cannotMove: {}
}; };
Object.keys(data).forEach(function (t) { Object.keys(data).forEach(function (t) {
if (!core.isset(data[t])) if (data[t] == null)
delete data[t]; delete data[t];
else { else {
if (t=='map') { if (t=='map') {
@ -278,7 +278,7 @@ editor_file = function (editor, callback) {
// get id num // get id num
var id = c+idnum; var id = c+idnum;
if (image=='terrains' && core.isset(terrainsId[y])) { if (image=='terrains' && terrainsId[y] != null) {
id=terrainsId[y]; id=terrainsId[y];
} }
else { else {
@ -999,8 +999,10 @@ editor_file = function (editor, callback) {
if (file == 'floorloc') { if (file == 'floorloc') {
actionList.forEach(function (value) { actionList.forEach(function (value) {
// 检测null/undefined // 检测null/undefined
if (!core.isset(value[2]))value[2]=undefined; if (value[2]==null)
eval("editor.currentFloorData" + value[1] + '=' + JSON.stringify(value[2])); eval("delete editor.currentFloorData" + value[1]);
else
eval("editor.currentFloorData" + value[1] + '=' + JSON.stringify(value[2]));
}); });
editor_file.saveFloorFile(callback); editor_file.saveFloorFile(callback);
return; return;

8
_server/editor_mode.js
View File

@ -608,8 +608,8 @@ editor_mode = function (editor) {
} }
var width = parseInt(document.getElementById('newMapWidth').value); var width = parseInt(document.getElementById('newMapWidth').value);
var height = parseInt(document.getElementById('newMapHeight').value); var height = parseInt(document.getElementById('newMapHeight').value);
if (!core.isset(width) || !core.isset(height) || width<13 || height<13 || width*height>1000) { if (!core.isset(width) || !core.isset(height) || width<core.__SIZE__ || height<core.__SIZE__ || width*height>1000) {
printe("新建地图的宽高都不得小于13，且宽高之积不能超过1000"); printe("新建地图的宽高都不得小于"+core.__SIZE__+"，且宽高之积不能超过1000");
return; return;
} }
@ -673,8 +673,8 @@ editor_mode = function (editor) {
var width = parseInt(document.getElementById('newMapsWidth').value); var width = parseInt(document.getElementById('newMapsWidth').value);
var height = parseInt(document.getElementById('newMapsHeight').value); var height = parseInt(document.getElementById('newMapsHeight').value);
if (!core.isset(width) || !core.isset(height) || width<13 || height<13 || width*height>1000) { if (!core.isset(width) || !core.isset(height) || width<core.__SIZE__ || height<core.__SIZE__ || width*height>1000) {
printe("新建地图的宽高都不得小于13，且宽高之积不能超过1000"); printe("新建地图的宽高都不得小于"+core.__SIZE__+"，且宽高之积不能超过1000");
return; return;
} }
editor_mode.onmode(''); editor_mode.onmode('');