diff --git a/src/data/banners.js b/src/data/banners.js index f3b6d742..0cc4685a 100644 --- a/src/data/banners.js +++ b/src/data/banners.js @@ -872,6 +872,29 @@ export const banners = { // version: '3.8', // timezoneDependent: true, // }, + { + name: 'Drifting Luminescence', + image: 4, + shortName: 'Kokomi', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#53caf3', + featured: ['sangonomiya_kokomi', 'wanderer'], + featuredRare: ['yanfei', 'faruzan', 'rosaria'], + version: '3.8', + }, + // { + // name: 'From Ashes Reborn', + // image: 2, + // shortName: 'Wanderer', + // start: '2023-07-25 18:00:00', + // end: '2023-08-15 17:59:59', + // color: '#53caf3', + // featured: ['sangonomiya_kokomi', 'wanderer'], + // featuredRare: ['yanfei', 'faruzan', 'rosaria'], + // version: '3.8', + // timezoneDependent: true, + // }, ], weapons: [ { @@ -1467,6 +1490,18 @@ export const banners = { color: '#ffb169', featured: ['song_of_broken_pines', 'lost_prayer_to_the_sacred_winds'], featuredRare: ['the_alley_flash', 'alley_hunter', 'rainslasher', 'favonius_lance', 'eye_of_perception'], + timezoneDependent: true, + version: '3.8', + }, + { + name: 'Epitome Invocation', + image: 50, + shortName: 'Moonglow', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#eae5e1', + featured: ['everlasting_moonglow', 'tulaytullahs_remembrance'], + featuredRare: ['wine_and_song', 'lions_roar', 'the_bell', 'dragons_bane', 'favonius_warbow'], version: '3.8', }, ], diff --git a/src/data/bannersDual.js b/src/data/bannersDual.js index 0f1c2739..93318677 100644 --- a/src/data/bannersDual.js +++ b/src/data/bannersDual.js @@ -603,4 +603,30 @@ export const bannersDual = { version: '3.8', }, ], + 'Drifting Luminescence 4': [ + { + name: 'Drifting Luminescence', + image: 4, + shortName: 'Kokomi', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#53caf3', + featured: ['sangonomiya_kokomi', 'wanderer'], + featuredRare: ['yanfei', 'faruzan', 'rosaria'], + version: '3.8', + timezoneDependent: true, + }, + { + name: 'From Ashes Reborn', + image: 2, + shortName: 'Wanderer', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#53caf3', + featured: ['sangonomiya_kokomi', 'wanderer'], + featuredRare: ['yanfei', 'faruzan', 'rosaria'], + version: '3.8', + timezoneDependent: true, + }, + ], }; diff --git a/src/data/events.js b/src/data/events.js index 8793f9c1..6b64ee6e 100644 --- a/src/data/events.js +++ b/src/data/events.js @@ -1323,11 +1323,44 @@ export const events = [ name: "Adventurer's Trials: Advanced", pos: '0% 50%', zoom: '150%', - image: 'Adventurers Trials Advanced Temp.png', + image: 'Adventurers Trials Advanced.jpg', start: '2023-07-20 10:00:00', end: '2023-07-31 03:59:59', color: '#fffa86', - url: 'https://www.hoyolab.com/article/19777607', + url: 'https://www.hoyolab.com/article/20113425', + showOnHome: true, + }, + { + name: 'Perilous Expedition', + pos: '0% 20%', + zoom: '200%', + image: 'Perilous Expedition.jpg', + start: '2023-07-27 10:00:00', + end: '2023-08-07 03:59:59', + color: '#edfbad', + url: 'https://www.hoyolab.com/article/20360979', + showOnHome: true, + }, + { + name: 'Shared Sight', + pos: '0% 50%', + zoom: '100%', + image: 'Shared Sight Temp.png', + start: '2023-08-03 10:00:00', + end: '2023-08-14 03:59:59', + color: '#d1f6a2', + url: 'https://www.hoyolab.com/article/20180483', + showOnHome: true, + }, + { + name: 'Overflowing Mastery', + pos: '0% 50%', + image: 'overflowing_mastery.jpg', + start: '2023-08-07 04:00:00', + end: '2023-08-14 03:59:59', + color: '#f5debc', + zoom: '200%', + url: 'https://www.hoyolab.com/article/20180483', showOnHome: true, }, ]; diff --git a/src/data/timeline.js b/src/data/timeline.js index 3a24e026..316dd371 100644 --- a/src/data/timeline.js +++ b/src/data/timeline.js @@ -1,4 +1,28 @@ export const eventsData = [ + [ + { + name: 'Perilous Expedition', + pos: '0% 20%', + zoom: '200%', + image: 'Perilous Expedition.jpg', + start: '2023-07-27 10:00:00', + end: '2023-08-07 03:59:59', + color: '#edfbad', + url: 'https://www.hoyolab.com/article/20360979', + showOnHome: true, + }, + { + name: 'Overflowing Mastery', + pos: '0% 50%', + image: 'overflowing_mastery.jpg', + start: '2023-08-07 04:00:00', + end: '2023-08-14 03:59:59', + color: '#f5debc', + zoom: '200%', + url: 'https://www.hoyolab.com/article/20180483', + showOnHome: true, + }, + ], [ { name: "Divine Ingenuity: Collector's Chapter", @@ -14,12 +38,23 @@ export const eventsData = [ { name: "Adventurer's Trials: Advanced", pos: '0% 50%', - zoom: '150%', - image: 'Adventurers Trials Advanced Temp.png', + zoom: '200%', + image: 'Adventurers Trials Advanced.jpg', start: '2023-07-20 10:00:00', end: '2023-07-31 03:59:59', color: '#fffa86', - url: 'https://www.hoyolab.com/article/19777607', + url: 'https://www.hoyolab.com/article/20113425', + showOnHome: true, + }, + { + name: 'Shared Sight', + pos: '0% 50%', + zoom: '100%', + image: 'Shared Sight Temp.png', + start: '2023-08-03 10:00:00', + end: '2023-08-14 03:59:59', + color: '#d1f6a2', + url: 'https://www.hoyolab.com/article/20180483', showOnHome: true, }, ], @@ -95,6 +130,29 @@ export const eventsData = [ showOnHome: true, timezoneDependent: true, }, + { + name: 'Born of Ocean Swell - Eula Banner', + pos: '10% 15%', + zoom: '150%', + image: 'Born of Ocean Swell 3.jpg', + start: '2023-07-05 06:00:00', + end: '2023-07-25 17:59:59', + color: '#A6D6E0', + url: 'https://www.hoyolab.com/article/19771439', + showOnHome: true, + timezoneDependent: true, + }, + { + name: 'Drifting Luminescence - Kokomi Banner', + pos: '10% 15%', + zoom: '150%', + image: 'Drifting Luminescence 4.jpg', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#53caf3', + url: 'https://www.hoyolab.com/article/20180298', + showOnHome: true, + }, ], [ { @@ -132,6 +190,17 @@ export const eventsData = [ showOnHome: true, timezoneDependent: true, }, + { + name: 'From Ashes Reborn - Wanderer Banner', + pos: '10% 15%', + zoom: '150%', + image: 'From Ashes Reborn 2.jpg', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#53caf3', + url: 'https://www.hoyolab.com/article/20180298', + showOnHome: true, + }, ], [ { @@ -169,6 +238,17 @@ export const eventsData = [ showOnHome: true, timezoneDependent: true, }, + { + name: 'Epitome Invocation - Weapon Banner', + pos: '30% 35%', + zoom: '150%', + image: 'Epitome Invocation 50.jpg', + start: '2023-07-25 18:00:00', + end: '2023-08-15 17:59:59', + color: '#FFAA4B', + url: 'https://www.hoyolab.com/article/20180298', + showOnHome: true, + }, ], [ { diff --git a/src/routes/_index/banner.svelte b/src/routes/_index/banner.svelte index 11bc7ff5..f6bd6f66 100644 --- a/src/routes/_index/banner.svelte +++ b/src/routes/_index/banner.svelte @@ -13,25 +13,25 @@ const dispatch = createEventDispatcher(); const featured = { - klee: { - name: 'Klee', + wanderer: { + name: 'Wanderer', rarity: 'legendary', count: 0, average: '...', percentage: '...', }, - eula: { - name: 'Eula', + sangonomiya_kokomi: { + name: 'Sangonomiya Kokomi', rarity: 'legendary', count: 0, average: '...', percentage: '...', }, }; - const bannerId = 300050; - const image = 'eula_klee.png'; + const bannerId = 300051; + const image = 'wanderer_kokomi.png'; const width = 800; - const height = 515; + const height = 409; let loading = true; let user = ''; diff --git a/src/routes/_index/build.svelte b/src/routes/_index/build.svelte index f8ca9c16..1c2172cd 100644 --- a/src/routes/_index/build.svelte +++ b/src/routes/_index/build.svelte @@ -29,6 +29,8 @@ return 'pale_flame'; case '+80_em': return 'gilded_dreams'; + case '+15%_anemo_dmg_set': + return 'viridescent_venerer'; default: return artifact; } @@ -128,7 +130,7 @@ {characters[id].name} Build diff --git a/src/routes/index.svelte b/src/routes/index.svelte index b8e7c54d..1eb174f0 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,6 +1,6 @@