diff --git a/sdvx@asphyxia/utils.ts b/sdvx@asphyxia/utils.ts index 028cd00..2447ba8 100644 --- a/sdvx@asphyxia/utils.ts +++ b/sdvx@asphyxia/utils.ts @@ -44,7 +44,7 @@ export const copyResourcesFromGame = async (data: {}) => { for await (const nemsys of nemsysFiles) { let fileToWrite = await IO.ReadFile(U.GetConfig('sdvx_eg_root_dir') + "\\data\\graphics\\game_nemsys\\" + nemsys.name) if(!IO.Exists('webui\\asset\\nemsys\\' + nemsys.name.substring(0, (nemsys.name.length - 4)) + ".png") && !IO.Exists('webui\\asset\\nemsys\\' + nemsys.name.substring(0, (nemsys.name.length - 4)) + ".jpg")) { - IO.WriteFile('webui\\test_asset\\nemsys\\' + nemsys.name, fileToWrite) + IO.WriteFile('webui\\asset\\nemsys\\' + nemsys.name, fileToWrite) newNemsysData.push(nemsys.name) } else { console.log(nemsys.name + " exists") @@ -63,7 +63,7 @@ export const copyResourcesFromGame = async (data: {}) => { for await (const apCard of apCardFiles) { let fileToWrite = await IO.ReadFile(U.GetConfig('sdvx_eg_root_dir') + "\\data\\graphics\\ap_card\\" + apCard.name) if(!IO.Exists('webui\\asset\\ap_card\\' + apCard.name.substring(0, (apCard.name.length - 4)) + ".png") && !IO.Exists('webui\\asset\\ap_card\\' + apCard.name.substring(0, (apCard.name.length - 4)) + ".jpg")) { - IO.WriteFile('webui\\test_asset\\ap_card\\' + apCard.name, fileToWrite) + IO.WriteFile('webui\\asset\\ap_card\\' + apCard.name, fileToWrite) newAPCardData.push(apCard.name) } else { console.log(apCard.name + " exists") @@ -76,7 +76,7 @@ export const copyResourcesFromGame = async (data: {}) => { for await (const subbg of subBGFiles) { let fileToWrite = await IO.ReadFile(U.GetConfig('sdvx_eg_root_dir') + "\\data\\graphics\\submonitor_bg\\" + subbg.name) if(!IO.Exists('webui\\asset\\submonitor_bg\\' + subbg.name.substring(0, (subbg.name.length - 4)) + ".png") && !IO.Exists('webui\\asset\\submonitor_bg\\' + subbg.name.substring(0, (subbg.name.length - 4)) + ".jpg")) { - IO.WriteFile('webui\\test_asset\\submonitor_bg\\' + subbg.name, fileToWrite) + IO.WriteFile('webui\\asset\\submonitor_bg\\' + subbg.name, fileToWrite) newSubBGData.push(subbg.name) } else { console.log(subbg.name + " exists") @@ -89,7 +89,7 @@ export const copyResourcesFromGame = async (data: {}) => { } }) - await IO.WriteFile('webui\\test_asset\\data.json', JSON.stringify(resourceJsonData)) + await IO.WriteFile('webui\\asset\\json\\data.json', JSON.stringify(resourceJsonData)) await IO.WriteFile('webui\\asset\\logs\\copyResourcesFromGame.json', JSON.stringify({ nemsys: newNemsysData, apCard: newAPCardData, diff --git a/sdvx@asphyxia/webui/asset/js/preview.js b/sdvx@asphyxia/webui/asset/js/preview.js index 8d50ae0..493d6ce 100644 --- a/sdvx@asphyxia/webui/asset/js/preview.js +++ b/sdvx@asphyxia/webui/asset/js/preview.js @@ -3,6 +3,12 @@ function zeroPad(num, places) { return Array(+(zero > 0 && zero)).join("0") + num; } +function getImageFileFormat(assetType, id) { + if(assetType == 0) { + return (id >= 103) ? '.png' : '.jpg' + } +} + ; (function($) { $.preload = function() { @@ -30,7 +36,7 @@ $('#nemsys_select').change(function() { }); $('[name="subbg"]').change(function() { - $('#sub_pre').fadeOut(200, () => { $('#sub_pre').attr("src", "static/asset/submonitor_bg/subbg_" + zeroPad($('[name="subbg"]').val(), 4) + ".jpg"); }); + $('#sub_pre').fadeOut(200, () => { $('#sub_pre').attr("src", "static/asset/submonitor_bg/subbg_" + zeroPad($('[name="subbg"]').val(), 4) + getImageFileFormat(0, parseInt(zeroPad($('[name="subbg"]').val(), 4)) )); }); $('#sub_pre').fadeIn(200); }); @@ -163,7 +169,8 @@ $(document).ready(function() { text: json["subbg"][i].name, })); var image = new Image(); - image.src = "static/asset/submonitor_bg/subbg_" + zeroPad(json["subbg"][i].value, 4) + ".jpg"; + image.src = "static/asset/submonitor_bg/subbg_" + zeroPad(json["subbg"][i].value, 4) + getImageFileFormat(0, parseInt(zeroPad(json["subbg"][i].value, 4))); + // console.log(image); //console.log(profile_data["subbg"]) } @@ -241,7 +248,7 @@ $(document).ready(function() { $('#nemsys_pre').attr("src", "static/asset/nemsys/nemsys_aprilfool.png"); } - $('#sub_pre').attr("src", "static/asset/submonitor_bg/subbg_" + zeroPad(profile_data["subbg"], 4) + ".jpg"); + $('#sub_pre').attr("src", "static/asset/submonitor_bg/subbg_" + zeroPad(profile_data["subbg"], 4) + getImageFileFormat(0, parseInt(zeroPad(profile_data["subbg"], 4)))); $('#custom_0').attr("src", "static/asset/audio/custom_" + zeroPad(profile_data["bgm"], 2) + "/0.mp3"); $('#custom_1').attr("src", "static/asset/audio/custom_" + zeroPad(profile_data["bgm"], 2) + "/1.mp3"); $('#custom_0').prop("volume", 0.5);