diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4 index 404dd85e..b539e562 100644 --- a/_server/MotaAction.g4 +++ b/_server/MotaAction.g4 @@ -3928,7 +3928,7 @@ IdString ; FixedId_List - : '生命'|'生命上限'|'攻击'|'防御'|'护盾'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'|'魔力'|'魔力上限'|'横坐标'|'纵坐标'|'当前朝向'|'攻击增益'|'防御增益'|'护盾增益' + : '生命'|'生命上限'|'攻击'|'防御'|'护盾'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'|'魔力'|'魔力上限'|'当前横坐标'|'当前纵坐标'|'当前朝向'|'攻击增益'|'防御增益'|'护盾增益' /*FixedId_List ['status:hp','status:hpmax','status:atk','status:def','status:mdef','item:yellowKey','item:blueKey','item:redKey','status:money','status:exp','status:mana','status:manamax','status:x','status:y','status:direction','buff:atk','buff:def','buff:mdef']*/; Id_List diff --git a/libs/events.js b/libs/events.js index cc9fd64d..e765107a 100644 --- a/libs/events.js +++ b/libs/events.js @@ -2066,7 +2066,7 @@ events.prototype.__action_choices_replaying = function (data, index) { var choice = data.choices[index]; if (choice.need != null && choice.need != '' && !core.calValue(choice.need)) { // 无法选择此项 - core.control._replay_error(action); + core.control._replay_error("无法选择项:"+index); return; } else { core.insertAction(choice.action); diff --git a/project/sounds/cancel.mp3 b/project/sounds/cancel.mp3 index f08449ed..b0eb456b 100644 Binary files a/project/sounds/cancel.mp3 and b/project/sounds/cancel.mp3 differ diff --git a/project/sounds/cursor.mp3 b/project/sounds/cursor.mp3 index dc3a7219..652bf075 100644 Binary files a/project/sounds/cursor.mp3 and b/project/sounds/cursor.mp3 differ diff --git a/project/sounds/open_ui.mp3 b/project/sounds/open_ui.mp3 index c648d526..0282a089 100644 Binary files a/project/sounds/open_ui.mp3 and b/project/sounds/open_ui.mp3 differ diff --git a/project/sounds/recovery.mp3 b/project/sounds/recovery.mp3 index a4bb6176..09075e04 100644 Binary files a/project/sounds/recovery.mp3 and b/project/sounds/recovery.mp3 differ diff --git a/project/sounds/shop.mp3 b/project/sounds/shop.mp3 index 905ae3df..b654aa21 100644 Binary files a/project/sounds/shop.mp3 and b/project/sounds/shop.mp3 differ