diff --git a/src/data/events.js b/src/data/events.js index 3c21cf66..6d876080 100644 --- a/src/data/events.js +++ b/src/data/events.js @@ -893,7 +893,7 @@ export const events = [ name: 'Wind Chaser', pos: '20% 20%', zoom: '200%', - image: 'wind_chaser.jpg', + image: 'wind_chaser_1.jpg', start: '2022-10-17 10:00:00', end: '2022-10-31 03:59:59', color: '#43f4cd', @@ -903,7 +903,7 @@ export const events = [ { name: "Star-Seeker's Sojourn", pos: '20% 50%', - image: 'star_seeker_sojourn.jpg', + image: 'star_seeker_sojourn_1.jpg', start: '2022-10-21 10:00:00', end: '2022-10-31 03:59:59', color: '#84be69', @@ -911,4 +911,48 @@ export const events = [ url: 'https://www.hoyolab.com/article/12081070', showOnHome: true, }, + { + name: 'Songs of the Forest', + pos: '0% 30%', + image: 'songs_of_the_forest.jpg', + start: '2022-10-24 12:00:00', + end: '2022-10-31 23:59:59', + color: '#fffbed', + zoom: '100%', + url: 'https://www.hoyolab.com/article/12973970', + showOnHome: true, + }, + { + name: 'May Your Dreams of Wisdom Come True', + pos: '0% 30%', + image: 'may_your_dreams_of_wisdom_come_true.png', + start: '2022-10-28 12:00:00', + end: '2022-11-02 23:59:59', + color: '#f5f8c6', + zoom: '200%', + url: 'https://www.hoyolab.com/article/13156542', + showOnHome: true, + }, + { + name: "Adventurer's Trial", + pos: '50% 50%', + zoom: '100%', + image: 'adventurers_trials_temp.jpg', + start: '2022-11-04 10:00:00', + end: '2022-11-21 03:59:59', + color: '#e5c2ee', + url: 'https://www.hoyolab.com/article/13249651', + showOnHome: true, + }, + { + name: 'Fabulous Fungus Frenzy', + pos: '50% 40%', + zoom: '200%', + image: 'fabulous_fungus_frenzy_temp.jpg', + start: '2022-11-10 10:00:00', + end: '2022-11-28 03:59:59', + color: '#eceac4', + url: 'https://www.hoyolab.com/article/13249651', + showOnHome: true, + }, ]; diff --git a/src/data/timeline.js b/src/data/timeline.js index cfd2c57f..f851f189 100644 --- a/src/data/timeline.js +++ b/src/data/timeline.js @@ -24,19 +24,19 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/9406156', showOnHome: true, }, - ], - [ { - name: 'Adventure in the Forest', - pos: '0% 20%', - image: 'adventure_in_the_forest.jpg', - start: '2022-08-29 12:00:00', - end: '2022-09-11 23:59:59', - color: '#a7d0a6', + name: 'Songs of the Forest', + pos: '0% 30%', + image: 'songs_of_the_forest.jpg', + start: '2022-10-24 12:00:00', + end: '2022-10-31 23:59:59', + color: '#fffbed', zoom: '100%', - url: 'https://www.hoyolab.com/article/7293007', + url: 'https://www.hoyolab.com/article/12973970', showOnHome: true, }, + ], + [ { name: 'Trial of the Scorching Sands', pos: '60% 30%', @@ -70,23 +70,23 @@ export const eventsData = [ url: 'https://act.hoyoverse.com/ys/event/e20221008nilou/index.html?game_biz=hk4e_global&mhy_presentation_style=fullscreen&mhy_auth_required=true&mhy_landscape=true&mhy_hide_status_bar=true&utm_source=hoyolab&utm_medium=post', showOnHome: true, }, + { + name: 'May Your Dreams of Wisdom Come True', + pos: '0% 30%', + image: 'may_your_dreams_of_wisdom_come_true.png', + start: '2022-10-28 12:00:00', + end: '2022-11-02 23:59:59', + color: '#f5f8c6', + zoom: '200%', + url: 'https://www.hoyolab.com/article/13156542', + showOnHome: true, + }, ], [ - { - name: 'Tablet Analytics', - pos: '0% 50%', - image: 'tablet_analytics_r.jpg', - start: '2022-09-15 10:00:00', - end: '2022-09-26 03:59:59', - color: '#80d7b0', - zoom: '200%', - url: 'https://www.hoyolab.com/article/8843590', - showOnHome: true, - }, { name: 'Genshin Concert 2022', pos: '60% 30%', - image: 'star_seeker_sojourn.jpg', + image: 'genshin_concert_2022.jpg', start: '2022-09-26 04:00:00', end: '2022-10-01 23:59:59', color: '#e2feff', @@ -96,28 +96,17 @@ export const eventsData = [ }, { name: "Star-Seeker's Sojourn", - pos: '20% 50%', - image: 'star_seeker_sojourn.jpg', + pos: '0% 60%', + image: 'star_seeker_sojourn_1.jpg', start: '2022-10-21 10:00:00', end: '2022-10-31 03:59:59', color: '#84be69', - zoom: '150%', + zoom: '200%', url: 'https://www.hoyolab.com/article/12081070', showOnHome: true, }, ], [ - { - name: 'Fayz Trials', - pos: '0% 50%', - image: 'fayz_trials_1.jpg', - start: '2022-09-08 10:00:00', - end: '2022-09-26 03:59:59', - color: '#ff9486', - zoom: '200%', - url: 'https://www.hoyolab.com/article/7113923', - showOnHome: true, - }, { name: 'Path of Gleaming Jade - Daily Login', pos: '0% 45%', @@ -131,28 +120,6 @@ export const eventsData = [ }, ], [ - { - name: 'Lost Riches', - pos: '0% 60%', - image: 'lost_riches_3.jpg', - start: '2022-09-02 10:00:00', - end: '2022-09-19 03:59:59', - color: '#FFF2DC', - zoom: '250%', - url: 'https://www.hoyolab.com/article/7113923', - showOnHome: true, - }, - { - name: 'Ley Line Overflow', - pos: '0% 35%', - image: 'leyline_overflow.jpg', - start: '2022-09-20 04:00:00', - end: '2022-09-27 03:59:59', - color: '#43DA8C', - zoom: '200%', - url: 'https://www.hoyolab.com/article/8555140', - showOnHome: true, - }, { name: 'Of Travels and Treasures', pos: '60% 40%', @@ -176,19 +143,19 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/9331594', showOnHome: true, }, - ], - [ { - name: 'Graven Innocence', - pos: '0% 20%', + name: 'Fabulous Fungus Frenzy', + pos: '50% 40%', zoom: '200%', - image: 'graven_innocence.jpg', - start: '2022-08-24 06:00:00', - end: '2022-09-28 06:00:00', - color: '#c4e6f8', - url: 'https://www.hoyolab.com/article/7113808', + image: 'fabulous_fungus_frenzy_temp.jpg', + start: '2022-11-10 10:00:00', + end: '2022-11-28 03:59:59', + color: '#eceac4', + url: 'https://www.hoyolab.com/article/13249651', showOnHome: true, }, + ], + [ { name: 'Of Ballads and Brews', pos: '0% 20%', @@ -202,40 +169,28 @@ export const eventsData = [ }, { name: 'Wind Chaser', - pos: '20% 20%', + pos: '0% 20%', zoom: '200%', - image: 'wind_chaser.jpg', + image: 'wind_chaser_1.jpg', start: '2022-10-17 10:00:00', end: '2022-10-31 03:59:59', color: '#43f4cd', url: 'https://www.hoyolab.com/article/12081070', showOnHome: true, }, + { + name: "Adventurer's Trial", + pos: '50% 50%', + zoom: '100%', + image: 'adventurers_trials_temp.jpg', + start: '2022-11-04 10:00:00', + end: '2022-11-21 03:59:59', + color: '#e5c2ee', + url: 'https://www.hoyolab.com/article/13249651', + showOnHome: true, + }, ], [ - { - name: 'Viridescent Vigil - Tighnari Banner', - pos: '30% 15%', - zoom: '200%', - image: 'viridescent_vigil_1.jpg', - start: '2022-08-24 06:00:00', - end: '2022-09-09 17:59:59', - color: '#76df81', - url: 'https://www.hoyolab.com/article/7113809', - showOnHome: true, - timezoneDependent: true, - }, - { - name: 'Adrift in the Harbor - Ganyu Banner', - pos: '30% 15%', - zoom: '200%', - image: 'adrift_in_the_harbor_3.jpg', - start: '2022-09-09 18:00:00', - end: '2022-09-27 14:59:59', - color: '#ceebf3', - url: 'https://www.hoyolab.com/article/8554614', - showOnHome: true, - }, { name: 'Twilight Arbiter - Cyno Banner', pos: '30% 20%', @@ -259,31 +214,20 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/12079386', showOnHome: true, }, - ], - [ { - name: 'Gentry of Hermitage - Zhongli Banner', + name: "The Moongrass' Enlightenment", pos: '30% 15%', zoom: '200%', - image: 'gentry_of_hermitage_4.jpg', - start: '2022-08-24 06:00:00', - end: '2022-09-09 17:59:59', - color: '#D1A55C', - url: 'https://www.hoyolab.com/article/7113810', + image: 'the_moongrass_enlightenment_1.jpg', + start: '2022-11-02 06:00:00', + end: '2022-11-18 17:59:59', + color: '#a4deb1', + url: 'https://www.hoyolab.com/article/13249513', showOnHome: true, timezoneDependent: true, }, - { - name: 'Drifting Luminescence - Kokomi Banner', - pos: '30% 15%', - zoom: '200%', - image: 'drifting_luminescence_3.jpg', - start: '2022-09-09 18:00:00', - end: '2022-09-27 14:59:59', - color: '#53caf3', - url: 'https://www.hoyolab.com/article/8554621', - showOnHome: true, - }, + ], + [ { name: 'Ballad in Goblets - Venti Banner', pos: '30% 20%', @@ -307,31 +251,20 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/12079396', showOnHome: true, }, - ], - [ { - name: 'Epitome Invocation - Weapon Banner', - pos: '30% 30%', - zoom: '150%', - image: 'epitome_invocation_33.jpg', - start: '2022-08-24 06:00:00', - end: '2022-09-09 17:59:59', - color: '#FFAA4B', - url: 'https://www.hoyolab.com/article/7113811', + name: 'Tapestry of Golden Flames - Yoimiya Banner', + pos: '30% 25%', + zoom: '200%', + image: 'tapestry_of_golden_flames_3.jpg', + start: '2022-11-02 06:00:00', + end: '2022-11-18 17:59:59', + color: '#fc8976', + url: 'https://www.hoyolab.com/article/13249513', showOnHome: true, timezoneDependent: true, }, - { - name: 'Epitome Invocation - Weapon Banner', - pos: '30% 40%', - zoom: '150%', - image: 'epitome_invocation_34.jpg', - start: '2022-09-09 18:00:00', - end: '2022-09-27 14:59:59', - color: '#FFAA4B', - url: 'https://www.hoyolab.com/article/8554622', - showOnHome: true, - }, + ], + [ { name: 'Epitome Invocation - Weapon Banner', pos: '30% 20%', @@ -355,28 +288,20 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/12079400', showOnHome: true, }, + { + name: 'Epitome Invocation - Weapon Banner', + pos: '30% 35%', + zoom: '150%', + image: 'epitome_invocation_37.jpg', + start: '2022-11-02 06:00:00', + end: '2022-11-18 17:59:59', + color: '#FFAA4B', + url: 'https://www.hoyolab.com/article/13249513', + showOnHome: true, + timezoneDependent: true, + }, ], [ - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2022-08-16 04:00:00', - end: '2022-09-01 04:00:00', - color: '#4299E1', - description: - "After the active character's Normal, Charged, or Plunging Attacks hit opponents, that character's Normal, Charged, and Plunging Attack DMG is increased by 12% for 8s. This effect can be triggered once every 0.1s. Max 4 stacks. Each stack's duration is counted independently. This effect will be cleared if the character leaves the field.", - }, - { - name: 'Spiral Abyss', - image: 'spiral_abyss.jpg', - pos: '50% 20%', - start: '2022-09-01 04:00:00', - end: '2022-09-16 04:00:00', - color: '#4299E1', - description: - 'After characters deal DMG to opponents with a Dendro Core (including Burgeon and Hyperbloom), their ATK will be increased by 15% for 8s. This effect can stack up to 4 times, and can be triggered once every 0.1s. ', - }, { name: 'Spiral Abyss', image: 'spiral_abyss.jpg', @@ -419,16 +344,6 @@ export const eventsData = [ }, ], [ - { - name: "Paimon's Bargain - Beidou, Noelle, and Royal", - pos: '0% 50%', - zoom: '150%', - start: '2022-08-01 04:00:00', - end: '2022-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%', @@ -449,18 +364,18 @@ export const eventsData = [ image: 'paimon_bargain.png', description: 'Now selling: Razor, Amber, and Royal Weapons.', }, + { + name: "Paimon's Bargain - Bennet, Lisa, and Blackcliff", + pos: '0% 50%', + zoom: '150%', + start: '2022-11-01 04:00:00', + end: '2022-12-01 04:00:00', + color: '#B6A1EA', + image: 'paimon_bargain.png', + description: 'Now selling: Bennet, Lisa, and Blackcliff Weapons.', + }, ], [ - { - name: 'Battle Pass - Luxuriant Woodlands', - pos: '0% 12%', - image: 'luxuriant_woodlands.jpg', - start: '2022-08-24 06:00:00', - end: '2022-09-26 03:59:59', - color: '#7bc9af', - url: 'https://www.hoyolab.com/article/7113923', - timezoneDependent: true, - }, { name: 'Battle Pass - Returning Winds', pos: '0% 12%', @@ -471,5 +386,15 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/9331594', timezoneDependent: true, }, + { + name: 'Battle Pass - A Previous Life', + pos: '0% 12%', + image: 'a_previous_life.jpg', + start: '2022-11-02 06:00:00', + end: '2022-12-05 03:59:59', + color: '#e3bd71', + url: 'https://www.hoyolab.com/article/13249651', + timezoneDependent: true, + }, ], ]; diff --git a/src/service-worker.js b/src/service-worker.js index d8650cec..3e439bdd 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 = ['Bug fix', 'Update Banner', 'Add Nilou', 'Update timeline']; +const changelog = ['Update timeline']; const channel = new BroadcastChannel('paimonmoe-sw'); diff --git a/static/images/events/a_previous_life.jpg b/static/images/events/a_previous_life.jpg new file mode 100644 index 00000000..5b6115e0 Binary files /dev/null and b/static/images/events/a_previous_life.jpg differ diff --git a/static/images/events/adventurers_trials_temp.jpg b/static/images/events/adventurers_trials_temp.jpg new file mode 100644 index 00000000..a66d25bf Binary files /dev/null and b/static/images/events/adventurers_trials_temp.jpg differ diff --git a/static/images/events/epitome_invocation_37.jpg b/static/images/events/epitome_invocation_37.jpg new file mode 100644 index 00000000..22a31e1d Binary files /dev/null and b/static/images/events/epitome_invocation_37.jpg differ diff --git a/static/images/events/fabulous_fungus_frenzy_temp.jpg b/static/images/events/fabulous_fungus_frenzy_temp.jpg new file mode 100644 index 00000000..9426c247 Binary files /dev/null and b/static/images/events/fabulous_fungus_frenzy_temp.jpg differ diff --git a/static/images/events/may_your_dreams_of_wisdom_come_true.png b/static/images/events/may_your_dreams_of_wisdom_come_true.png new file mode 100644 index 00000000..52435d67 Binary files /dev/null and b/static/images/events/may_your_dreams_of_wisdom_come_true.png differ diff --git a/static/images/events/songs_of_the_forest.jpg b/static/images/events/songs_of_the_forest.jpg new file mode 100644 index 00000000..a8f944cc Binary files /dev/null and b/static/images/events/songs_of_the_forest.jpg differ diff --git a/static/images/events/star_seeker_sojourn_1.jpg b/static/images/events/star_seeker_sojourn_1.jpg new file mode 100644 index 00000000..6a69b378 Binary files /dev/null and b/static/images/events/star_seeker_sojourn_1.jpg differ diff --git a/static/images/events/tapestry_of_golden_flames_3.jpg b/static/images/events/tapestry_of_golden_flames_3.jpg new file mode 100644 index 00000000..5b395ebb Binary files /dev/null and b/static/images/events/tapestry_of_golden_flames_3.jpg differ diff --git a/static/images/events/the_moongrass_enlightenment_1.jpg b/static/images/events/the_moongrass_enlightenment_1.jpg new file mode 100644 index 00000000..e38faac1 Binary files /dev/null and b/static/images/events/the_moongrass_enlightenment_1.jpg differ diff --git a/static/images/events/wind_chaser_1.jpg b/static/images/events/wind_chaser_1.jpg new file mode 100644 index 00000000..3df2a165 Binary files /dev/null and b/static/images/events/wind_chaser_1.jpg differ