From 90b36b3d2747ab659f414613966972178c8931e9 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Wed, 28 Feb 2018 21:04:27 +0800 Subject: [PATCH 1/4] Fix Small Bug --- libs/core.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/core.js b/libs/core.js index e81ba5df..1d0a4a85 100644 --- a/libs/core.js +++ b/libs/core.js @@ -1119,7 +1119,8 @@ core.prototype.keyUp = function(keyCode) { core.openBook(true); break; case 65: // A - core.doSL("autoSave", "load"); + if (core.status.heroStop) + core.doSL("autoSave", "load"); break; case 83: // S if (core.status.heroStop) @@ -1146,15 +1147,15 @@ core.prototype.keyUp = function(keyCode) { core.openQuickShop(true); break; case 32: // SPACE - if (!core.status.lockControl && core.status.heroStop) + if (core.status.heroStop) core.getNextItem(); break; case 72: // H - if (!core.status.lockControl && core.status.heroStop) + if (core.status.heroStop) core.ui.drawHelp(); break; case 82: // R - if (!core.status.lockControl && core.status.heroStop) { + if (core.status.heroStop) { core.ui.drawConfirmBox("确定要回放录像吗?", function () { core.ui.closePanel(); var hard=core.status.hard, route=core.clone(core.status.route); From 8c484d84d983ba89089f23e9a5a210e437903e82 Mon Sep 17 00:00:00 2001 From: YouWei Zhao Date: Thu, 1 Mar 2018 16:00:38 +0800 Subject: [PATCH 2/4] fix bug --- _server/blockly/MotaAction.g4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index 385f166e..100ad796 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -840,8 +840,8 @@ var ops = { } if (ops[Arithmetic_List_0])code = ops[Arithmetic_List_0]; var orders = { - '+': Blockly.JavaScript.ORDER_UNARY_PLUS, - '-': Blockly.JavaScript.ORDER_UNARY_NEGATION, + '+': Blockly.JavaScript.ORDER_ADDITION, + '-': Blockly.JavaScript.ORDER_SUBTRACTION, '*': Blockly.JavaScript.ORDER_MULTIPLICATION, '/': Blockly.JavaScript.ORDER_DIVISION, '^': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA From b1d9144e52c01e1d420719ec530076293bd59995 Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 2 Mar 2018 13:01:47 +0800 Subject: [PATCH 3/4] Add Mid License --- libs/thirdparty/LICENSE.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 libs/thirdparty/LICENSE.md diff --git a/libs/thirdparty/LICENSE.md b/libs/thirdparty/LICENSE.md new file mode 100644 index 00000000..33ec4fdc --- /dev/null +++ b/libs/thirdparty/LICENSE.md @@ -0,0 +1,24 @@ +Copyright (c) 2010, Matt Westcott & Ben Firshman +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * The names of its contributors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file From 4e69b4ee102f63fb5334be56a54e269bab055b9a Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Fri, 2 Mar 2018 21:02:04 +0800 Subject: [PATCH 4/4] Win End --- libs/events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/events.js b/libs/events.js index 461f18b5..2136f5fc 100644 --- a/libs/events.js +++ b/libs/events.js @@ -133,7 +133,7 @@ events.prototype.win = function(reason) { core.drawText([ "\t[恭喜通关]你的分数是${status:hp}。" ], function () { - core.events.gameOver('', replaying); + core.events.gameOver(reason||'', replaying); }) }); }