From f2796b1bd03158948ca5926ea61c1720953b91f5 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Tue, 4 Jun 2019 01:56:20 +0800
Subject: [PATCH] move, copy, cut and paste blocks

---
 _server/editor_unsorted_1.js | 12 +++++++++---
 _server/editor_unsorted_3.js |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/_server/editor_unsorted_1.js b/_server/editor_unsorted_1.js
index 31381e02..d0623f6f 100644
--- a/_server/editor_unsorted_1.js
+++ b/_server/editor_unsorted_1.js
@@ -403,19 +403,19 @@ editor.constructor.prototype.listen=function () {
             return;
         }
         // Ctrl+C, Ctrl+X, Ctrl+V
-        if (e.ctrlKey && e.keyCode == 67) {
+        if (e.ctrlKey && e.keyCode == 67 && !selectBox.isSelected()) {
             copyedInfo = editor.copyFromPos();
             printf('该点事件已复制');
             return;
         }
-        if (e.ctrlKey && e.keyCode == 88) {
+        if (e.ctrlKey && e.keyCode == 88 && !selectBox.isSelected()) {
             copyedInfo = editor.copyFromPos();
             editor.clearPos(true, null, function () {
                 printf('该点事件已剪切');
             })
             return;
         }
-        if (e.keyCode == 86) {
+        if (e.ctrlKey && e.keyCode == 86 && !selectBox.isSelected()) {
             if (!copyedInfo) {
                 printe("没有复制的事件");
                 return;
@@ -432,6 +432,12 @@ editor.constructor.prototype.listen=function () {
             });
             return;
         }
+        // DELETE
+        if (e.keyCode == 46 && !selectBox.isSelected()) {
+            editor.clearPos(true);
+            return;
+        }
+        // ESC
         if (e.keyCode == 27) {
             if (selectBox.isSelected()) {
                 editor_mode.onmode('');
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 11e40ea2..fd6ec89e 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -215,7 +215,7 @@ tip.showHelp = function(value) {
         'ESC或点击空白处可以自动保存当前修改',
         'H键可以打开操作帮助哦',
         'tileset贴图模式下可以按选中tileset素材，并在地图上拖动来一次绘制一个区域',
-        '可以拖动地图上的图块和事件，或按Ctrl+C, Ctrl+X和Ctrl+V进行复制，剪切和粘贴'
+        '可以拖动地图上的图块和事件，或按Ctrl+C, Ctrl+X和Ctrl+V进行复制，剪切和粘贴，Delete删除'
     ];
     if (value == null) value = Math.floor(Math.random() * tips.length);
     printf('tips: ' + tips[value])