diff --git a/_server/config.json b/_server/config.json index 84aac55..5d318ea 100644 --- a/_server/config.json +++ b/_server/config.json @@ -1 +1 @@ -{"viewportLoc":[0,0],"editorLastFloorId":"street02"} \ No newline at end of file +{"viewportLoc":[0,0],"editorLastFloorId":"street01"} \ No newline at end of file diff --git a/project/bgms/Ascension.opus b/project/bgms/Ascension.opus new file mode 100644 index 0000000..4ea0523 Binary files /dev/null and b/project/bgms/Ascension.opus differ diff --git a/project/bgms/theme.mp3 b/project/bgms/theme.mp3 new file mode 100644 index 0000000..9310d7d Binary files /dev/null and b/project/bgms/theme.mp3 differ diff --git a/project/bgms/theme.opus b/project/bgms/theme.opus deleted file mode 100644 index 5a178d6..0000000 Binary files a/project/bgms/theme.opus and /dev/null differ diff --git a/project/data.js b/project/data.js index d20f0db..a934ab8 100644 --- a/project/data.js +++ b/project/data.js @@ -897,6 +897,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "zone" ], "bgms": [ + "Ascension.opus", "Asphodelus_Ceui.opus", "Blind_Alley.opus", "Blood_Stain.opus", @@ -904,7 +905,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "Halbmond.opus", "ed.opus", "op.opus", - "theme.opus" + "theme.mp3" ], "sounds": [ "aiy010000010.opus", @@ -1060,7 +1061,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "饰品", "饰品" ], - "startBgm": "theme.opus", + "startBgm": "theme.mp3", "styles": { "startBackground": "project/images/background.webp", "startVerticalBackground": "project/images/backgroundvertical.webp", diff --git a/project/floors/street01.js b/project/floors/street01.js index dceac7f..14b5b9e 100644 --- a/project/floors/street01.js +++ b/project/floors/street01.js @@ -26,58 +26,25 @@ main.floors.street01= "direction": "up" } ], - "6,11": [ + "10,11": [ { - "type": "insert", - "name": "chapter04" + "type": "setmusics", + "bgm": "op.opus" } ], - "4,11": [ + "10,10": [ { - "type": "animationDrawable", - "allFarme": 300, - "color": [ - 0, - 0, - 0 - ], - "imageList": [ - { - "image": "bg_1511.webp", - "beforefarme": 50, - "globalAlpha": 0, - "afterfarme": 250, - "aglobalAlpha": 100 - }, - { - "image": "eve_010304.webp", - "beforefarme": 70, - "globalAlpha": 0, - "afterfarme": 170, - "aglobalAlpha": 100, - "ax": 0, - "ay": 0 - }, - { - "image": "eve_010304.webp", - "beforefarme": 171, - "globalAlpha": 100, - "afterfarme": 270, - "aglobalAlpha": 100, - "ax": 800, - "ay": 0 - } - ], - "soundList": [ - { - "sound": "", - "startfarme": 0, - "stopbefore": false - } - ] + "type": "setmusics", + "bgm": "ed.opus" }, { - "type": "op" + "type": "setmusics", + "bgm": "Asphodelus_Ceui.opus" + } + ], + "10,9": [ + { + "type": "setmusics" } ] }, diff --git a/project/plugins.js b/project/plugins.js index 86944f8..6536a1a 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -234,11 +234,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = }); core.registerEvent("setmusics", function (data) { - if (!data.bgm) { core.setLocalStorage('musics', ["theme.opus"]) } else { - let a = core.getLocalStorage('musics') ?? ["theme.opus"] - if (!a.includes(data.bgm)) a.push(data.bgm) - core.setLocalStorage('musics', a) - } + if (core.getLocalStorage("musics") && core.getLocalStorage("musics").length === 0 || !core.getLocalStorage("musics")) core.setLocalStorage("musics", ['theme.mp3']) + let a = core.getLocalStorage('musics') + if (!a.includes(data.bgm)) a.push(data.bgm) + core.setLocalStorage('musics', a) + core.doAction(); }); @@ -16449,7 +16449,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = //需全塔属性注册并保存在bgms文件夹,每个数组为显示的一页内容 this.musicMx = [ ["Crawler.opus", "Blood_Stain.opus", "Blind_Alley.opus", "Halbmond.opus"], - ["theme.opus", "op.opus", "Asphodelus_Ceui.opus", "ed.opus"], + ["theme.mp3", "op.opus", "Asphodelus_Ceui.opus", "ed.opus"], ]; //音乐别名(将在播放器内显示的音乐名,music列表内的都要有对应歌名) this.musicname = { @@ -16457,7 +16457,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = "Blind_Alley.opus": "Blind Alley", "Crawler.opus": "Crawler", "op.opus": "Asphodelus", - "theme.opus": "One of Episodes", + "theme.mp3": "One of Episodes", "ed.opus": "親愛なる世界へ", "Blood_Stain.opus": "Blood Stain", "Halbmond.opus": "Halbmond", @@ -17277,7 +17277,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = core.ui.music = new musicclass(); main.dom.musicMode.onclick = function () { //点击开始页面的CG MODE进入cg回廊 - main.core.ui.music.musics = core.getLocalStorage("musics", ["theme.opus"]) + if (core.getLocalStorage("musics") && core.getLocalStorage("musics").length === 0 || !core.getLocalStorage("musics")) core.setLocalStorage("musics", ['theme.mp3']) + core.ui.music.musics = core.getLocalStorage('musics') core.playBgm( main.core.ui.music.musicMx[main.core.ui.music.selection[0]][ main.core.ui.music.selection[1]