diff --git a/_server/editor.js b/_server/editor.js
index c2843696..ea23b9c7 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -20,7 +20,7 @@ function editor() {
chooseThis : document.getElementById('chooseThis'),
chooseInRight : document.getElementById('chooseInRight'),
copyLoc : document.getElementById('copyLoc'),
- moveLoc : document.getElementById('moveLoc'),
+ pasteLoc : document.getElementById('pasteLoc'),
clearEvent : document.getElementById('clearEvent'),
clearLoc : document.getElementById('clearLoc'),
brushMod:document.getElementById('brushMod'),
@@ -80,9 +80,6 @@ function editor() {
scrollBarHeight :0,
folded:false,
foldPerCol: 50,
- // 画图区菜单
- lastRightButtonPos:[{x:0,y:0},{x:0,y:0}],
- lastCopyedInfo : [null, null],
//
ratio : 1,
// blockly转义
diff --git a/_server/editor_listen.js b/_server/editor_listen.js
index 7a3b83b1..ebbf0369 100644
--- a/_server/editor_listen.js
+++ b/_server/editor_listen.js
@@ -32,7 +32,7 @@ editor_listen_wrapper = function (editor) {
editor.dom.chooseThis.onmousedown = editor.uifunctions.chooseThis_click
editor.dom.chooseInRight.onmousedown = editor.uifunctions.chooseInRight_click
editor.dom.copyLoc.onmousedown = editor.uifunctions.copyLoc_click
- editor.dom.moveLoc.onmousedown = editor.uifunctions.moveLoc_click
+ editor.dom.pasteLoc.onmousedown = editor.uifunctions.pasteLoc_click
editor.dom.clearEvent.onmousedown = editor.uifunctions.clearEvent_click
editor.dom.clearLoc.onmousedown = editor.uifunctions.clearLoc_click
@@ -130,8 +130,8 @@ editor_listen_wrapper = function (editor) {
editor.dom.chooseInRight.onmousedown = null
editor.dom.copyLoc.ontouchstart = editor.dom.copyLoc.onmousedown
editor.dom.copyLoc.onmousedown = null
- editor.dom.moveLoc.ontouchstart = editor.dom.moveLoc.onmousedown
- editor.dom.moveLoc.onmousedown = null
+ editor.dom.pasteLoc.ontouchstart = editor.dom.pasteLoc.onmousedown
+ editor.dom.pasteLoc.onmousedown = null
editor.dom.clearLoc.ontouchstart = editor.dom.clearLoc.onmousedown
editor.dom.clearLoc.onmousedown = null
diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js
index f2f850ac..854514d2 100644
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@@ -342,12 +342,7 @@ editor_mappanel_wrapper = function (editor) {
* 显示右键菜单
*/
editor.uifunctions.showMidMenu = function (x, y) {
- editor.uivalues.lastRightButtonPos = JSON.parse(JSON.stringify(
- [editor.pos, editor.uivalues.lastRightButtonPos[0]]
- ));
// --- copy
- editor.uivalues.lastCopyedInfo = [editor.copyFromPos(), editor.uivalues.lastCopyedInfo[0]];
- var locStr = '(' + editor.uivalues.lastRightButtonPos[1].x + ',' + editor.uivalues.lastRightButtonPos[1].y + ')';
var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
@@ -386,8 +381,8 @@ editor_mappanel_wrapper = function (editor) {
else editor.dom.extraEvent.style.display = 'none';
editor.dom.chooseThis.children[0].innerHTML = '选中此点' + '(' + editor.pos.x + ',' + editor.pos.y + ')'
- editor.dom.copyLoc.children[0].innerHTML = '复制事件' + locStr + '到此处';
- editor.dom.moveLoc.children[0].innerHTML = '交换事件' + locStr + '与此事件的位置';
+ editor.dom.copyLoc.children[0].innerHTML = '复制此事件';
+ editor.dom.pasteLoc.children[0].innerHTML = '粘贴到此事件';
editor.dom.midMenu.style = 'top:' + (y + scrollTop) + 'px;left:' + (x + scrollLeft) + 'px;';
}
@@ -568,34 +563,39 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.copyLoc_click = function (e) {
editor.uifunctions.hideMidMenu();
e.stopPropagation();
+ e.preventDefault();
+ editor_mode.onmode('');
+ editor.uivalues.copyedInfo = editor.copyFromPos();
+ printf('该点事件已复制');
+ return;
+ }
+
+ /**
+ * editor.dom.pasteLoc.onmousedown
+ * 菜单 移动此事件
+ */
+ editor.uifunctions.pasteLoc_click = function (e) {
+ editor.uifunctions.hideMidMenu();
+ e.stopPropagation();
+ e.preventDefault();
+ if (!editor.uivalues.copyedInfo) {
+ printe("没有复制的事件");
+ return;
+ }
editor.savePreMap();
editor_mode.onmode('');
- var now = editor.pos, last = editor.uivalues.lastRightButtonPos[1];
- if (now.x == last.x && now.y == last.y) return;
- editor.pasteToPos(editor.uivalues.lastCopyedInfo[1]);
+ editor.pasteToPos(editor.uivalues.copyedInfo);
editor.updateMap();
editor.file.saveFloorFile(function (err) {
if (err) {
printe(err);
throw (err)
}
- ; printf('复制事件成功');
+ ; printf('粘贴到事件成功');
editor.uifunctions.unhighlightSaveFloorButton();
editor.drawPosSelection();
});
- }
-
- /**
- * editor.dom.moveLoc.onmousedown
- * 菜单 移动此事件
- */
- editor.uifunctions.moveLoc_click = function (e) {
- editor.uifunctions.hideMidMenu();
- e.stopPropagation();
- editor.savePreMap();
- editor_mode.onmode('');
- editor.exchangePos(editor.pos, editor.uivalues.lastRightButtonPos[1]);
- editor.uifunctions.unhighlightSaveFloorButton();
+ return;
}
/**
diff --git a/editor-mobile.html b/editor-mobile.html
index b82d63df..d5a712f2 100644
--- a/editor-mobile.html
+++ b/editor-mobile.html
@@ -367,7 +367,7 @@
-
+
diff --git a/editor.html b/editor.html
index 5c00ccf8..3a4ffe01 100644
--- a/editor.html
+++ b/editor.html
@@ -390,7 +390,7 @@
-
+
diff --git a/v2.x-final更新.txt b/v2.x-final更新.txt
index a66af87d..bec76390 100644
--- a/v2.x-final更新.txt
+++ b/v2.x-final更新.txt
@@ -61,7 +61,7 @@
（已完成！） 难度分歧的图块（颜色，含SL界面）
（已完成！） 装备同时加属性和比例
（已完成！） removeMap和resumeMap
-右键图块选择复制/粘贴事件
+（已完成！） 右键图块选择复制/粘贴事件
（已完成！） showImage, drawImage，立绘等加上对称选项
更多的图块blockly化