diff --git a/src/data/events.js b/src/data/events.js index 9d691a5e..2dc16096 100644 --- a/src/data/events.js +++ b/src/data/events.js @@ -1456,7 +1456,7 @@ export const events = [ name: 'The Peaks and Troughs of Life', pos: '0% 40%', zoom: '100%', - image: 'The Peaks and Troughs of Life tmp.png', + image: 'The Peaks and Troughs of Life.png', start: '2023-10-23 10:00:00', end: '2023-11-06 03:59:59', color: '#a6ceb3', diff --git a/src/data/timeline.js b/src/data/timeline.js index ce265a6d..ee13a6d3 100644 --- a/src/data/timeline.js +++ b/src/data/timeline.js @@ -24,28 +24,6 @@ export const eventsData = [ }, ], [ - { - name: 'Mega Meka Melee', - pos: '80% 25%', - zoom: '250%', - image: 'Mega Meka Melee.jpg', - start: '2023-08-24 10:00:00', - end: '2023-09-11 03:59:59', - color: '#a1dffe', - url: 'https://www.hoyolab.com/article/21096726', - showOnHome: true, - }, - { - name: 'Studies in Light and Shadow: A Fontaine of Enchantment', - pos: '0% 50%', - zoom: '200%', - image: 'Studies in Light and Shadow A Fontaine of Enchantment temp.jpg', - start: '2023-09-14 10:00:00', - end: '2023-09-25 03:59:59', - color: '#dfd2ab', - url: 'https://www.hoyolab.com/article/21297643', - showOnHome: true, - }, { name: 'Bathing in Flowing Moonlight: Daily Login', pos: '0% 40%', @@ -60,50 +38,27 @@ export const eventsData = [ { name: 'The Peaks and Troughs of Life', pos: '0% 40%', - zoom: '100%', - image: 'The Peaks and Troughs of Life tmp.png', + zoom: '250%', + image: 'The Peaks and Troughs of Life.png', start: '2023-10-23 10:00:00', end: '2023-11-06 03:59:59', color: '#a6ceb3', url: 'https://www.hoyolab.com/article/22272349', showOnHome: true, }, + { + name: 'Graph Adversarial Technology Experiment Log', + pos: '0% 50%', + zoom: '100%', + image: 'Graph Adversarial Technology Experiment Log tmp.png', + start: '2023-11-17 10:00:00', + end: '2023-11-27 03:59:59', + color: '#eae4dd', + url: 'https://www.hoyolab.com/article/22782228', + showOnHome: true, + }, ], [ - { - name: 'Relic Records: Creations of the Hydro Nation', - pos: '0% 50%', - zoom: '300%', - image: 'Relic Records Creations of the Hydro Nation.jpg', - start: '2023-08-16 06:00:00', - end: '2023-08-28 03:59:59', - color: '#71d4e7', - url: 'https://www.hoyolab.com/article/20856332', - showOnHome: true, - timezoneDependent: true, - }, - { - name: 'Verdict of Blades', - pos: '0% 20%', - zoom: '200%', - image: 'Verdict of Blades.jpg', - start: '2023-09-04 10:00:00', - end: '2023-09-18 03:59:59', - color: '#2aabff', - url: 'https://www.hoyolab.com/article/21344686', - showOnHome: true, - }, - { - name: 'Ley Line Overflow', - pos: '0% 40%', - zoom: '200%', - image: 'leyline_overflow.jpg', - start: '2023-09-18 04:00:00', - end: '2023-09-25 03:59:59', - color: '#5baced', - url: 'https://www.hoyolab.com/article/21297643', - showOnHome: true, - }, { name: 'Radiant Harvest', pos: '0% 20%', @@ -126,38 +81,37 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/21853732', showOnHome: true, }, + { + name: 'Misty Dungeon: Realm of Water', + pos: '0% 50%', + zoom: '200%', + image: 'Misty Dungeon Realm of Water.png', + start: '2023-11-09 10:00:00', + end: '2023-11-20 03:59:59', + color: '#2da6b1', + url: 'https://www.hoyolab.com/article/22800499', + showOnHome: true, + }, + { + name: "Thelxie's Fantastic Adventures", + pos: '40% 60%', + zoom: '200%', + image: 'Thelxies Fantastic Adventures tmp.png', + start: '2023-11-23 10:00:00', + end: '2023-12-11 03:59:59', + color: '#83abe1', + url: 'https://www.hoyolab.com/article/22782228', + showOnHome: true, + }, ], [ - { - name: 'Conjuring Chiaroscuro - Lyney Banner', - pos: '30% 10%', - zoom: '200%', - image: 'Conjuring Chiaroscuro 1.jpg', - start: '2023-08-16 06:00:00', - end: '2023-09-05 17:59:59', - color: '#fcc6c8', - url: 'https://www.hoyolab.com/article/20856334', - showOnHome: true, - timezoneDependent: true, - }, - { - name: 'Gentry of Hermitage - Zhongli Banner', - pos: '30% 10%', - zoom: '200%', - image: 'Gentry of Hermitage 5.jpg', - start: '2023-09-05 18:00:00', - end: '2023-09-26 14:59:59', - color: '#D1A55C', - url: 'https://www.hoyolab.com/article/21297488', - showOnHome: true, - }, { name: 'Decree of the Deeps - Neuvillette Banner', pos: '30% 10%', zoom: '200%', image: 'Decree of the Deeps 1.jpg', start: '2023-09-27 06:00:00', - end: '2023-10-17 17:59:59', + end: '2023-10-08 17:59:59', color: '#6ed4ff', url: 'https://www.hoyolab.com/article/21853619', showOnHome: true, @@ -169,36 +123,25 @@ export const eventsData = [ zoom: '200%', image: 'Tempestuous Destiny 1.jpg', start: '2023-10-17 18:00:00', - end: '2023-11-17 14:59:59', + end: '2023-11-07 14:59:59', color: '#b3d7f1', url: 'https://www.hoyolab.com/article/22272212', showOnHome: true, }, - ], - [ { - name: 'Discerner of Enigmas - Yelan Banner', - pos: '30% 15%', + name: 'Chanson of Many Waters - Furina Banner', + pos: '40% 15%', zoom: '200%', - image: 'Discerner of Enigmas 3.jpg', - start: '2023-08-16 06:00:00', - end: '2023-09-05 17:59:59', - color: '#4666ff', - url: 'https://www.hoyolab.com/article/20856334', + image: 'Chanson of Many Waters 1.jpg', + start: '2023-11-08 06:00:00', + end: '2023-11-28 17:59:59', + color: '#95d6fb', + url: 'https://www.hoyolab.com/article/22782167', showOnHome: true, timezoneDependent: true, }, - { - name: 'Farewell of Snezhnaya - Tartaglia Banner', - pos: '30% 10%', - zoom: '200%', - image: 'Farewell of Snezhnaya 5.jpg', - start: '2023-09-05 18:00:00', - end: '2023-09-26 14:59:59', - color: '#4ED8F3', - url: 'https://www.hoyolab.com/article/21297488', - showOnHome: true, - }, + ], + [ { name: 'Moment of Bloom - Hu Tao Banner', pos: '50% 15%', @@ -217,36 +160,25 @@ export const eventsData = [ zoom: '200%', image: 'Ballad in Goblets 5.jpg', start: '2023-10-17 18:00:00', - end: '2023-11-17 14:59:59', + end: '2023-11-07 14:59:59', color: '#96f6de', url: 'https://www.hoyolab.com/article/22272212', showOnHome: true, }, - ], - [ { - name: 'Epitome Invocation - Weapon Banner', - pos: '30% 35%', - zoom: '150%', - image: 'Epitome Invocation 51.jpg', - start: '2023-08-16 06:00:00', - end: '2023-09-05 17:59:59', - color: '#FFAA4B', - url: 'https://www.hoyolab.com/article/20856334', + name: 'Immaculate Pulse - Baizhu Banner', + pos: '30% 15%', + zoom: '200%', + image: 'Immaculate Pulse 2.jpg', + start: '2023-11-08 06:00:00', + end: '2023-11-28 17:59:59', + color: '#8fdaa0', + url: 'https://www.hoyolab.com/article/22782167', showOnHome: true, timezoneDependent: true, }, - { - name: 'Epitome Invocation - Weapon Banner', - pos: '30% 35%', - zoom: '150%', - image: 'Epitome Invocation 52.jpg', - start: '2023-09-05 18:00:00', - end: '2023-09-26 14:59:59', - color: '#FFAA4B', - url: 'https://www.hoyolab.com/article/21297488', - showOnHome: true, - }, + ], + [ { name: 'Epitome Invocation - Weapon Banner', pos: '30% 25%', @@ -265,53 +197,25 @@ export const eventsData = [ zoom: '150%', image: 'Epitome Invocation 54.jpg', start: '2023-10-17 18:00:00', - end: '2023-11-17 14:59:59', + end: '2023-11-07 14:59:59', color: '#FFAA4B', url: 'https://www.hoyolab.com/article/22272212', showOnHome: true, }, + { + name: 'Epitome Invocation - Weapon Banner', + pos: '30% 25%', + zoom: '150%', + image: 'Epitome Invocation 55.jpg', + start: '2023-11-08 06:00:00', + end: '2023-11-28 17:59:59', + color: '#FFAA4B', + url: 'https://www.hoyolab.com/article/22782167', + showOnHome: true, + timezoneDependent: true, + }, ], [ - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2023-08-01 04:00:00', - end: '2023-08-16 04:00:00', - color: '#4299E1', - description: - 'When a character loses or restores HP, all party members will gain 7.5% increased ATK for 10s. This effect can be triggered once every 0.1s. Max 4 stacks. Each stack will be counted independently.', - }, - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2023-08-16 04:00:00', - end: '2023-09-01 04:00:00', - color: '#4299E1', - description: - "When the active character deals consecutive instances of Elemental DMG of the same Elemental Type or Physical DMG using Normal, Charged, or Plunging Attacks to an opponent, they will gain 1 count stack. 1 stack can be gained every 0.3s. The stacks for every Elemental and Physical DMG will be counted independently. After 6 stacks have been gained, a shockwave will be unleashed at the opponent's position, dealing True DMG and clearing all previously accumulated stacks for this DMG type. Should the active character leave the field, these stacks will be cleared.", - }, - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2023-08-16 04:00:00', - end: '2023-09-01 04:00:00', - color: '#4299E1', - description: - "When the active character deals consecutive instances of Elemental DMG of the same Elemental Type or Physical DMG using Normal, Charged, or Plunging Attacks to an opponent, they will gain 1 count stack. 1 stack can be gained every 0.3s. The stacks for every Elemental and Physical DMG will be counted independently. After 6 stacks have been gained, a shockwave will be unleashed at the opponent's position, dealing True DMG and clearing all previously accumulated stacks for this DMG type. Should the active character leave the field, these stacks will be cleared.", - }, - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2023-09-01 04:00:00', - end: '2023-09-16 04:00:00', - color: '#4299E1', - description: - 'When a character recovers HP, that character gains 10% increased ATK for 10s. Max 3 stacks. Each stack will be counted independently. When a character loses HP, that character gains 40 Elemental Mastery for 10s. Max 3 stacks. Each stack will be counted independently. The effects from recovering and losing HP are independent from each other, and stacks are counted independently.', - }, { name: 'Spiral Abyss', image: 'spiral_abyss.jpg', @@ -354,26 +258,6 @@ export const eventsData = [ }, ], [ - { - name: "Paimon's Bargain - Beidou, Noelle, and Royal", - pos: '0% 50%', - zoom: '150%', - start: '2023-08-01 04:00:00', - end: '2023-09-01 04:00:00', - color: '#B6A1EA', - image: 'paimon_bargain.png', - description: 'Now selling: Beidou, Noelle, and Royal Weapons.', - }, - { - name: "Paimon's Bargain - Ningguang, Xingqiu, and Blackcliff", - pos: '0% 50%', - zoom: '150%', - start: '2023-09-01 04:00:00', - end: '2023-10-01 04:00:00', - color: '#B6A1EA', - image: 'paimon_bargain.png', - description: 'Now selling: Ningguang, Xingqiu, and Blackcliff Weapons.', - }, { name: "Paimon's Bargain - Razor, Amber, and Royal", pos: '0% 50%', @@ -384,18 +268,18 @@ export const eventsData = [ image: 'paimon_bargain.png', description: 'Now selling: Razor, Amber, and Royal Weapons.', }, + { + name: "Paimon's Bargain - Bennett, Lisa, and Blackcliff", + pos: '0% 50%', + zoom: '150%', + start: '2023-11-01 04:00:00', + end: '2023-12-01 04:00:00', + color: '#B6A1EA', + image: 'paimon_bargain.png', + description: 'Now selling: Bennett, Lisa, and Blackcliff Weapons.', + }, ], [ - { - name: 'Battle Pass - Primordial Waters', - pos: '0% 25%', - image: 'Primordial Waters.jpg', - start: '2023-08-16 06:00:00', - end: '2023-09-25 03:59:59', - color: '#31bccf', - url: 'https://www.hoyolab.com/article/20856332', - timezoneDependent: true, - }, { name: 'Battle Pass - Falling Star', pos: '0% 25%', @@ -406,5 +290,15 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/21853732', timezoneDependent: true, }, + { + name: 'Battle Pass - Whirling Waltz', + pos: '0% 25%', + image: 'Whirling Waltz.jpg', + start: '2023-11-08 06:00:00', + end: '2023-12-18 03:59:59', + color: '#46ace8', + url: 'https://www.hoyolab.com/article/21853732', + timezoneDependent: true, + }, ], ]; diff --git a/src/service-worker.js b/src/service-worker.js index ce8ec056..2c43347d 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -7,7 +7,7 @@ const IMAGE_CACHE = `cacheimg${IMAGE_CACHE_VER}`; const IMAGE_URL = `${self.location.origin}/images/`; -const changelog = ['Update banners', 'Update character', 'Fix missing achievements']; +const changelog = ['Update timelines']; const channel = new BroadcastChannel('paimonmoe-sw'); diff --git a/static/images/events/Chanson of Many Waters 1.jpg b/static/images/events/Chanson of Many Waters 1.jpg new file mode 100644 index 00000000..5d8b232b Binary files /dev/null and b/static/images/events/Chanson of Many Waters 1.jpg differ diff --git a/static/images/events/Epitome Invocation 55.jpg b/static/images/events/Epitome Invocation 55.jpg new file mode 100644 index 00000000..4aa9e668 Binary files /dev/null and b/static/images/events/Epitome Invocation 55.jpg differ diff --git a/static/images/events/Graph Adversarial Technology Experiment Log tmp.png b/static/images/events/Graph Adversarial Technology Experiment Log tmp.png new file mode 100644 index 00000000..78ac1c50 Binary files /dev/null and b/static/images/events/Graph Adversarial Technology Experiment Log tmp.png differ diff --git a/static/images/events/Immaculate Pulse 2.jpg b/static/images/events/Immaculate Pulse 2.jpg new file mode 100644 index 00000000..380490c1 Binary files /dev/null and b/static/images/events/Immaculate Pulse 2.jpg differ diff --git a/static/images/events/Misty Dungeon Realm of Water.png b/static/images/events/Misty Dungeon Realm of Water.png new file mode 100644 index 00000000..a5cb8026 Binary files /dev/null and b/static/images/events/Misty Dungeon Realm of Water.png differ diff --git a/static/images/events/The Peaks and Troughs of Life.png b/static/images/events/The Peaks and Troughs of Life.png new file mode 100644 index 00000000..bc098df3 Binary files /dev/null and b/static/images/events/The Peaks and Troughs of Life.png differ diff --git a/static/images/events/Thelxies Fantastic Adventures tmp.png b/static/images/events/Thelxies Fantastic Adventures tmp.png new file mode 100644 index 00000000..834b54ba Binary files /dev/null and b/static/images/events/Thelxies Fantastic Adventures tmp.png differ diff --git a/static/images/events/Whirling Waltz.jpg b/static/images/events/Whirling Waltz.jpg new file mode 100644 index 00000000..3cbe0430 Binary files /dev/null and b/static/images/events/Whirling Waltz.jpg differ