diff --git a/sdvx@asphyxia/data/exg.ts b/sdvx@asphyxia/data/exg.ts index a5ea614..05964c2 100644 --- a/sdvx@asphyxia/data/exg.ts +++ b/sdvx@asphyxia/data/exg.ts @@ -100,7 +100,7 @@ export const VALKYRIEEXCLUSIVESONGS = [ export const ARENA = { 'Set 1 (04/25/22)': { details: { - season: 1, + // season: 1, time_start: BigInt(Date.parse('25 Apr 2022 00:00:00 GMT')), time_end: BigInt(Date.parse('31 Dec 2022 23:59:59 GMT')), shop_start: BigInt(Date.parse('25 Apr 2022 00:00:00 GMT')), @@ -201,7 +201,7 @@ export const ARENA = { }, 'Set 2 (06/30/22)': { details: { - season: 2, + // season: 2, time_start: BigInt(Date.parse('30 Jun 2022 00:00:00 GMT')), time_end: BigInt(Date.parse('31 Dec 2022 23:59:59 GMT')), shop_start: BigInt(Date.parse('30 Jun 2022 00:00:00 GMT')), diff --git a/sdvx@asphyxia/handlers/common.ts b/sdvx@asphyxia/handlers/common.ts index 1ae7de8..6c9de39 100644 --- a/sdvx@asphyxia/handlers/common.ts +++ b/sdvx@asphyxia/handlers/common.ts @@ -336,7 +336,7 @@ export const common: EPR = async (info, data, send) => { catalog: valgene_items }, arena: { - season: K.ITEM('s32', ARENA[U.GetConfig('arena_szn')].details.season), + // season: K.ITEM('s32', ARENA[U.GetConfig('arena_szn')].details.season), time_start: K.ITEM('u64', ARENA[U.GetConfig('arena_szn')].details.time_start), time_end: K.ITEM('u64', ARENA[U.GetConfig('arena_szn')].details.time_end), shop_start: K.ITEM('u64', ARENA[U.GetConfig('arena_szn')].details.shop_start), diff --git a/sdvx@asphyxia/webui/asset/js/detail.js b/sdvx@asphyxia/webui/asset/js/detail.js index ea28cd4..0f311a0 100644 --- a/sdvx@asphyxia/webui/asset/js/detail.js +++ b/sdvx@asphyxia/webui/asset/js/detail.js @@ -711,10 +711,11 @@ $(document).ready(function() { lm = xrecord_data['lm']; vm = xrecord_data['vm']; } - var arenaPower = 0; - if(arena_data != null) { - arenaPower = arena_data['shopPoint'] - } + var arenaPower = []; + arena_data.forEach(arena_sszn_data => { + arenaPower.push([arena_sszn_data.season, arena_sszn_data.shopPoint]) + }) + arenaPower.sort((a, b) => a[0] - b[0]) $('#test').append( $('
').append( @@ -836,9 +837,7 @@ $(document).ready(function() { $('

').append( "Arena Power" ).append( - $('

').append( - arenaPower - ) + $('
') ).css('font-family', "testfont") ) ) @@ -951,6 +950,22 @@ $(document).ready(function() { ) ) + arenaPower.forEach(ap => { + console.log('yes' + ap) + $('#arena-power-data').append( + $('
').append( + $('

').append( + "Season " + ap[0] + ).append( + $('

').append( + ap[1] + ) + ) + ) + ) + }) + + setUpStatistics(); setCMpD(); diff --git a/sdvx@asphyxia/webui/profile_--detail.pug b/sdvx@asphyxia/webui/profile_--detail.pug index dbdd0a5..64dfc4e 100644 --- a/sdvx@asphyxia/webui/profile_--detail.pug +++ b/sdvx@asphyxia/webui/profile_--detail.pug @@ -3,7 +3,7 @@ score_data: DB.Find(refid, { collection: 'music' }) skill_data: DB.Find(refid,{collection: 'skill'}) xrecord_data: DB.FindOne(refid,{collection: 'x-record'}) - arena_data: DB.FindOne(refid,{collection: 'arena'}) + arena_data: DB.Find(refid,{collection: 'arena'}) - const padded = _.padStart(profile.id.toString(), 8);