From 2a0568ae6cefd1ba8158e57ebc553084e8b15da2 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Mon, 3 Dec 2018 14:22:40 +0800 Subject: [PATCH] moveSpeed --- _server/blockly/MotaAction.g4 | 4 ++-- _server/data.comment.js | 5 ++--- docs/event.md | 2 +- libs/control.js | 6 +++--- libs/events.js | 7 +------ project/data.js | 2 +- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index 5e58167f..9d663fff 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -1672,8 +1672,8 @@ Global_Attribute_List /*Global_Attribute_List ['font','statusLeftBackground','statusTopBackground', 'toolsBackground', 'borderColor', 'statusBarColor', 'hardLabelColor', 'floorChangingBackground', 'floorChangingTextColor']*/; Global_Value_List - : '血网伤害'|'中毒伤害'|'衰弱效果'|'红宝石效果'|'蓝宝石效果'|'绿宝石效果'|'红血瓶效果'|'蓝血瓶效果'|'黄血瓶效果'|'绿血瓶效果'|'破甲比例'|'反击比例'|'净化比例'|'仇恨增加值'|'最大合法HP'|'动画时间' - /*Global_Value_List ['lavaDamage','poisonDamage','weakValue', 'redJewel', 'blueJewel', 'greenJewel', 'redPotion', 'bluePotion', 'yellowPotion', 'greenPotion', 'breakArmor', 'counterAttack', 'purify', 'hatred', 'maxValidHp', 'animateSpeed']*/; + : '血网伤害'|'中毒伤害'|'衰弱效果'|'红宝石效果'|'蓝宝石效果'|'绿宝石效果'|'红血瓶效果'|'蓝血瓶效果'|'黄血瓶效果'|'绿血瓶效果'|'破甲比例'|'反击比例'|'净化比例'|'仇恨增加值'|'行走速度'|'动画时间' + /*Global_Value_List ['lavaDamage','poisonDamage','weakValue', 'redJewel', 'blueJewel', 'greenJewel', 'redPotion', 'bluePotion', 'yellowPotion', 'greenPotion', 'breakArmor', 'counterAttack', 'purify', 'hatred', 'moveSpeed', 'animateSpeed']*/; Bool: 'TRUE' | 'FALSE' diff --git a/_server/data.comment.js b/_server/data.comment.js index c3262c4d..300a5fc0 100644 --- a/_server/data.comment.js +++ b/_server/data.comment.js @@ -380,11 +380,10 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = "_type": "textarea", "_data": "仇恨属性中，每杀死一个怪物获得的仇恨值" }, - "maxValidHp": { + "moveSpeed": { "_leaf": true, "_type": "textarea", - "_range": "thiseval==null||thiseval>0", - "_data": "最大合法生命值；如果此项不为null且用户通关血量超过本值，则视为作弊，不上传成绩" + "_data": "行走速度，即勇士每走一格的时间，一般100比较合适" }, "animateSpeed": { "_leaf": true, diff --git a/docs/event.md b/docs/event.md index 0b376eb2..8fa1798f 100644 --- a/docs/event.md +++ b/docs/event.md @@ -441,7 +441,7 @@ value为必填项，代表要修改到的结果。此项无需再手动加单引 name必填项，代表要修改的全局数值，其和全塔属性中的values一一对应。目前只能为`"lavaDamage", "poisonDamage", "weakValue", "redJewel", "blueJewel", "greenJewel", "redPotion", "bluePotion", "yellowPotion", "greenPotion", "breakArmor", "counterAttack", -"purify", "hatred", "maxValidHp", "animateSpeed"`。 +"purify", "hatred", "moveSpeed", "animateSpeed"`。 value为必填项，代表要修改到的结果。该项必须是个数值。 diff --git a/libs/control.js b/libs/control.js index 72758e6d..bd4de898 100644 --- a/libs/control.js +++ b/libs/control.js @@ -465,7 +465,7 @@ control.prototype.setAutomaticRoute = function (destX, destY, stepPostfix) { core.control.tryMoveDirectly(destX, destY); } core.status.automaticRoute.moveDirectly = false; - }, 100); + }, core.values.moveSpeed || 100); } return; } @@ -714,7 +714,7 @@ control.prototype.setHeroMoveInterval = function (direction, x, y, callback) { core.status.heroMoving = 0; if (core.isset(callback)) callback(); } - }, 12.5 * toAdd / core.status.replay.speed); + }, (core.values.moveSpeed||100) / 8 * toAdd / core.status.replay.speed); } ////// 实际每一步的行走过程 ////// @@ -857,7 +857,7 @@ control.prototype.moveHero = function (direction, callback) { /////// 使用事件让勇士移动。这个函数将不会触发任何事件 ////// control.prototype.eventMoveHero = function(steps, time, callback) { - time = time || 100; + time = time || core.values.moveSpeed || 100; // 要运行的轨迹：将steps展开 var moveSteps=[]; diff --git a/libs/events.js b/libs/events.js index 30d82948..86978527 100644 --- a/libs/events.js +++ b/libs/events.js @@ -307,12 +307,7 @@ events.prototype.gameOver = function (ending, fromReplay, norank) { } else { - if (core.isset(core.values.maxValidHp) && core.status.hero.hp>core.values.maxValidHp) { - core.drawText("作弊可耻！", function () { - core.restart(); - }); - } - else if (core.hasFlag('debug')) { + if (core.hasFlag('debug')) { core.drawText("\t[系统提示]调试模式下无法上传成绩", function () { core.restart(); }) diff --git a/project/data.js b/project/data.js index 107c1140..9b4ac12e 100644 --- a/project/data.js +++ b/project/data.js @@ -337,7 +337,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "counterAttack": 0.1, "purify": 3, "hatred": 2, - "maxValidHp": null, + "moveSpeed": 100, "animateSpeed": 300 }, "flags": {