jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227

Browse Source 
# Conflicts:
#	libs/events.js
This commit is contained in:
YouWei Zhao 2018-03-03 15:00:11 +08:00
commit 68c516d41d
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/core.js
View File

@ -1124,7 +1124,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)
@ -1151,15 +1152,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);

24
libs/thirdparty/LICENSE.md vendored Normal file
View File

@ -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.

2
project/functions.js
View File

@ -32,7 +32,7 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.drawText([
"\t[恭喜通关]你的分数是${status:hp}。"
], function () {
core.events.gameOver('', replaying);
core.events.gameOver(reason||'', replaying);
})
});
},