diff --git a/src/data/banners.js b/src/data/banners.js index 15ac2725..b03bd47c 100644 --- a/src/data/banners.js +++ b/src/data/banners.js @@ -1425,6 +1425,28 @@ export const banners = { // version: '5.2', // timezoneDependent: true, // }, + { + name: 'Decree of the Deeps', + image: 3, + shortName: 'Neuvillette', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#72fefd', + featured: ['neuvillette', 'zhongli'], + featuredRare: ['shikanoin_heizou', 'fischl', 'yaoyao'], + version: '5.2', + }, + // { + // name: "Gentry of Hermitage", + // image: 6, + // shortName: 'Zhongli', + // start: '2024-12-10 18:00:00', + // end: '2024-12-31 14:59:00', + // color: '#D1A55C', + // featured: ['neuvillette', 'zhongli'], + // featuredRare: ['shikanoin_heizou', 'fischl', 'yaoyao'], + // version: '5.2', + // }, ], weapons: [ { @@ -2329,6 +2351,23 @@ export const banners = { version: '5.2', timezoneDependent: true, }, + { + name: 'Epitome Invocation', + image: 74, + shortName: 'Tome', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#eae5e1', + featured: ['tome_of_the_eternal_flow', 'vortex_vanquisher'], + featuredRare: [ + 'mitternachts_waltz', + 'favonius_sword', + 'favonius_greatsword', + 'dragons_bane', + 'sacrificial_fragments', + ], + version: '5.2', + }, ], chronicled: [ { diff --git a/src/data/bannersDual.js b/src/data/bannersDual.js index 71975b49..36385a09 100644 --- a/src/data/bannersDual.js +++ b/src/data/bannersDual.js @@ -1203,4 +1203,28 @@ export const bannersDual = { timezoneDependent: true, }, ], + 'Decree of the Deeps 3': [ + { + name: 'Decree of the Deeps', + image: 3, + shortName: 'Neuvillette', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#72fefd', + featured: ['neuvillette', 'zhongli'], + featuredRare: ['shikanoin_heizou', 'fischl', 'yaoyao'], + version: '5.2', + }, + { + name: 'Gentry of Hermitage', + image: 6, + shortName: 'Zhongli', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#D1A55C', + featured: ['neuvillette', 'zhongli'], + featuredRare: ['shikanoin_heizou', 'fischl', 'yaoyao'], + version: '5.2', + }, + ], }; diff --git a/src/data/events.js b/src/data/events.js index 96e95107..b8a19f03 100644 --- a/src/data/events.js +++ b/src/data/events.js @@ -2061,12 +2061,12 @@ export const events = [ { name: 'Claw Convoy', pos: '0% 35%', - zoom: '100%', - image: 'Claw Convoy.png', + zoom: '200%', + image: 'Claw Convoy 2.png', start: '2024-11-22 10:00:00', end: '2024-12-02 03:59:59', color: '#ebf97b', - url: 'https://www.hoyolab.com/article/35015809', + url: 'https://www.hoyolab.com/article/35053992', showOnHome: true, }, { @@ -2092,4 +2092,37 @@ export const events = [ showOnHome: true, timezoneDependent: true, }, + { + name: "Adventurer's Trials: Metamorphosis", + pos: '0% 15%', + zoom: '200%', + image: 'Adventurers Trials Metamorphosis.png', + start: '2024-12-11 10:00:00', + end: '2024-12-23 03:59:59', + color: '#8dc2f2', + url: 'https://www.hoyolab.com/article/35477560', + showOnHome: true, + }, + { + name: 'Exercise Surging Storm', + pos: '0% 0%', + zoom: '200%', + image: 'Exercise Surging Storm.png', + start: '2024-12-18 10:00:00', + end: '2024-12-30 03:59:59', + color: '#e5b88a', + url: 'https://www.hoyolab.com/article/35393996', + showOnHome: true, + }, + { + name: 'Ley Line Overflow', + pos: '0% 20%', + image: 'leyline_overflow.jpg', + start: '2024-12-23 04:00:00', + end: '2024-12-30 03:59:59', + color: '#5baced', + zoom: '200%', + url: 'https://www.hoyolab.com/article/35393996', + showOnHome: true, + }, ]; diff --git a/src/data/timeline.js b/src/data/timeline.js index a40836a0..16d9feaa 100644 --- a/src/data/timeline.js +++ b/src/data/timeline.js @@ -1,73 +1,18 @@ export const eventsData = [ [ - { - name: 'Reminiscent Regimen: Thrill', - pos: '0% 25%', - image: 'Reminiscent Regimen Thrill.png', - start: '2024-10-17 10:00:00', - end: '2024-10-28 03:59:59', - color: '#dddbb0', - zoom: '200%', - url: 'https://www.hoyolab.com/article/34259331', - showOnHome: true, - }, - { - name: 'Feast of Pursuit', - pos: '0% 20%', - image: 'Feast of Pursuit tmp.png', - start: '2024-11-01 10:00:00', - end: '2024-11-15 03:59:59', - color: '#d5b3d1', - zoom: '100%', - url: 'https://www.hoyolab.com/article/34470471', - showOnHome: true, - }, { name: 'Claw Convoy', pos: '0% 35%', - zoom: '100%', - image: 'Claw Convoy.png', + zoom: '200%', + image: 'Claw Convoy 2.png', start: '2024-11-22 10:00:00', end: '2024-12-02 03:59:59', color: '#ebf97b', - url: 'https://www.hoyolab.com/article/35015809', + url: 'https://www.hoyolab.com/article/35053992', showOnHome: true, }, ], [ - { - name: 'Aphid Treasure Trace', - pos: '0% 25%', - image: 'Aphid Treasure Trace.png', - start: '2024-10-10 10:00:00', - end: '2024-10-21 03:59:59', - color: '#5792f7', - zoom: '200%', - url: 'https://www.hoyolab.com/article/34043094', - showOnHome: true, - }, - { - name: 'Chromatic Ode of Candies and Roses', - pos: '30% 15%', - image: 'Chromatic Ode of Candies and Roses.png', - start: '2024-10-23 10:00:00', - end: '2024-11-07 03:59:59', - color: '#e4fce2', - zoom: '200%', - url: 'https://www.hoyolab.com/article/34402598', - showOnHome: true, - }, - { - name: 'Marvelous Merchandise', - pos: '0% 80%', - image: 'marvelous_merchandise_event.jpg', - start: '2024-11-11 10:00:00', - end: '2024-11-18 03:59:59', - color: '#fad688', - zoom: '200%', - url: 'https://www.hoyolab.com/article/34470471', - showOnHome: true, - }, { name: 'Iktomi Spiritseeking Scrolls', pos: '0% 35%', @@ -79,19 +24,19 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/35015809', showOnHome: true, }, - ], - [ { - name: 'The Rainbow Destined to Burn', - pos: '0% 10%', - image: 'The Rainbow Destined to Burn.png', - start: '2024-10-09 06:00:00', - end: '2024-11-19 14:59:59', - color: '#58a8ea', - zoom: '150%', - url: 'https://www.hoyolab.com/article/34010544', + name: 'Exercise Surging Storm', + pos: '0% 0%', + zoom: '200%', + image: 'Exercise Surging Storm.png', + start: '2024-12-18 10:00:00', + end: '2024-12-30 03:59:59', + color: '#e5b88a', + url: 'https://www.hoyolab.com/article/35393996', showOnHome: true, }, + ], + [ { name: 'Of Fading Flowers and Falling Feathers', pos: '0% 15%', @@ -99,36 +44,35 @@ export const eventsData = [ image: 'Of Fading Flowers and Falling Feathers.png', start: '2024-11-20 06:00:00', end: '2024-12-10 17:59:59', - color: '#c2c5ff', + color: '#94c3e1', url: 'https://www.hoyolab.com/article/35015714', showOnHome: true, timezoneDependent: true, }, + { + name: "Adventurer's Trials: Metamorphosis", + pos: '0% 15%', + zoom: '200%', + image: 'Adventurers Trials Metamorphosis.png', + start: '2024-12-11 10:00:00', + end: '2024-12-23 03:59:59', + color: '#8dc2f2', + url: 'https://www.hoyolab.com/article/35477560', + showOnHome: true, + }, + { + name: 'Ley Line Overflow', + pos: '0% 20%', + image: 'leyline_overflow.jpg', + start: '2024-12-23 04:00:00', + end: '2024-12-30 03:59:59', + color: '#5baced', + zoom: '200%', + url: 'https://www.hoyolab.com/article/35393996', + showOnHome: true, + }, ], [ - { - name: "Forgefire's Blessing - Xilonen Banner", - pos: '40% 25%', - zoom: '200%', - image: 'Forgefires Blessing 1.png', - start: '2024-10-09 06:00:00', - end: '2024-10-29 17:59:00', - color: '#fae3a4', - url: 'https://www.hoyolab.com/article/34010550', - showOnHome: true, - timezoneDependent: true, - }, - { - name: "The Moongrass' Enlightenment - Nahida Banner", - pos: '30% 15%', - zoom: '200%', - image: 'The Moongrass Enlightenment 4.png', - start: '2024-10-29 18:00:00', - end: '2024-11-19 14:59:00', - color: '#b8db94', - url: 'https://www.hoyolab.com/article/34470331', - showOnHome: true, - }, { name: "Piercing Shot's Crimson Wake - Chasca Banner", pos: '30% 20%', @@ -141,31 +85,19 @@ export const eventsData = [ showOnHome: true, timezoneDependent: true, }, + { + name: 'Decree of the Deeps - Neuvillette Banner', + pos: '30% 15%', + zoom: '200%', + image: 'Decree of the Deeps 3.png', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#72fefd', + url: 'https://www.hoyolab.com/article/35393826', + showOnHome: true, + }, ], [ - { - name: 'Of Silken Clouds Woven - Chiori Banner', - pos: '15% 15%', - zoom: '200%', - image: 'Of Silken Clouds Woven 2.png', - start: '2024-10-09 06:00:00', - end: '2024-10-29 17:59:00', - color: '#ffbd34', - url: 'https://www.hoyolab.com/article/34010550', - showOnHome: true, - timezoneDependent: true, - }, - { - name: 'Moment of Bloom - Hu Tao Banner', - pos: '40% 20%', - zoom: '200%', - image: 'Moment of Bloom 5.png', - start: '2024-10-29 18:00:00', - end: '2024-11-19 14:59:00', - color: '#c66051', - url: 'https://www.hoyolab.com/article/34470331', - showOnHome: true, - }, { name: 'Conjuring Chiaroscuro - Lyney Banner', pos: '30% 20%', @@ -178,31 +110,19 @@ export const eventsData = [ showOnHome: true, timezoneDependent: true, }, + { + name: 'Gentry of Hermitage - Zhongli Banner', + pos: '30% 15%', + zoom: '200%', + image: 'Gentry of Hermitage 6.png', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#D1A55C', + url: 'https://www.hoyolab.com/article/35393826', + showOnHome: true, + }, ], [ - { - name: 'Epitome Invocation - Weapon Banner', - pos: '40% 30%', - zoom: '200%', - image: 'Epitome Invocation 71.png', - start: '2024-10-09 06:00:00', - end: '2024-10-29 17:59:00', - color: '#FFAA4B', - url: 'https://www.hoyolab.com/article/34010550', - showOnHome: true, - timezoneDependent: true, - }, - { - name: 'Epitome Invocation - Weapon Banner', - pos: '40% 40%', - zoom: '200%', - image: 'Epitome Invocation 72.png', - start: '2024-10-29 18:00:00', - end: '2024-11-19 14:59:00', - color: '#FFAA4B', - url: 'https://www.hoyolab.com/article/34470331', - showOnHome: true, - }, { name: 'Epitome Invocation - Weapon Banner', pos: '40% 40%', @@ -215,17 +135,19 @@ export const eventsData = [ showOnHome: true, timezoneDependent: true, }, + { + name: 'Epitome Invocation - Weapon Banner', + pos: '40% 40%', + zoom: '200%', + image: 'Epitome Invocation 74.png', + start: '2024-12-10 18:00:00', + end: '2024-12-31 14:59:00', + color: '#FFAA4B', + url: 'https://www.hoyolab.com/article/35393826', + showOnHome: true, + }, ], [ - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2024-10-16 04:00:00', - end: '2024-11-16 04:00:00', - color: '#4299E1', - description: "After a character uses an Elemental Skill, said character's DEF increases by 60% for 9s.", - }, { name: 'Spiral Abyss', image: 'spiral_abyss.jpg', @@ -236,17 +158,18 @@ export const eventsData = [ description: "After the current active character's Charged Attack hits an opponent, said character's ATK increases by 20% for 8s. Max 4 stacks, each stack has an independent duration.", }, + { + name: 'Spiral Abyss', + image: 'spiral_abyss.jpg', + pos: '50% 20%', + start: '2024-12-16 04:00:00', + end: '2025-01-16 04:00:00', + color: '#4299E1', + description: + "All party members' Shield Strength is increased by 20%. While the active character is protected by a Shield, when they deal DMG to opponents, their attacks will unleash a shockwave at the opponents' position that deals True DMG. This can trigger once every 5s.", + }, ], [ - { - name: 'Imaginarium Theater', - image: 'Imaginarium Theater tmp.png', - pos: '0% 70%', - start: '2024-10-01 04:00:00', - end: '2024-11-01 04:00:00', - color: '#777df3', - description: 'Required Elemental Types: Pyro, Electro, and Geo.', - }, { name: 'Imaginarium Theater', image: 'Imaginarium Theater tmp.png', @@ -257,18 +180,28 @@ export const eventsData = [ description: 'Required Elemental Types: Pyro, Electro, and Dendro. Opening Characters: Klee, Xinyan, Yae Miko, Dori, Tighnari, and Kirara', }, + { + name: 'Imaginarium Theater', + image: 'Imaginarium Theater tmp.png', + pos: '0% 70%', + start: '2024-12-01 04:00:00', + end: '2025-01-01 04:00:00', + color: '#777df3', + description: + 'Required Elemental Types: Hydro, Electro, and Anemo. Opening Characters: Sangonomiya Kokomi, Xingqiu, Raiden Shogun, Kujou Sara, Jean, and Lynette', + }, + { + name: 'Imaginarium Theater', + image: 'Imaginarium Theater tmp.png', + pos: '0% 70%', + start: '2025-01-01 04:00:00', + end: '2025-02-01 04:00:00', + color: '#777df3', + description: + 'Required Elemental Types: Pyro, Cryo, and Geo. Opening Characters: Diluc, Bennett, Ganyu, Kaeya, Navia, and Noelle', + }, ], [ - { - name: 'Battle Pass - Sabzeruz', - pos: '0% 45%', - image: 'Sabzeruz.png', - start: '2024-10-09 06:00:00', - end: '2024-11-18 03:59:59', - color: '#dcebbe', - url: 'https://www.hoyolab.com/article/34010692', - timezoneDependent: true, - }, { name: 'Battle Pass - Spiritweaver', pos: '0% 45%', diff --git a/src/routes/_index/banner.svelte b/src/routes/_index/banner.svelte index f160ae3e..fa415487 100644 --- a/src/routes/_index/banner.svelte +++ b/src/routes/_index/banner.svelte @@ -13,25 +13,25 @@ const dispatch = createEventDispatcher(); const featured = { - lyney: { - name: 'Lyney', + neuvillette: { + name: 'Neuvillette', rarity: 'legendary', count: 0, average: '...', percentage: '...', }, - chasca: { - name: 'Chasca', + zhongli: { + name: 'Zhongli', rarity: 'legendary', count: 0, average: '...', percentage: '...', }, }; - const bannerId = 300074; - const image = 'lyney chasca.png'; + const bannerId = 300075; + const image = 'neuvillette zhongli.png'; const width = 800; - const height = 449; + const height = 585; let loading = true; let user = ''; diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 5866d509..00227b3b 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,6 +1,6 @@