diff --git a/_server/editor.js b/_server/editor.js index 515a6f73..53fa7364 100644 --- a/_server/editor.js +++ b/_server/editor.js @@ -86,7 +86,7 @@ editor.prototype.drawInitData = function (icons) { var sumWidth=0; editor.widthsX={}; // var imgNames = Object.keys(images); //还是固定顺序吧; - var imgNames = ["terrains", "animates", "enemys", "items", "npcs", "autotile"]; + var imgNames = ["terrains", "animates", "enemys", "enemy48", "items", "npcs", "npc48", "autotile"]; for(var ii=0; ii=editor.widthsX[spriter][1] && pos.x editor.widthsX[spriter][3]) - pos.y = ~~(editor.widthsX[spriter][3]/32)-4; + if((pos.y+1)*ysize > editor.widthsX[spriter][3]) + pos.y = ~~(editor.widthsX[spriter][3]/ysize)-4; else{ for(var i=0; i= 4*i && pos.y < 4*(i+1)){ @@ -495,13 +498,14 @@ editor.prototype.listen = function() { } } } - }else if((pos.y+1)*32 > editor.widthsX[spriter][3]) - pos.y = ~~(editor.widthsX[spriter][3]/32)-1; + }else if((pos.y+1)*ysize > editor.widthsX[spriter][3]) + pos.y = ~~(editor.widthsX[spriter][3]/ysize)-1; selectBox.isSelected = true; // console.log(pos,editor.material.images[pos.images].height) dataSelection.style.left = pos.x*32 +'px'; - dataSelection.style.top = pos.y*32 +'px'; + dataSelection.style.top = pos.y*ysize +'px'; + dataSelection.style.height = ysize-6+'px'; if(pos.x==0&&pos.y==0){ // editor.info={idnum:0, id:'empty','images':'清除块', 'y':0}; diff --git a/_server/editor_mode.js b/_server/editor_mode.js index 36cb07e0..555a7ab7 100644 --- a/_server/editor_mode.js +++ b/_server/editor_mode.js @@ -333,7 +333,7 @@ editor_mode.prototype.listen = function(callback){ var saveFloor = document.getElementById('saveFloor'); saveFloor.onclick = function(){ editor_mode.onmode(''); - editor.file.saveFloorFile(function(err){if(err){printe(err);throw(err)}}); + editor.file.saveFloorFile(function(err){if(err){printe(err);throw(err)};printf('保存成功');}); } var saveFloorAs = document.getElementById('saveFloorAs'); @@ -344,7 +344,7 @@ editor_mode.prototype.listen = function(callback){ editor.file.saveFloorFileAs(saveAsName.value,function(err){ if(err){printe(err);throw(err)} core.floorIds.push(saveAsName.value); - editor.file.editTower([['change',"['main']['floorIds']",core.floorIds]],function(objs_){console.log(objs_);if(objs_.slice(-1)[0]!=null){printe(objs_.slice(-1)[0]);throw(objs_.slice(-1)[0])}}); + editor.file.editTower([['change',"['main']['floorIds']",core.floorIds]],function(objs_){console.log(objs_);if(objs_.slice(-1)[0]!=null){printe(objs_.slice(-1)[0]);throw(objs_.slice(-1)[0])};printe('另存为成功,请F5刷新编辑器生效');}); }); } @@ -358,12 +358,13 @@ editor_mode.prototype.listen = function(callback){ var selectAppend = document.getElementById('selectAppend'); var selectAppend_str=[]; - ["terrains", "animates", "enemys", "items", "npcs"].forEach(function(image){ + ["terrains", "animates", "enemys", "enemy48", "items", "npcs", "npc48"].forEach(function(image){ selectAppend_str.push(["\n'].join('')); }); selectAppend.innerHTML=selectAppend_str.join(''); selectAppend.onchange = function(){ var value = selectAppend.value; + var ysize = selectAppend.value.indexOf('48')===-1?32:48; editor_mode.appendPic.imageName = value; var img = editor.material.images[value]; editor_mode.appendPic.toImg = img; @@ -372,7 +373,7 @@ editor_mode.prototype.listen = function(callback){ editor_mode.appendPic.index = 0; var selectStr = ''; for(var ii=0;ii追加素材

- +

@@ -153,6 +153,7 @@
+
@@ -302,8 +303,9 @@
- + +