From 6685df201d3c92c2a66b84876fc13da1df9199b8 Mon Sep 17 00:00:00 2001 From: vvo <> Date: Mon, 17 Oct 2022 22:31:29 +0800 Subject: [PATCH] pregene js optimize + page layout update --- .../webui/asset/js/premiumgenerator.js | 84 ++++++++----------- .../webui/profile_-premium generator.pug | 11 ++- 2 files changed, 41 insertions(+), 54 deletions(-) diff --git a/sdvx@asphyxia/webui/asset/js/premiumgenerator.js b/sdvx@asphyxia/webui/asset/js/premiumgenerator.js index 4d597fb..bd6aa24 100644 --- a/sdvx@asphyxia/webui/asset/js/premiumgenerator.js +++ b/sdvx@asphyxia/webui/asset/js/premiumgenerator.js @@ -1,78 +1,62 @@ function countPreGeneItems(preGeneItems, items_crew, items_stamp, items_subbg, items_bgm, items_nemsys) { let totalItemsGot = 0 - console.log(totalItemsGot) totalItemsGot += items_crew.filter(crew => preGeneItems['crew'].includes(crew['id'])).length - console.log(totalItemsGot) totalItemsGot += items_stamp.filter(stamp => preGeneItems['stamp'].includes(stamp['id'])).length - console.log(totalItemsGot) totalItemsGot += items_subbg.filter(subbg => preGeneItems['subbg'].includes(subbg['id'])).length - console.log(totalItemsGot) return totalItemsGot } -$(document).ready(function() { - // let profile_data = JSON.parse(document.getElementById("data-pass").innerText); +function loadImages(itemList, itemType, userItems) { let preGeneImageFetchURL = 'https://eacache.s.konaminet.jp/game/sdvx/common/images/pregene_item/' + itemList.forEach(item => { + let itemBrightness = userItems.find(userItem => userItem.id == item) != undefined ? 1 : 0.5 + let imageUrl = 'static/asset/pregene_item/item_' + itemType + '_' + item + '.png' + $.get(imageUrl, function(data, textStatus) { + if (textStatus == "success") { + $('.' + itemType + '-items').append('') + } + }).fail(function(){ + imageUrl = preGeneImageFetchURL + itemType + '/item_' + itemType + '_' + item + '.png' + $('.' + itemType + '-items').append('') + }); + }) +} + +$(document).ready(function() { + if(document.getElementById("data-pass-unlock-all").innerText === 'true') { + $('.card-content').text("The \"Unlock All Valkyrie and Premium Items\" option is enabled. You wouldn't need this.") + $('#pregene-roll').attr('disabled') + return 0; + } + + $('.input').hide() + $('.button').addClass('is-link') let items_crew = JSON.parse(document.getElementById("data-pass-crew").innerText); let items_stamp = JSON.parse(document.getElementById("data-pass-stamp").innerText); let items_subbg = JSON.parse(document.getElementById("data-pass-subbg").innerText); let items_bgm = JSON.parse(document.getElementById("data-pass-bgm").innerText); let items_nemsys = JSON.parse(document.getElementById("data-pass-nemsys").innerText); - let unlock_all = (document.getElementById("data-pass-unlock-all").innerText === 'true'); let preGeneItems = { 'crew': [131], 'stamp': [69, 70, 71, 72, 73, 74, 75, 76, 77, 78], 'subbg': [166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185] } - console.log('crew') - $('.item_banners').append('

') - preGeneItems['crew'].forEach(crew => { - let itemBrightness = items_crew.find(item => item.id == subbg) != undefined ? 1 : 0.5 - $.get('/static/asset/pregene_item/crew/item_crew_' + crew + '.png', function(data, textStatus) { - if (textStatus == "success") { - console.log(crew + " loaded"); - } - }).fail(function(){ - console.log(crew + " not loaded. file not exist") - $('.crew-items').append('') - }); - }) + $('.count').text('Unlocked items: ' + countPreGeneItems(preGeneItems, items_crew, items_stamp, items_subbg, items_bgm, items_nemsys) + "/" + (preGeneItems['crew'].length + preGeneItems['stamp'].length + preGeneItems['subbg'].length)) + $('.item_banners').append('

Nemsys Crew

') + $('.item_banners').append('

') + loadImages(preGeneItems['crew'], 'crew', items_crew) console.log('stamp') - $('.item_banners').append('

') - preGeneItems['stamp'].forEach(stamp => { - let itemBrightness = items_stamp.find(item => item.id == stamp) != undefined ? 1 : 0.5 - $.get('/static/asset/pregene_item/stamp/item_stamp_' + stamp + '.png', function(data, textStatus) { - if (textStatus == "success") { - console.log(stamp + " loaded"); - } - }).fail(function(){ - console.log(stamp + " not loaded. file not exist") - $('.stamp-items').append('') - }); - }) + $('.item_banners').append('

Appeal Stamp

') + $('.item_banners').append('

') + loadImages(preGeneItems['stamp'], 'stamp', items_stamp) console.log('subbg') - $('.item_banners').append('

') - preGeneItems['subbg'].forEach(subbg => { - let itemBrightness = items_subbg.find(item => item.id == subbg) != undefined ? 1 : 0.5 - $.get('/static/asset/pregene_item/bg/item_bg_' + subbg + '.png', function(data, textStatus) { - if (textStatus == "success") { - console.log(subbg + " loaded"); - } - }).fail(function(){ - console.log(subbg + " not loaded. file not exist") - $('.subbg-items').append('') - }); - }) + $('.item_banners').append('

Submonitor BG

') + $('.item_banners').append('

') + loadImages(preGeneItems['subbg'], 'bg', items_subbg) - if(!unlock_all) { - $('.count').text(countPreGeneItems(preGeneItems, items_crew, items_stamp, items_subbg, items_bgm, items_nemsys) + "/" + (preGeneItems['crew'].length + preGeneItems['stamp'].length + preGeneItems['subbg'].length)) - } else { - $('.card-content').text("Unlock all enabled.") - $('#pregene-roll').attr('disabled') - } $('#pregene-roll').on('click', function() { console.log('clique') diff --git a/sdvx@asphyxia/webui/profile_-premium generator.pug b/sdvx@asphyxia/webui/profile_-premium generator.pug index f442d51..d2611b9 100644 --- a/sdvx@asphyxia/webui/profile_-premium generator.pug +++ b/sdvx@asphyxia/webui/profile_-premium generator.pug @@ -21,12 +21,15 @@ div .card-header p.card-header-title span.icon - i.mdi.mdi-account-edit + i.mdi.mdi-star | Premium Generator .card-content - input.input(type="text" name="refid", value=refid readonly) - button(id="pregene-roll") Roll - div.count() + div(style="padding: 15px; text-align: center;") + div(style="padding: 5px") + h3.count() + input.input(type="text" name="refid", value=refid readonly) + button.button(id="pregene-roll" style="font-size: 20px") Roll + br() div.item_banners() div(hidden id='data-pass-crew') !{JSON.stringify(prem_items_crew)}