diff --git a/public/_server/MotaAction.g4 b/public/_server/MotaAction.g4 index df19cf6..248c341 100644 --- a/public/_server/MotaAction.g4 +++ b/public/_server/MotaAction.g4 @@ -567,7 +567,7 @@ doorInfo_m /* doorInfo_m tooltip : 开门信息 -default : [160, 'door.mp3', 'door.mp3'] +default : [160, 'door.opus', 'door.opus'] helpUrl : /_docs/#/instruction EvalString_0 = EvalString_0 && (', "openSound": "' + EvalString_0 + '"'); EvalString_1 = EvalString_1 && (', "closeSound": "' + EvalString_1 + '"'); @@ -693,7 +693,7 @@ nameMapBgm /* nameMapBgm tooltip : 映射背景音乐 -default : ['背景音乐', 'bgm.mp3'] +default : ['背景音乐', 'bgm.opus'] allBgms : ['EvalString_1'] material : ["./project/bgms/", "EvalString_1"] helpUrl : /_docs/#/instruction @@ -705,7 +705,7 @@ nameMapSoundKnown /* nameMapSoundKnown tooltip : 映射系统音效 -default : ['确定', 'confirm.mp3'] +default : ['确定', 'confirm.opus'] allSounds : ['EvalString_0'] material : ["./project/sounds/", "EvalString_0"] helpUrl : /_docs/#/instruction @@ -717,7 +717,7 @@ nameMapSoundUnknown /* nameMapSoundUnknown tooltip : 映射音效 -default : ['攻击', 'attack.mp3'] +default : ['攻击', 'attack.opus'] allSounds : ['EvalString_1'] material : ["./project/sounds/", "EvalString_1"] helpUrl : /_docs/#/instruction @@ -2194,7 +2194,7 @@ playBgm_s /* playBgm_s tooltip : playBgm: 播放背景音乐 helpUrl : /_docs/#/instruction -default : ["bgm.mp3", 0, true] +default : ["bgm.opus", 0, true] allBgms : ['EvalString_0'] material : ["./project/bgms/", "EvalString_0"] colour : this.imageColor @@ -2236,7 +2236,7 @@ loadBgm_s /* loadBgm_s tooltip : loadBgm: 预加载某个背景音乐,之后可以直接播放 helpUrl : /_docs/#/instruction -default : ["bgm.mp3"] +default : ["bgm.opus"] allBgms : ['EvalString_0'] material : ["./project/bgms/", "EvalString_0"] colour : this.imageColor @@ -2251,7 +2251,7 @@ freeBgm_s /* freeBgm_s tooltip : freeBgm: 释放背景音乐的缓存 helpUrl : /_docs/#/instruction -default : ["bgm.mp3"] +default : ["bgm.opus"] allBgms : ['EvalString_0'] colour : this.imageColor var code = '{"type": "freeBgm", "name": "'+EvalString_0+'"},\n'; @@ -2265,7 +2265,7 @@ playSound_s /* playSound_s tooltip : playSound: 播放音效 helpUrl : /_docs/#/instruction -default : ["item.mp3",false,"",false] +default : ["item.opus",false,"",false] colour : this.imageColor allSounds : ['EvalString_0'] material : ["./project/sounds/", "EvalString_0"] diff --git a/public/_server/editor_blocklyconfig.js b/public/_server/editor_blocklyconfig.js index f12a973..5250b3f 100644 --- a/public/_server/editor_blocklyconfig.js +++ b/public/_server/editor_blocklyconfig.js @@ -84,12 +84,12 @@ editor_blocklyconfig=(function(){ "name": "bg.jpg", "x": 0, "y": 0, "canvas": "bg" }], 'floorImage'), MotaActionFunctions.actionParser.parse({ - "time": 160, "openSound": "door.mp3", "closeSound": "door.mp3", "keys": {"yellowKey": 1, "orangeKey": 1} + "time": 160, "openSound": "door.opus", "closeSound": "door.opus", "keys": {"yellowKey": 1, "orangeKey": 1} }, 'doorInfo'), MotaActionBlocks['faceIds_m'].xmlText(), MotaActionBlocks['mainStyle_m'].xmlText(), MotaActionFunctions.actionParser.parse({ - "背景音乐": "bgm.mp3", "确定": "confirm.mp3", "攻击": "attack.mp3", "背景图": "bg.jpg", "领域": "zone", "文件名": "file.jpg" + "背景音乐": "bgm.opus", "确定": "confirm.opus", "攻击": "attack.opus", "背景图": "bg.jpg", "领域": "zone", "文件名": "file.jpg" }, 'nameMap'), MotaActionFunctions.actionParser.parse([ {"name": "hero.png", "width": 32, "height": 32, "prefix": "hero_"}, diff --git a/public/_server/editor_uievent.js b/public/_server/editor_uievent.js index 3dba4c2..ff7ce66 100644 --- a/public/_server/editor_uievent.js +++ b/public/_server/editor_uievent.js @@ -592,7 +592,7 @@ editor_uievent_wrapper = function (editor) { html += '
'; } // 试听音频 - if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac')) { + if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac') || one.endsWith('.opus')) { html += "" html += " 音调:"; html += `0:00 / 0:00
diff --git a/public/project/data.js b/public/project/data.js index 4d3452a..0742e7d 100644 --- a/public/project/data.js +++ b/public/project/data.js @@ -124,10 +124,9 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "IQ.png", "arrow.png", "atk.png", - "bg.jpg", + "bg.webp", "boom.png", "botton.png", - "cave2.jpg", "def.png", "exp.png", "hero1.png", @@ -150,9 +149,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "skill7.png", "skill8.png", "skill9.png", - "title.jpg", - "tower.jpg", - "tower7.jpeg", + "tower7.webp", "winskin.png", "winskin2.png", "winskin3.png" @@ -573,57 +570,57 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = }, { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "人们说要铭记历史,但他们却忘记了历史。\n ——我是这样评价这个故事的。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "人类简史——起源篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "在历史的长河中,山火、暴雨、地震不过是自然界的常态,是时间流逝中微不足道的涟漪。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "这些自然现象如同大地的呼吸,时而平静,时而狂暴。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "对于动物和植物而言,这些变化是生存的考验,是自然选择的无情法则。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "每一次山火,都意味着森林的重生与毁灭;每一场暴雨,都带来了生命的滋润与洪水的威胁;每一次地震,都改变了地貌,塑造了新的环境。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "在这片土地上,生命在自然的力量中挣扎、适应、繁衍。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "那些无法适应的,最终被淘汰;而那些幸存者,则继续在这片土地上书写着生命的传奇。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "然而,对于那些在这片土地上生存的原始人而言,这些自然现象不仅仅是生存的考验,更是他们日常生活中不可或缺的一部分。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "在公元前8000年,这里曾有一个不起眼的山洞,隐匿于群山之间,仿佛与世隔绝。山洞中,原始人正忙碌着,准备迎接即将到来的季节变化。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, { "type": "sleep", diff --git a/public/project/floors/MT14.js b/public/project/floors/MT14.js index c273ebd..a6a5352 100644 --- a/public/project/floors/MT14.js +++ b/public/project/floors/MT14.js @@ -17,7 +17,7 @@ main.floors.MT14= "eachArrive": [ { "type": "loadBgm", - "name": "plot1.mp3" + "name": "plot1.opus" } ], "parallelDo": "", @@ -154,32 +154,32 @@ main.floors.MT14= "人类简史——起源篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "但他已经抑制不了自己的好奇心。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "人类嘛,总会在好奇心的驱使下前进。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "但是,他们却用好奇心给自己带来了灾难,", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "只得利用历史中的野蛮人的好奇心来拯救自己。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "不出所料,这个野蛮人走上了勇气之路。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, { "type": "setText", diff --git a/public/project/floors/MT15.js b/public/project/floors/MT15.js index 7b76b6f..155b704 100644 --- a/public/project/floors/MT15.js +++ b/public/project/floors/MT15.js @@ -26,7 +26,7 @@ main.floors.MT15= "firstArrive": [ { "type": "loadBgm", - "name": "escape.mp3" + "name": "escape.opus" }, "\t[野蛮人]\b[up,hero]山路开始崎岖多变了,要更小心一些" ], diff --git a/public/project/floors/MT16.js b/public/project/floors/MT16.js index abd8ace..36a1f1c 100644 --- a/public/project/floors/MT16.js +++ b/public/project/floors/MT16.js @@ -24,7 +24,7 @@ main.floors.MT16= }, { "type": "loadBgm", - "name": "escape.mp3" + "name": "escape.opus" }, "\t[野蛮人]\b[up,hero]这里就是山顶了", "\t[野蛮人]\b[up,hero]砍一些柴火就赶快回去吧", @@ -414,7 +414,7 @@ main.floors.MT16= }, { "type": "loadBgm", - "name": "escape.mp3" + "name": "escape.opus" } ], "3,23": [ diff --git a/public/project/floors/MT2.js b/public/project/floors/MT2.js index f651b95..4c700ee 100644 --- a/public/project/floors/MT2.js +++ b/public/project/floors/MT2.js @@ -11,7 +11,7 @@ main.floors.MT2 = { images: [], ratio: 1, defaultGround: 'T331', - bgm: 'cave.mp3', + bgm: 'cave.opus', firstArrive: [], eachArrive: [], parallelDo: '', diff --git a/public/project/floors/MT21.js b/public/project/floors/MT21.js index e06d7f3..89f2ca6 100644 --- a/public/project/floors/MT21.js +++ b/public/project/floors/MT21.js @@ -67,22 +67,22 @@ main.floors.MT21= "人类简史——起源篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "他踏出了寻找智慧的第一步。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "他所练就的勇气,也成为他寻找智慧路上的一大利器。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "人类简史——起源篇,完。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, { "type": "setValue", @@ -96,36 +96,36 @@ main.floors.MT21= "人类简史——进化篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "或许,他真的不理解智慧。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "或许,他已经理解了一些。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "但这不重要。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "他的轨迹已经注定了他对未来的影响。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "这个世界,甚至这个宇宙,都因为他的存在而改变。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "在这里,智慧小径,将是他智慧的飞跃点。", { diff --git a/public/project/floors/MT29.js b/public/project/floors/MT29.js index 2dfeb55..4e1f9e3 100644 --- a/public/project/floors/MT29.js +++ b/public/project/floors/MT29.js @@ -11,7 +11,7 @@ main.floors.MT29 = { images: [], ratio: 2, defaultGround: 'grass', - bgm: 'road.mp3', + bgm: 'road.opus', firstArrive: [ { type: 'animate', diff --git a/public/project/floors/MT31.js b/public/project/floors/MT31.js index 83ba39d..964edab 100644 --- a/public/project/floors/MT31.js +++ b/public/project/floors/MT31.js @@ -77,17 +77,17 @@ main.floors.MT31= "人类简史——进化篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "经过了漫长的行走,他感到真相越来越接近。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "前方,是会将凛冽渗入骨髓的冰封雪原。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "这里,他将寻找到所谓的真相。", { diff --git a/public/project/floors/MT41.js b/public/project/floors/MT41.js index f2ef0cc..31f33ab 100644 --- a/public/project/floors/MT41.js +++ b/public/project/floors/MT41.js @@ -40,7 +40,7 @@ main.floors.MT41= "\t[初级智人]\b[up,hero]喝一口吧,已经很长时间没喝水了。", { "type": "playSound", - "name": "drink.mp3" + "name": "drink.opus" }, { "type": "sleep", diff --git a/public/project/floors/MT48.js b/public/project/floors/MT48.js index 01e5d0a..8eee639 100644 --- a/public/project/floors/MT48.js +++ b/public/project/floors/MT48.js @@ -66,37 +66,37 @@ main.floors.MT48= "人类简史——进化篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "孤注一掷。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "为拯救自己,人类执行了苍蓝计划。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "硬币一旦抛出,又有谁能得知它的朝向呢?", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "在它落地之前,前方,是毁灭,亦是重生。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "当他踏入宫殿的那一刻,硬币便已抛出。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "来自未来的“孤注一掷”。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, { "type": "setText", diff --git a/public/project/floors/MT5.js b/public/project/floors/MT5.js index d444535..0d09d2f 100644 --- a/public/project/floors/MT5.js +++ b/public/project/floors/MT5.js @@ -78,22 +78,22 @@ main.floors.MT5= "人类简史——起源篇", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "走出山洞,看似一个不起眼的举动,却是一个让残酷的真相永远地消失在了历史中的举动。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "但是,这个举动,也是人类至今都能与自然和谐共处的根本。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "那些残酷的历史将无人知晓,那些人类的残忍杀戮将不会出现。", { "type": "playSound", - "name": "paper.mp3" + "name": "paper.opus" }, "而这些源头便是这看似无足轻重的一个举动。", { diff --git a/public/project/floors/MT57.js b/public/project/floors/MT57.js index 0fa93eb..b8e51c3 100644 --- a/public/project/floors/MT57.js +++ b/public/project/floors/MT57.js @@ -51,7 +51,7 @@ main.floors.MT57= }, { "type": "playSound", - "name": "door.mp3" + "name": "door.opus" }, "\t[智人]\b[down,hero]貌似有哪里的门开了,应该是苍蓝之殿右下角吧", "现在可以去苍蓝之殿的右下区域了。注意有三条可以去右边的路,机关门都已经开启" diff --git a/public/project/floors/tower7.js b/public/project/floors/tower7.js index c7f8ac5..223d2c4 100644 --- a/public/project/floors/tower7.js +++ b/public/project/floors/tower7.js @@ -11,7 +11,7 @@ main.floors.tower7= "cannotViewMap": true, "images": [ { - "name": "tower7.jpeg", + "name": "tower7.webp", "canvas": "bg", "x": 0, "y": 0 @@ -27,19 +27,19 @@ main.floors.tower7= }, { "type": "loadBgm", - "name": "beforeBoss.mp3" + "name": "beforeBoss.opus" }, { "type": "loadBgm", - "name": "towerBoss.mp3" + "name": "towerBoss.opus" }, { "type": "loadBgm", - "name": "towerBoss2.mp3" + "name": "towerBoss2.opus" }, { "type": "loadBgm", - "name": "towerBoss3.mp3" + "name": "towerBoss3.opus" }, { "type": "pauseBgm" @@ -54,7 +54,7 @@ main.floors.tower7= "\t[智慧之神,E557]\b[down,7,2]但是,他们的低下智慧,却让他们在我这里败下阵来", { "type": "playBgm", - "name": "beforeBoss.mp3" + "name": "beforeBoss.opus" }, "\t[智慧之神,E557]\b[down,7,2]愚蠢的他们只会一头冲向我这", "\t[智慧之神,E557]\b[down,7,2]在我面前变成一滩肉泥", @@ -82,7 +82,7 @@ main.floors.tower7= "\t[智慧之神,E557]\b[down,7,2]现在,你应该知道这座塔的来源了吧?", { "type": "playBgm", - "name": "towerBoss.mp3" + "name": "towerBoss.opus" }, "\t[智慧之神,E557]\b[down,7,2]就让我来看一看你是不是能够改变历史的人吧!", { diff --git a/public/project/images/bg.webp b/public/project/images/bg.webp new file mode 100644 index 0000000..ee83816 Binary files /dev/null and b/public/project/images/bg.webp differ diff --git a/public/project/images/bg2.jpg b/public/project/images/bg2.jpg deleted file mode 100644 index 837af9b..0000000 Binary files a/public/project/images/bg2.jpg and /dev/null differ diff --git a/public/project/images/cave2.jpg b/public/project/images/cave2.jpg deleted file mode 100644 index 8bc09ad..0000000 Binary files a/public/project/images/cave2.jpg and /dev/null differ diff --git a/public/project/images/convert.bat b/public/project/images/convert.bat new file mode 100644 index 0000000..7f461e7 --- /dev/null +++ b/public/project/images/convert.bat @@ -0,0 +1,3 @@ +for %%i in (*.jpg) do ( + ffmpeg -i "%%i" -q:v 70 "%%~ni.webp" +) \ No newline at end of file diff --git a/public/project/images/title.jpg b/public/project/images/title.jpg deleted file mode 100644 index edc1fdb..0000000 Binary files a/public/project/images/title.jpg and /dev/null differ diff --git a/public/project/images/tower.jpg b/public/project/images/tower.jpg deleted file mode 100644 index a869223..0000000 Binary files a/public/project/images/tower.jpg and /dev/null differ diff --git a/public/project/images/tower7.jpeg b/public/project/images/tower7.jpg similarity index 100% rename from public/project/images/tower7.jpeg rename to public/project/images/tower7.jpg diff --git a/public/project/images/tower7.webp b/public/project/images/tower7.webp new file mode 100644 index 0000000..4ae48d1 Binary files /dev/null and b/public/project/images/tower7.webp differ diff --git a/public/project/items.js b/public/project/items.js index e73766a..c0bed7d 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -514,7 +514,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "cls": "tools", "name": "跳跃靴", "text": "能跳跃到前方两格处", - "useItemEffect": "core.playSound(\"jump.mp3\"); core.insertAction({ \"type\": \"jumpHero\", \"loc\": [core.nextX(2), core.nextY(2)] });", + "useItemEffect": "core.playSound(\"jump.opus\"); core.insertAction({ \"type\": \"jumpHero\", \"loc\": [core.nextX(2), core.nextY(2)] });", "canUseItemEffect": "(function () {\n\tvar nx = core.nextX(2),\n\t\tny = core.nextY(2);\n\treturn nx >= 0 && nx < core.bigmap.width && ny >= 0 && ny < core.bigmap.height && core.getBlockId(nx, ny) == null;\n})();" }, "skill1": { diff --git a/public/project/maps.js b/public/project/maps.js index 1b93d8e..b989229 100644 --- a/public/project/maps.js +++ b/public/project/maps.js @@ -1,8 +1,8 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = { - "1": {"cls":"animates","id":"yellowWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}}, - "2": {"cls":"animates","id":"whiteWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}}, - "3": {"cls":"animates","id":"blueWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}}, + "1": {"cls":"animates","id":"yellowWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}}, + "2": {"cls":"animates","id":"whiteWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}}, + "3": {"cls":"animates","id":"blueWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}}, "4": {"cls":"animates","id":"star","name":"星空"}, "5": {"cls":"animates","id":"lava","name":"岩浆"}, "6": {"cls":"terrains","id":"ice"}, @@ -68,12 +68,12 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "71": {"cls":"items","id":"shield0"}, "72": {"cls":"items","id":"skill1"}, "73": {"cls":"items","id":"wand"}, - "81": {"cls":"animates","id":"yellowDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"yellowKey":1}},"name":"黄门"}, - "82": {"cls":"animates","id":"blueDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"blueKey":1}},"name":"蓝门"}, - "83": {"cls":"animates","id":"redDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"redKey":1}},"name":"红门"}, - "84": {"cls":"animates","id":"greenDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"greenKey":1}},"name":"绿门"}, - "85": {"cls":"animates","id":"specialDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"specialKey":1}},"name":"机关门"}, - "86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"steelKey":1}},"name":"铁门","bigImage":null}, + "81": {"cls":"animates","id":"yellowDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"yellowKey":1}},"name":"黄门"}, + "82": {"cls":"animates","id":"blueDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"blueKey":1}},"name":"蓝门"}, + "83": {"cls":"animates","id":"redDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"redKey":1}},"name":"红门"}, + "84": {"cls":"animates","id":"greenDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"greenKey":1}},"name":"绿门"}, + "85": {"cls":"animates","id":"specialDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"specialKey":1}},"name":"机关门"}, + "86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"steelKey":1}},"name":"铁门","bigImage":null}, "87": {"cls":"terrains","id":"upFloor","canPass":true}, "88": {"cls":"terrains","id":"downFloor","canPass":true}, "89": {"cls":"animates","id":"portal","canPass":true}, @@ -86,11 +86,11 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "102": {"cls":"animates","id":"crystalBottom"}, "103": {"cls":"animates","id":"fire","canPass":true,"cannotIn":[]}, "104": {"cls":"animates","id":"switch"}, - "105": {"cls":"animates","id":"steelDoor2","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}},"animate":1,"trigger":"openDoor"}, - "106": {"cls":"animates","id":"steelDoor3","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}},"animate":1,"trigger":"openDoor"}, - "107": {"cls":"animates","id":"iceDoor","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}},"animate":1,"trigger":"openDoor"}, - "108": {"cls":"animates","id":"iceDoor2","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}},"animate":1,"trigger":"openDoor"}, - "109": {"cls":"animates","id":"magentaWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}}, + "105": {"cls":"animates","id":"steelDoor2","doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}},"animate":1,"trigger":"openDoor"}, + "106": {"cls":"animates","id":"steelDoor3","doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}},"animate":1,"trigger":"openDoor"}, + "107": {"cls":"animates","id":"iceDoor","doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}},"animate":1,"trigger":"openDoor"}, + "108": {"cls":"animates","id":"iceDoor2","doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}},"animate":1,"trigger":"openDoor"}, + "109": {"cls":"animates","id":"magentaWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}}, "121": {"cls":"npcs","id":"man"}, "122": {"cls":"npcs","id":"trader"}, "123": {"cls":"npcs","id":"thief"}, @@ -420,12 +420,12 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "489": {"cls":"items","id":"I489"}, "490": {"cls":"items","id":"I490"}, "491": {"cls":"items","id":"I491"}, - "492": {"cls":"animates","id":"A492","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"yellowKey":1}},"animate":1}, + "492": {"cls":"animates","id":"A492","trigger":"openDoor","doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"yellowKey":1}},"animate":1}, "493": {"cls":"animates","id":"A493"}, - "494": {"cls":"animates","id":"A494","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"blueKey":1}}}, + "494": {"cls":"animates","id":"A494","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"blueKey":1}}}, "495": {"cls":"animates","id":"A495"}, "496": {"cls":"animates","id":"A496"}, - "497": {"cls":"animates","id":"A497","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"redKey":1}}}, + "497": {"cls":"animates","id":"A497","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"redKey":1}}}, "498": {"cls":"enemys","id":"E498"}, "499": {"cls":"enemys","id":"E499"}, "500": {"cls":"enemys","id":"E500"}, diff --git a/src/core/render/renderer/map.ts b/src/core/render/renderer/map.ts index f249d54..d7cc4a9 100644 --- a/src/core/render/renderer/map.ts +++ b/src/core/render/renderer/map.ts @@ -146,10 +146,10 @@ tagMap.register('text', (_0, _1, props) => { } }); tagMap.register('image', (_0, _1, props) => { - if (!props) return new Image(core.material.images.images['bg.jpg']); + if (!props) return new Image(core.material.images.images['bg.webp']); else { const { - image = core.material.images.images['bg.jpg'], + image = core.material.images.images['bg.webp'], type = 'static' } = props; return new Image(image, type); diff --git a/src/data/bgm.json b/src/data/bgm.json index 1f56937..3e8bc53 100644 --- a/src/data/bgm.json +++ b/src/data/bgm.json @@ -1,50 +1,50 @@ { - "title.mp3": { + "title.opus": { "area": "未完工", "name": "川井宪次 - 破裂足音", "from": "《永远的七日之都》", - "img": "/project/images/bg.jpg", + "img": "/project/images/bg.webp", "desc": [] }, - "cave.mp3": { + "cave.opus": { "area": "山洞", "name": "Faodail - Wren", "img": "", "desc": [] }, - "grass.mp3": { + "grass.opus": { "area": "草地", "name": "大树 & 朱晨阳 - 大树与鹿", "img": "", "desc": [] }, - "mount.mp3": { + "mount.opus": { "area": "山路", "name": "Epistra - Dream Of A Dream", "img": "", "desc": [] }, - "escape.mp3": { + "escape.opus": { "area": "山路追逐", "name": "Gareth Coker - Escaping a Foul Presence", "from": "《奥日与精灵意志》", "img": "", "desc": [] }, - "plot1.mp3": { + "plot1.opus": { "area": "勇气之路", "name": "Mark Petrie & Danny McCarthy - Rags To Rings", "img": "", "desc": [] }, - "tower.mp3": { + "tower.opus": { "area": "智慧之塔", "name": "Falcom Sound Team J.D.K. - A Light Illuminating The Depth", "from": "《英雄传说:零之轨迹》", "img": "", "desc": [] }, - "beforeBoss.mp3": { + "beforeBoss.opus": { "area": "战前独白", "name": "Evan LE NY - Some Calm", "from": "《太空化学》", diff --git a/src/data/resource.json b/src/data/resource.json index db1b79a..9d769db 100644 --- a/src/data/resource.json +++ b/src/data/resource.json @@ -4,20 +4,20 @@ "zip.weather.zip", "zip.materials.zip", "materials.keyboard.png", - "bgms.tower.mp3", - "bgms.cave.mp3", - "bgms.mount.mp3", - "bgms.towerBoss3.mp3", - "bgms.winter.mp3", - "bgms.title.mp3", - "bgms.road.mp3", - "bgms.beforeBoss.mp3", - "bgms.winterTown.mp3", - "bgms.towerBoss.mp3", - "bgms.grass.mp3", - "bgms.plot1.mp3", - "bgms.escape.mp3", - "bgms.towerBoss2.mp3" + "bgms.tower.opus", + "bgms.cave.opus", + "bgms.mount.opus", + "bgms.towerBoss3.opus", + "bgms.winter.opus", + "bgms.title.opus", + "bgms.road.opus", + "bgms.beforeBoss.opus", + "bgms.winterTown.opus", + "bgms.towerBoss.opus", + "bgms.grass.opus", + "bgms.plot1.opus", + "bgms.escape.opus", + "bgms.towerBoss2.opus" ], "stereoSE": [ "" diff --git a/src/plugin/boss/towerBoss.ts b/src/plugin/boss/towerBoss.ts index 13d7c9f..d8b1de1 100644 --- a/src/plugin/boss/towerBoss.ts +++ b/src/plugin/boss/towerBoss.ts @@ -313,7 +313,7 @@ export class TowerBoss extends BarrageBoss { this.skill1Time = 1; this.skill2Time = 1; this.skill3Time = 1; - core.playBgm('towerBoss.mp3'); + core.playBgm('towerBoss.opus'); } } @@ -399,7 +399,7 @@ export class TowerBoss extends BarrageBoss { this.attackTime = 3; this.skill4Time = 5; this.skill5Time = 3; - core.playBgm('towerBoss2.mp3'); + core.playBgm('towerBoss2.opus'); controller.activate('rain', 6); } @@ -502,7 +502,7 @@ export class TowerBoss extends BarrageBoss { this.terrainClose(1); this.skill6Time = 30; this.skill7Time = 2; - core.playBgm('towerBoss3.mp3'); + core.playBgm('towerBoss3.opus'); } releaseSkill6(n: number, last: number) { diff --git a/src/plugin/chase/chase1.ts b/src/plugin/chase/chase1.ts index 97aebfd..1c25a6b 100644 --- a/src/plugin/chase/chase1.ts +++ b/src/plugin/chase/chase1.ts @@ -262,7 +262,7 @@ function initFromSave(chase: Chase) { function playAudio(from: number, chase: Chase) { const playing = bgmController.playingBgm; - bgmController.play('escape.mp3', from); + bgmController.play('escape.opus', from); bgmController.blockChange(); chase.on('end', () => { bgmController.unblockChange(); diff --git a/src/source/data.d.ts b/src/source/data.d.ts index f3055eb..9fffa0a 100644 --- a/src/source/data.d.ts +++ b/src/source/data.d.ts @@ -1,4 +1,3 @@ - type FloorIds = | 'empty' | 'MT0' @@ -106,16 +105,15 @@ type FloorIds = | 'MT94' | 'MT95' | 'MT96' - | 'MT97' + | 'MT97'; type ImageIds = | 'IQ.png' | 'arrow.png' | 'atk.png' - | 'bg.jpg' + | 'bg.webp' | 'boom.png' | 'botton.png' - | 'cave2.jpg' | 'def.png' | 'exp.png' | 'hero1.png' @@ -138,12 +136,10 @@ type ImageIds = | 'skill7.png' | 'skill8.png' | 'skill9.png' - | 'title.jpg' - | 'tower.jpg' - | 'tower7.jpeg' + | 'tower7.webp' | 'winskin.png' | 'winskin2.png' - | 'winskin3.png' + | 'winskin3.png'; type AnimationIds = | 'amazed' @@ -167,7 +163,7 @@ type AnimationIds = | 'sweat' | 'sweat2' | 'sword' - | 'zone' + | 'zone'; type SoundIds = | '008-System08.opus' @@ -209,7 +205,7 @@ type SoundIds = | 'shop.opus' | 'thunder.opus' | 'tree.opus' - | 'zone.opus' + | 'zone.opus'; type BgmIds = | 'beforeBoss.opus' @@ -232,35 +228,33 @@ type BgmIds = | 'towerBoss2.opus' | 'towerBoss3.opus' | 'winter.opus' - | 'winterTown.opus' + | 'winterTown.opus'; -type FontIds = - | 'normal' - | 'FiraCode' +type FontIds = 'normal' | 'FiraCode'; interface NameMap { - '确定': 'confirm.mp3'; - '取消': 'cancel.mp3'; - '操作失败': 'error.mp3'; - '光标移动': 'cursor.mp3'; - '打开界面': 'open_ui.mp3'; - '读档': 'load.mp3'; - '存档': 'save.mp3'; - '获得道具': 'item.mp3'; - '回血': 'recovery.mp3'; - '炸弹': 'bomb.mp3'; - '飞行器': 'centerFly.mp3'; - '开关门': 'door.mp3'; - '上下楼': 'floor.mp3'; - '跳跃': 'jump.mp3'; - '破墙镐': 'pickaxe.mp3'; - '破冰镐': 'icePickaxe.mp3'; - '宝石': 'gem.mp3'; - '阻激夹域': 'zone.mp3'; - '穿脱装备': 'equip.mp3'; - '背景音乐': 'bgm.mp3'; - '攻击': 'attack.mp3'; - '背景图': 'bg.jpg'; - '商店': 'shop.mp3'; - '领域': 'zone'; + 确定: 'confirm.opus'; + 取消: 'cancel.opus'; + 操作失败: 'error.opus'; + 光标移动: 'cursor.opus'; + 打开界面: 'open_ui.opus'; + 读档: 'load.opus'; + 存档: 'save.opus'; + 获得道具: 'item.opus'; + 回血: 'recovery.opus'; + 炸弹: 'bomb.opus'; + 飞行器: 'centerFly.opus'; + 开关门: 'door.opus'; + 上下楼: 'floor.opus'; + 跳跃: 'jump.opus'; + 破墙镐: 'pickaxe.opus'; + 破冰镐: 'icePickaxe.opus'; + 宝石: 'gem.opus'; + 阻激夹域: 'zone.opus'; + 穿脱装备: 'equip.opus'; + 背景音乐: 'bgm.opus'; + 攻击: 'attack.opus'; + 背景图: 'bg.jpg'; + 商店: 'shop.opus'; + 领域: 'zone'; } diff --git a/src/ui/start.vue b/src/ui/start.vue index e9c215f..028715f 100644 --- a/src/ui/start.vue +++ b/src/ui/start.vue @@ -80,7 +80,7 @@ const props = defineProps<{ ui: GameUi; }>(); -const bg = core.material.images.images['bg.jpg']; +const bg = core.material.images.images['bg.webp']; let startdiv: HTMLDivElement; let start: HTMLDivElement;