diff --git a/src/data/events.js b/src/data/events.js index 03eb8257..cd7435bc 100644 --- a/src/data/events.js +++ b/src/data/events.js @@ -758,19 +758,19 @@ export const events = [ }, { name: 'Tablet Analytics', - pos: '100% 50%', - image: 'tablet_analytics.jpg', + pos: '0% 50%', + image: 'tablet_analytics_r.jpg', start: '2022-09-15 10:00:00', end: '2022-09-26 03:59:59', - color: '#c3d545', - zoom: '100%', - url: 'https://www.hoyolab.com/article/8555140', + color: '#80d7b0', + zoom: '200%', + url: 'https://www.hoyolab.com/article/8843590', showOnHome: true, }, { name: 'Ley Line Overflow', pos: '20% 35%', - image: 'ley_line_overflow.jpg', + image: 'leyline_overflow.jpg', start: '2022-09-20 04:00:00', end: '2022-09-27 03:59:59', color: '#43DA8C', @@ -778,4 +778,71 @@ export const events = [ url: 'https://www.hoyolab.com/article/8555140', showOnHome: true, }, + { + name: 'Trial of the Scorching Sands', + pos: '60% 30%', + image: 'trial_of_the_scorching_sands.jpg', + start: '2022-09-23 12:00:00', + end: '2022-09-28 23:59:59', + color: '#ebcca0', + zoom: '100%', + url: 'https://www.hoyolab.com/article/9182888', + showOnHome: true, + }, + { + name: 'Genshin Concert 2022', + pos: '60% 30%', + image: 'genshin_concert_2022.jpg', + start: '2022-09-26 04:00:00', + end: '2022-10-01 23:59:59', + color: '#e2feff', + zoom: '100%', + url: 'https://genshin.hoyoverse.com/concert2022', + showOnHome: true, + }, + { + name: 'Path of Gleaming Jade - Daily Login', + pos: '0% 45%', + image: 'path_of_gleaming_jade.jpg', + start: '2022-10-14 10:00:00', + end: '2022-10-31 03:59:59', + color: '#df8bb9', + zoom: '250%', + url: 'https://www.hoyolab.com/article/9331343', + showOnHome: true, + }, + { + name: 'Of Travels and Treasures', + pos: '60% 40%', + image: 'of_travels_and_treasures.jpg', + start: '2022-09-28 06:00:00', + end: '2022-10-07 23:59:59', + color: '#82b4ce', + zoom: '200%', + url: 'https://www.hoyolab.com/article/9331351', + showOnHome: true, + timezoneDependent: true, + }, + { + name: 'Hyakunin Ikki', + pos: '0% 55%', + image: 'hyakunin_ikki.jpg', + start: '2022-10-10 10:00:00', + end: '2022-10-24 03:59:59', + color: '#e494b4', + zoom: '200%', + url: 'https://www.hoyolab.com/article/9331594', + showOnHome: true, + }, + { + name: 'Of Ballads and Brews', + pos: '0% 20%', + zoom: '100%', + image: 'of_ballads_and_brews.jpg', + start: '2022-09-29 10:00:00', + end: '2022-10-17 03:59:59', + color: '#aae9f1', + url: 'https://www.hoyolab.com/article/9331346', + showOnHome: true, + }, ]; diff --git a/src/data/timeline.js b/src/data/timeline.js index 65a6e0c7..b073d4a1 100644 --- a/src/data/timeline.js +++ b/src/data/timeline.js @@ -33,6 +33,17 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/7293007', showOnHome: true, }, + { + name: 'Trial of the Scorching Sands', + pos: '60% 30%', + image: 'trial_of_the_scorching_sands.jpg', + start: '2022-09-23 12:00:00', + end: '2022-09-28 23:59:59', + color: '#ebcca0', + zoom: '100%', + url: 'https://www.hoyolab.com/article/9182888', + showOnHome: true, + }, ], [ { @@ -48,13 +59,24 @@ export const eventsData = [ }, { name: 'Tablet Analytics', - pos: '100% 50%', - image: 'tablet_analytics.jpg', + pos: '0% 50%', + image: 'tablet_analytics_r.jpg', start: '2022-09-15 10:00:00', end: '2022-09-26 03:59:59', - color: '#c3d545', + color: '#80d7b0', + zoom: '200%', + url: 'https://www.hoyolab.com/article/8843590', + showOnHome: true, + }, + { + name: 'Genshin Concert 2022', + pos: '60% 30%', + image: 'genshin_concert_2022.jpg', + start: '2022-09-26 04:00:00', + end: '2022-10-01 23:59:59', + color: '#e2feff', zoom: '100%', - url: 'https://www.hoyolab.com/article/8555140', + url: 'https://genshin.hoyoverse.com/concert2022', showOnHome: true, }, ], @@ -81,6 +103,17 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/7113923', showOnHome: true, }, + { + name: 'Path of Gleaming Jade - Daily Login', + pos: '0% 45%', + image: 'path_of_gleaming_jade.jpg', + start: '2022-10-14 10:00:00', + end: '2022-10-31 03:59:59', + color: '#df8bb9', + zoom: '250%', + url: 'https://www.hoyolab.com/article/9331343', + showOnHome: true, + }, ], [ { @@ -107,15 +140,38 @@ export const eventsData = [ }, { name: 'Ley Line Overflow', - pos: '20% 35%', - image: 'ley_line_overflow.jpg', + pos: '0% 35%', + image: 'leyline_overflow.jpg', start: '2022-09-20 04:00:00', end: '2022-09-27 03:59:59', color: '#43DA8C', - zoom: '150%', + zoom: '200%', url: 'https://www.hoyolab.com/article/8555140', showOnHome: true, }, + { + name: 'Of Travels and Treasures', + pos: '60% 40%', + image: 'of_travels_and_treasures.jpg', + start: '2022-09-28 06:00:00', + end: '2022-10-07 23:59:59', + color: '#82b4ce', + zoom: '200%', + url: 'https://www.hoyolab.com/article/9331351', + showOnHome: true, + timezoneDependent: true, + }, + { + name: 'Hyakunin Ikki', + pos: '0% 55%', + image: 'hyakunin_ikki.jpg', + start: '2022-10-10 10:00:00', + end: '2022-10-24 03:59:59', + color: '#e494b4', + zoom: '200%', + url: 'https://www.hoyolab.com/article/9331594', + showOnHome: true, + }, ], [ { @@ -140,6 +196,17 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/7113808', showOnHome: true, }, + { + name: 'Of Ballads and Brews', + pos: '0% 20%', + zoom: '100%', + image: 'of_ballads_and_brews.jpg', + start: '2022-09-29 10:00:00', + end: '2022-10-17 03:59:59', + color: '#aae9f1', + url: 'https://www.hoyolab.com/article/9331346', + showOnHome: true, + }, ], [ { @@ -188,6 +255,18 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/8554614', showOnHome: true, }, + { + name: 'Twilight Arbiter - Cyno Banner', + pos: '30% 20%', + zoom: '200%', + image: 'twilight_arbiter_1.jpg', + start: '2022-09-28 06:00:00', + end: '2022-10-14 17:59:59', + color: '#d8b8f7', + url: 'https://www.hoyolab.com/article/9331354', + showOnHome: true, + timezoneDependent: true, + }, ], [ { @@ -236,6 +315,18 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/8554621', showOnHome: true, }, + { + name: 'Ballad in Goblets - Venti Banner', + pos: '30% 20%', + zoom: '200%', + image: 'ballad_in-goblets_4.jpg', + start: '2022-09-28 06:00:00', + end: '2022-10-14 17:59:59', + color: '#96f6de', + url: 'https://www.hoyolab.com/article/9331369', + showOnHome: true, + timezoneDependent: true, + }, ], [ { @@ -284,6 +375,18 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/8554622', showOnHome: true, }, + { + name: 'Epitome Invocation - Weapon Banner', + pos: '30% 20%', + zoom: '150%', + image: 'epitome_invocation_35.jpg', + start: '2022-09-28 06:00:00', + end: '2022-10-14 17:59:59', + color: '#FFAA4B', + url: 'https://www.hoyolab.com/article/9331369', + showOnHome: true, + timezoneDependent: true, + }, ], [ { @@ -400,5 +503,15 @@ export const eventsData = [ url: 'https://www.hoyolab.com/article/7113923', timezoneDependent: true, }, + { + name: 'Battle Pass - Returning Winds', + pos: '0% 12%', + image: 'returning_winds.jpg', + start: '2022-09-28 06:00:00', + end: '2022-10-31 03:59:59', + color: '#a9e4dd', + url: 'https://www.hoyolab.com/article/9331594', + timezoneDependent: true, + }, ], ]; diff --git a/src/routes/timeline/_item.svelte b/src/routes/timeline/_item.svelte index fb9899d2..3db18148 100644 --- a/src/routes/timeline/_item.svelte +++ b/src/routes/timeline/_item.svelte @@ -50,7 +50,9 @@ {#if started && !ended && !event.startOnly && !attachedNext}
{diffEnd > 86400000 diff --git a/src/service-worker.js b/src/service-worker.js index 118bf00b..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 fixes', 'Update excel import to support other language']; +const changelog = ['Update timeline']; const channel = new BroadcastChannel('paimonmoe-sw'); diff --git a/static/images/events/ballad_in-goblets_4.jpg b/static/images/events/ballad_in-goblets_4.jpg new file mode 100644 index 00000000..80d0a286 Binary files /dev/null and b/static/images/events/ballad_in-goblets_4.jpg differ diff --git a/static/images/events/epitome_invocation_35.jpg b/static/images/events/epitome_invocation_35.jpg new file mode 100644 index 00000000..b59a9389 Binary files /dev/null and b/static/images/events/epitome_invocation_35.jpg differ diff --git a/static/images/events/genshin_concert_2022.jpg b/static/images/events/genshin_concert_2022.jpg new file mode 100644 index 00000000..bb22c0b5 Binary files /dev/null and b/static/images/events/genshin_concert_2022.jpg differ diff --git a/static/images/events/of_ballads_and_brews.jpg b/static/images/events/of_ballads_and_brews.jpg new file mode 100644 index 00000000..5a787f8b Binary files /dev/null and b/static/images/events/of_ballads_and_brews.jpg differ diff --git a/static/images/events/of_travels_and_treasures.jpg b/static/images/events/of_travels_and_treasures.jpg new file mode 100644 index 00000000..032ef347 Binary files /dev/null and b/static/images/events/of_travels_and_treasures.jpg differ diff --git a/static/images/events/path_of_gleaming_jade.jpg b/static/images/events/path_of_gleaming_jade.jpg new file mode 100644 index 00000000..256043cb Binary files /dev/null and b/static/images/events/path_of_gleaming_jade.jpg differ diff --git a/static/images/events/returning_winds.jpg b/static/images/events/returning_winds.jpg new file mode 100644 index 00000000..e158a64c Binary files /dev/null and b/static/images/events/returning_winds.jpg differ diff --git a/static/images/events/tablet_analytics_r.jpg b/static/images/events/tablet_analytics_r.jpg new file mode 100644 index 00000000..ad988b2f Binary files /dev/null and b/static/images/events/tablet_analytics_r.jpg differ diff --git a/static/images/events/trial_of_the_scorching_sands.jpg b/static/images/events/trial_of_the_scorching_sands.jpg new file mode 100644 index 00000000..3e7c0ad0 Binary files /dev/null and b/static/images/events/trial_of_the_scorching_sands.jpg differ diff --git a/static/images/events/twilight_arbiter_1.jpg b/static/images/events/twilight_arbiter_1.jpg new file mode 100644 index 00000000..ced9d7d7 Binary files /dev/null and b/static/images/events/twilight_arbiter_1.jpg differ