From cd45e69ab08409934d6264abd60b6d5f67586688 Mon Sep 17 00:00:00 2001 From: oc Date: Sun, 22 Jul 2018 22:47:19 +0800 Subject: [PATCH 1/2] V2.3.3 --- README.md | 1 + _server/blockly/MotaAction.g4 | 8 ++++---- libs/events.js | 15 ++++++--------- project/functions.js | 4 ++-- 更新说明.txt | 1 + 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 6b1eb5c6..d95e7847 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ HTML5 canvas制作的魔塔样板，支持全平台游戏！ * [x] 事件：画面震动 * [x] 事件：更新怪物数据 * [x] 移动事件和跳跃事件增加“不消失”选项 +* [x] 获胜结局可以指定“不计入榜单” * [x] 修改默认bgm * [x] 修复读档开启战斗动画等Bug * [x] 大量细节优化 diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index c35e3b0d..527d906d 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -969,14 +969,14 @@ return code; */; win_s - : '游戏胜利,结局' ':' EvalString? Newline + : '游戏胜利,结局' ':' EvalString? '不计入榜单' Bool Newline /* win_s tooltip : win: 获得胜利, 该事件会显示获胜页面, 并重新游戏 helpUrl : https://ckcz123.github.io/mota-js/#/event?id=win%EF%BC%9A%E8%8E%B7%E5%BE%97%E8%83%9C%E5%88%A9 -default : [""] -var code = '{"type": "win", "reason": "'+EvalString_0+'"},\n'; +default : ["",false] +var code = '{"type": "win", "reason": "'+EvalString_0+'", "norank": '+Bool_0+'},\n'; return code; */; @@ -1717,7 +1717,7 @@ ActionParser.prototype.parseAction = function() { break; case "win": this.next = MotaActionBlocks['win_s'].xmlText([ - data.reason,this.next]); + data.reason,data.norank||false,this.next]); break; case "lose": this.next = MotaActionBlocks['lose_s'].xmlText([ diff --git a/libs/events.js b/libs/events.js index e0de00a3..9111d843 100644 --- a/libs/events.js +++ b/libs/events.js @@ -115,8 +115,8 @@ events.prototype.setInitData = function (hard) { } ////// 游戏获胜事件 ////// -events.prototype.win = function (reason) { - return this.eventdata.win(reason); +events.prototype.win = function (reason, norank) { + return this.eventdata.win(reason, norank); } ////// 游戏失败事件 ////// @@ -125,7 +125,7 @@ events.prototype.lose = function (reason) { } ////// 游戏结束 ////// -events.prototype.gameOver = function (ending, fromReplay) { +events.prototype.gameOver = function (ending, fromReplay, norank) { // 清空图片和天气 core.clearMap('animate', 0, 0, 416, 416); @@ -188,6 +188,7 @@ events.prototype.gameOver = function (ending, fromReplay) { formData.append('money', core.status.hero.money); formData.append('experience', core.status.hero.experience); formData.append('steps', core.status.hero.steps); + formData.append('norank', norank||0); formData.append('seed', core.getFlag('seed')); formData.append('totalTime', Math.floor(core.status.hero.statistics.totalTime/1000)); formData.append('route', core.encodeRoute(core.status.route)); @@ -776,14 +777,10 @@ events.prototype.doAction = function() { this.doAction(); break; case "win": - core.events.win(data.reason, function () { - core.events.doAction(); - }); + core.events.win(data.reason, data.norank); break; case "lose": - core.events.lose(data.reason, function () { - core.events.doAction(); - }); + core.events.lose(data.reason); break; case "function": { diff --git a/project/functions.js b/project/functions.js index da43dd86..9bd9eda5 100644 --- a/project/functions.js +++ b/project/functions.js @@ -50,7 +50,7 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = core.events.afterLoadData(); }, ////// 游戏获胜事件 ////// -"win" : function(reason) { +"win" : function(reason, norank) { // 游戏获胜事件 core.ui.closePanel(); var replaying = core.status.replay.replaying; @@ -61,7 +61,7 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = core.drawText([ "\t[" + (reason||"恭喜通关") + "]你的分数是${status:hp}。" ], function () { - core.events.gameOver(reason||'', replaying); + core.events.gameOver(reason||'', replaying, norank); }) }); }, diff --git a/更新说明.txt b/更新说明.txt index b87b73da..acdc3a25 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -6,6 +6,7 @@ 事件：画面震动 事件：更新怪物数据 移动事件和跳跃事件增加“不消失”选项 +获胜结局可以指定“不计入榜单” 修改默认bgm 修复读档开启战斗动画等Bug 大量细节优化 From e5885a70b3a539f2211b518bdab0dae08b95cbc5 Mon Sep 17 00:00:00 2001 From: oc Date: Sun, 22 Jul 2018 22:57:27 +0800 Subject: [PATCH 2/2] V2.3.3 --- _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 527d906d..3a19e2ac 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -976,7 +976,7 @@ win_s tooltip : win: 获得胜利, 该事件会显示获胜页面, 并重新游戏 helpUrl : https://ckcz123.github.io/mota-js/#/event?id=win%EF%BC%9A%E8%8E%B7%E5%BE%97%E8%83%9C%E5%88%A9 default : ["",false] -var code = '{"type": "win", "reason": "'+EvalString_0+'", "norank": '+Bool_0+'},\n'; +var code = '{"type": "win", "reason": "'+EvalString_0+'", "norank": '+(Bool_0?1:0)+'},\n'; return code; */; @@ -1717,7 +1717,7 @@ ActionParser.prototype.parseAction = function() { break; case "win": this.next = MotaActionBlocks['win_s'].xmlText([ - data.reason,data.norank||false,this.next]); + data.reason,data.norank?true:false,this.next]); break; case "lose": this.next = MotaActionBlocks['lose_s'].xmlText([