From e318c26e651e0f7661aefbe0a5dd455cab2a7782 Mon Sep 17 00:00:00 2001 From: oc Date: Mon, 25 Jun 2018 01:09:49 +0800 Subject: [PATCH] Jump --- libs/control.js | 2 ++ libs/events.js | 2 ++ libs/maps.js | 2 +- project/data.js | 2 +- project/sounds/jump.mp3 | Bin 0 -> 5895 bytes 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 project/sounds/jump.mp3 diff --git a/libs/control.js b/libs/control.js index 709c3d55..f1b2c5b6 100644 --- a/libs/control.js +++ b/libs/control.js @@ -863,6 +863,8 @@ control.prototype.jumpHero = function (ex, ey, time, callback) { core.setAlpha('ui', 1.0); core.status.replay.animate=true; + core.playSound('jump.mp3'); + var dx = ex-sx, dy=ey-sy, distance = Math.round(Math.sqrt(dx * dx + dy * dy)); var jump_peak = 6 + distance, jump_count = jump_peak * 2; var currx = sx, curry = sy; diff --git a/libs/events.js b/libs/events.js index 9f639825..d69b7a4c 100644 --- a/libs/events.js +++ b/libs/events.js @@ -85,12 +85,14 @@ events.prototype.startGame = function (hard) { if (core.flags.showBattleAnimateConfirm) { // 是否提供“开启战斗动画”的选择项 core.status.event.selection = core.flags.battleAnimate ? 0 : 1; core.ui.drawConfirmBox("你想开启战斗动画吗?\n之后可以在菜单栏中开启或关闭。\n(强烈建议新手开启此项)", function () { + core.data.flags.battleAnimate = true; core.flags.battleAnimate = true; core.setLocalStorage('battleAnimate', true); core.startGame(hard); core.utils.__init_seed(); core.events.setInitData(hard); }, function () { + core.data.flags.battleAnimate = false; core.flags.battleAnimate = false; core.setLocalStorage('battleAnimate', false); core.startGame(hard); diff --git a/libs/maps.js b/libs/maps.js index 8d200918..cdfd6b36 100644 --- a/libs/maps.js +++ b/libs/maps.js @@ -675,7 +675,7 @@ maps.prototype.jumpBlock = function(sx,sy,ex,ey,time,immediateHide,callback) { core.setOpacity('animate', opacityVal); core.canvas.animate.drawImage(blockImage, 0, blockIcon * height, 32, height, block.x * 32, block.y * 32 +32 - height, 32, height); - core.playSound('jump.ogg'); + core.playSound('jump.mp3'); var dx = ex-sx, dy=ey-sy, distance = Math.round(Math.sqrt(dx * dx + dy * dy)); var jump_peak = 6 + distance, jump_count = jump_peak * 2; diff --git a/project/data.js b/project/data.js index c6cab035..6a33d6e3 100644 --- a/project/data.js +++ b/project/data.js @@ -14,7 +14,7 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = 'bgm.mp3' ], "sounds" : [ - 'floor.mp3', 'attack.mp3', 'door.mp3', 'item.mp3', 'zone.mp3' + 'floor.mp3', 'attack.mp3', 'door.mp3', 'item.mp3', 'zone.mp3', 'jump.mp3' ], "startBackground" : "bg.jpg", "startLogoStyle" : "color: black", diff --git a/project/sounds/jump.mp3 b/project/sounds/jump.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..b8ce8f78d80ab18b7ed744c6772e14333e7fc32e GIT binary patch literal 5895 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 EADPUu8UO$Q literal 0 HcmV?d00001