diff --git a/libs/actions.js b/libs/actions.js index 5b4fff35..8f935115 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -2597,6 +2597,12 @@ actions.prototype.setPaintMode = function (mode) { core.drawTip("进入"+(core.status.event.data.erase?"擦除":"绘图")+"模式"); } +actions.prototype.clearPaint = function () { + core.clearMap('route'); + core.paint[core.status.floorId] = null; + core.drawTip("已清空绘图内容"); +} + actions.prototype.savePaint = function () { var data = {}; for (var floorId in core.paint) { @@ -2639,7 +2645,6 @@ actions.prototype.exitPaint = function () { core.clearMap('route'); core.ui.closePanel(); core.statusBar.image.shop.style.opacity = 1; - core.statusBar.image.toolbox.style.opacity = 1; core.updateStatusBar(); core.drawTip("退出绘图模式"); } diff --git a/libs/ui.js b/libs/ui.js index 9636e447..d66d1500 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -2460,10 +2460,10 @@ ui.prototype.drawPaint = function () { core.setStrokeStyle('route', '#FF0000'); core.statusBar.image.shop.style.opacity = 0; - core.statusBar.image.toolbox.style.opacity = 0; core.statusBar.image.book.src = core.statusBar.icons.paint.src; core.statusBar.image.fly.src = core.statusBar.icons.erase.src; + core.statusBar.image.toolbox.src = core.statusBar.icons.delete.src; core.statusBar.image.settings.src = core.statusBar.icons.exit.src; core.statusBar.image.book.style.opacity = 1; core.statusBar.image.fly.style.opacity = 1; diff --git a/main.js b/main.js index cee1293a..01bf184b 100644 --- a/main.js +++ b/main.js @@ -130,7 +130,8 @@ function main() { 'skill': 25, 'paint': 26, 'erase': 27, - 'exit': 28, + 'delete': 28, + 'exit': 29, }, 'floor': document.getElementById('floor'), 'name': document.getElementById('name'), @@ -451,6 +452,11 @@ main.statusBar.image.toolbox.onclick = function () { return; } + if (main.core.isPlaying() && (core.status.event||{}).id=='paint') { + core.actions.clearPaint(); + return; + } + if (main.core.isPlaying()) { main.core.openToolbox(core.status.event.id != 'equipbox'); } diff --git a/project/images/delete (1).png b/project/images/delete (1).png new file mode 100644 index 00000000..aee5e505 Binary files /dev/null and b/project/images/delete (1).png differ diff --git a/project/images/delete.png b/project/images/delete.png new file mode 100644 index 00000000..98cd24f0 Binary files /dev/null and b/project/images/delete.png differ diff --git a/project/images/icons.png b/project/images/icons.png index 538a2c8f..75301f33 100644 Binary files a/project/images/icons.png and b/project/images/icons.png differ