This commit is contained in:
YouWei Zhao 2018-05-11 16:26:27 +08:00
parent b5c9df41a8
commit 932bbfd60b
2 changed files with 114 additions and 12 deletions

View File

@ -348,6 +348,7 @@ editor.prototype.updateMap = function () {
} else drawTile(eventCtx, x, y, tileInfo); } else drawTile(eventCtx, x, y, tileInfo);
} }
// 绘制地图 end // 绘制地图 end
} }
editor.prototype.changeFloor = function (floorId, callback) { editor.prototype.changeFloor = function (floorId, callback) {
@ -431,9 +432,9 @@ editor.prototype.listen = function () {
eui.onmousedown = function (e) { eui.onmousedown = function (e) {
if (e.button==2){ if (e.button==2){
editor.showMidMenu(e.clientX,e.clientY);
var loc = eToLoc(e); var loc = eToLoc(e);
var pos = locToPos(loc); var pos = locToPos(loc);
editor.showMidMenu(e.clientX,e.clientY);
return; return;
} }
if (!selectBox.isSelected) { if (!selectBox.isSelected) {
@ -442,7 +443,7 @@ editor.prototype.listen = function () {
editor_mode.onmode('nextChange'); editor_mode.onmode('nextChange');
editor_mode.onmode('loc'); editor_mode.onmode('loc');
//editor_mode.loc(); //editor_mode.loc();
tip.whichShow = 1; //tip.whichShow = 1;
return; return;
} }
@ -460,7 +461,7 @@ editor.prototype.listen = function () {
eui.onmousemove = function (e) { eui.onmousemove = function (e) {
if (!selectBox.isSelected) { if (!selectBox.isSelected) {
// tip.whichShow = 1; //tip.whichShow = 1;
return; return;
} }
@ -491,7 +492,7 @@ editor.prototype.listen = function () {
eui.onmouseup = function (e) { eui.onmouseup = function (e) {
if (!selectBox.isSelected) { if (!selectBox.isSelected) {
tip.whichShow = 1; //tip.whichShow = 1;
return; return;
} }
holdingPath = 0; holdingPath = 0;
@ -613,13 +614,33 @@ editor.prototype.listen = function () {
var midMenu=document.getElementById('midMenu'); var midMenu=document.getElementById('midMenu');
midMenu.oncontextmenu=function(e){e.preventDefault()} midMenu.oncontextmenu=function(e){e.preventDefault()}
editor.lastRightButtonPos=[{x:0,y:0},{x:0,y:0}];
editor.showMidMenu=function(x,y){ editor.showMidMenu=function(x,y){
editor.lastRightButtonPos=JSON.parse(JSON.stringify(
[editor.pos,editor.lastRightButtonPos[0]]
));
var locStr='('+editor.lastRightButtonPos[1].x+','+editor.lastRightButtonPos[1].y+')';
var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft; var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
var scrollTop = document.documentElement.scrollTop || document.body.scrollTop; var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
copyLoc.children[0].innerHTML='复制此事件到'+locStr;
moveLoc.children[0].innerHTML='移动此事件到'+locStr;
midMenu.style='top:'+(y+scrollTop)+'px;left:'+(x+scrollLeft)+'px;'; midMenu.style='top:'+(y+scrollTop)+'px;left:'+(x+scrollLeft)+'px;';
} }
editor.hideMidMenu=function(){midMenu.style='display:none';} editor.hideMidMenu=function(){midMenu.style='display:none';}
var chooseThis = document.getElementById('chooseThis');
chooseThis.onmousedown = function(e){
editor.hideMidMenu();
e.stopPropagation();
selectBox.isSelected = false;
var loc = eToLoc(e);
var pos = locToPos(loc);
editor_mode.onmode('nextChange');
editor_mode.onmode('loc');
//editor_mode.loc();
//tip.whichShow = 1;
}
var chooseInRight = document.getElementById('chooseInRight'); var chooseInRight = document.getElementById('chooseInRight');
chooseInRight.onmousedown = function(e){ chooseInRight.onmousedown = function(e){
editor.hideMidMenu(); editor.hideMidMenu();
@ -627,7 +648,6 @@ editor.prototype.listen = function () {
var thisevent = editor.map[editor.pos.y][editor.pos.x]; var thisevent = editor.map[editor.pos.y][editor.pos.x];
var pos={x: 0, y: 0, images: "terrains"}; var pos={x: 0, y: 0, images: "terrains"};
var ysize = 32; var ysize = 32;
console.log(thisevent)
if(thisevent==0){ if(thisevent==0){
//选中清除块 //选中清除块
editor.info = 0; editor.info = 0;
@ -650,28 +670,108 @@ editor.prototype.listen = function () {
editor_mode.onmode('emenyitem'); editor_mode.onmode('emenyitem');
} }
var fields = Object.keys(editor.file.comment._data.floors._data.loc._data);
var copyLoc = document.getElementById('copyLoc'); var copyLoc = document.getElementById('copyLoc');
copyLoc.onmousedown = function(e){ copyLoc.onmousedown = function(e){
editor.hideMidMenu(); editor.hideMidMenu();
e.stopPropagation(); e.stopPropagation();
preMapData = null;
reDo = null;
var thisevent = editor.map[editor.pos.y][editor.pos.x]; var thisevent = editor.map[editor.pos.y][editor.pos.x];
if(thisevent==0){ if(thisevent==0){
editor.info = 0;
} else { } else {
var ids=editor.indexs[thisevent.idnum];
ids=ids[0]?ids[0]:ids;
editor.info=editor.ids[ids];
} }
editor_mode.onmode('');
var now = editor.pos;
var last = editor.lastRightButtonPos[1];
editor.map[last.y][last.x]=editor.info;
editor.updateMap();
fields.forEach(function(v){
editor.currentFloorData[v][last.x+','+last.y]=editor.currentFloorData[v][now.x+','+now.y]
})
editor.file.saveFloorFile(function (err) {
if (err) {
printe(err);
throw(err)
}
;printf('复制事件成功');
editor.drawEventBlock();
});
} }
var moveLoc = document.getElementById('moveLoc'); var moveLoc = document.getElementById('moveLoc');
moveLoc.onmousedown = function(e){ moveLoc.onmousedown = function(e){
editor.hideMidMenu(); editor.hideMidMenu();
e.stopPropagation(); e.stopPropagation();
preMapData = null;
reDo = null;
var thisevent = editor.map[editor.pos.y][editor.pos.x]; var thisevent = editor.map[editor.pos.y][editor.pos.x];
if(thisevent==0){ if(thisevent==0){
editor.info = 0;
} else { } else {
var ids=editor.indexs[thisevent.idnum];
ids=ids[0]?ids[0]:ids;
editor.info=editor.ids[ids];
} }
editor_mode.onmode('');
var now = editor.pos;
var last = editor.lastRightButtonPos[1];
var lastevent = editor.map[last.y][last.x];
var lastinfo = 0;
if(lastevent==0){
lastinfo = 0;
} else {
var ids=editor.indexs[lastevent.idnum];
ids=ids[0]?ids[0]:ids;
lastinfo=editor.ids[ids];
}
editor.map[last.y][last.x]=editor.info;
editor.map[now.y][now.x]=lastinfo;
editor.updateMap();
fields.forEach(function(v){
var temp_atsfcytaf=editor.currentFloorData[v][now.x+','+now.y];
editor.currentFloorData[v][now.x+','+now.y]=editor.currentFloorData[v][last.x+','+last.y];
editor.currentFloorData[v][last.x+','+last.y]=temp_atsfcytaf
})
editor.file.saveFloorFile(function (err) {
if (err) {
printe(err);
throw(err)
}
;printf('两位置的事件已互换');
editor.drawEventBlock();
});
}
var clearLoc = document.getElementById('clearLoc');
clearLoc.onmousedown = function(e){
editor.hideMidMenu();
e.stopPropagation();
preMapData = null;
reDo = null;
editor.info = 0;
editor_mode.onmode('');
var now = editor.pos;
editor.map[now.y][now.x]=editor.info;
editor.updateMap();
fields.forEach(function(v){
editor.currentFloorData[v][now.x+','+now.y]=null;
})
editor.file.saveFloorFile(function (err) {
if (err) {
printe(err);
throw(err)
}
;printf('清空此点及事件成功');
editor.drawEventBlock();
});
} }
}//绑定事件 }//绑定事件

View File

@ -268,9 +268,11 @@
</div> </div>
<div id="menuDiv"> <div id="menuDiv">
<div id="midMenu" style="display:none"> <div id="midMenu" style="display:none">
<div id='chooseInRight' class="menuitem"><div class="menuitem-content">在右侧选中</div></div> <div id='chooseThis' class="menuitem"><div class="menuitem-content">选中此点</div></div>
<div id='copyLoc' class="menuitem"><div class="menuitem-content">复制(未完成)</div></div> <div id='chooseInRight' class="menuitem"><div class="menuitem-content">在素材区选中此图块</div></div>
<div id='moveLoc' class="menuitem"><div class="menuitem-content">移动(未完成)</div></div> <div id='copyLoc' class="menuitem"><div class="menuitem-content">复制此事件</div></div>
<div id='moveLoc' class="menuitem"><div class="menuitem-content">移动此事件</div></div>
<div id='clearLoc' class="menuitem"><div class="menuitem-content">清空此点及事件</div></div>
</div> </div>
</div> </div>
</div> </div>