From f2f2f3bd190b01133b055597d494e969c0be8c24 Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 28 Sep 2018 10:44:55 +0800 Subject: [PATCH] AfterBattle Animate --- libs/events.js | 12 ------------ project/functions.js | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libs/events.js b/libs/events.js index e7246359..aab2a7d1 100644 --- a/libs/events.js +++ b/libs/events.js @@ -1137,18 +1137,6 @@ events.prototype.battle = function (id, x, y, force, callback) { }); } else { - - var nowEquipment = 'hand'; - if (core.flags.equipment) { - var equipId = (core.status.hero.equipment||[])[0]; - if (core.isset(equipId) && core.isset(core.material.items[equipId]) - && core.isset(core.material.items[equipId].equip.animate)) - nowEquipment = core.material.items[equipId].equip.animate; - } - - core.playSound('attack.mp3'); - core.drawAnimate(nowEquipment, x, y); - core.events.afterBattle(id, x, y, callback); } } diff --git a/project/functions.js b/project/functions.js index de58713f..4405a44b 100644 --- a/project/functions.js +++ b/project/functions.js @@ -119,6 +119,17 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = var enemy = core.material.enemys[enemyId]; + // 播放战斗音效和动画 + var equipAnimate = 'hand'; + if (core.flags.equipment) { + var equipId = (core.status.hero.equipment||[])[0]; + if (core.isset(equipId) && core.isset(core.material.items[equipId]) + && core.isset(core.material.items[equipId].equip.animate)) + equipAnimate = core.material.items[equipId].equip.animate; + } + core.playSound('attack.mp3'); + core.drawAnimate(equipAnimate, x, y); + var damage = core.enemys.getDamage(enemyId); if (damage == null) damage = core.status.hero.hp+1;