Merge remote-tracking branch 'upstream/main'

package.json

@@ -31,4 +31,4 @@
     "tailwindcss": "^3.2.4",
     "vite": "^3.0.2"
   }
-}
+}

src/data/banners.js

@@ -1011,6 +1011,28 @@ export const banners = {
     //   version: '4.2',
     //   timezoneDependent: true,
     // },
+    {
+      name: 'Twilight Arbiter',
+      image: 3,
+      shortName: 'Cyno',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#d8b8f7',
+      featured: ['cyno', 'kamisato_ayato'],
+      featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+      version: '4.2',
+    },
+    // {
+    //   name: 'Azure Excursion',
+    //   image: 3,
+    //   shortName: 'Ayato',
+    //   start: '2023-11-28 18:00:00',
+    //   end: '2023-12-19 14:59:59',
+    //   color: '#90bce9',
+    //   featured: ['cyno', 'kamisato_ayato'],
+    //   featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+    //   version: '4.2',
+    // },
   ],
   weapons: [
     {
@@ -1690,5 +1712,16 @@ export const banners = {
       version: '4.2',
       timezoneDependent: true,
     },
+    {
+      name: 'Epitome Invocation',
+      image: 56,
+      shortName: 'Scarlet',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#eae5e1',
+      featured: ['staff_of_the_scarlet_sands', 'haran_geppaku_futsu'],
+      featuredRare: ['lions_roar', 'the_widsith', 'favonius_warbow', 'favonius_greatsword', 'favonius_lance'],
+      version: '4.2',
+    },
   ],
 };

src/data/bannersDual.js

@@ -753,4 +753,28 @@ export const bannersDual = {
       timezoneDependent: true,
     },
   ],
+  'Twilight Arbiter 3': [
+    {
+      name: 'Twilight Arbiter',
+      image: 3,
+      shortName: 'Cyno',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#d8b8f7',
+      featured: ['cyno', 'kamisato_ayato'],
+      featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+      version: '4.2',
+    },
+    {
+      name: 'Azure Excursion',
+      image: 3,
+      shortName: 'Ayato',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#90bce9',
+      featured: ['cyno', 'kamisato_ayato'],
+      featuredRare: ['kuki_shinobu', 'xiangling', 'kirara'],
+      version: '4.2',
+    },
+  ],
 };

src/data/events.js

@@ -1489,7 +1489,7 @@ export const events = [
     name: 'Graph Adversarial Technology Experiment Log',
     pos: '0% 50%',
     zoom: '100%',
-    image: 'Graph Adversarial Technology Experiment Log tmp.png',
+    image: 'Graph Adversarial Technology Experiment Log.png',
     start: '2023-11-17 10:00:00',
     end: '2023-11-27 03:59:59',
     color: '#eae4dd',
@@ -1500,11 +1500,33 @@ export const events = [
     name: "Thelxie's Fantastic Adventures",
     pos: '40% 60%',
     zoom: '200%',
-    image: 'Thelxies Fantastic Adventures tmp.png',
+    image: 'Thelxies Fantastic Adventures.png',
     start: '2023-11-23 10:00:00',
     end: '2023-12-11 03:59:59',
     color: '#83abe1',
-    url: 'https://www.hoyolab.com/article/22782228',
+    url: 'https://www.hoyolab.com/article/23129467',
+    showOnHome: true,
+  },
+  {
+    name: "Lil' Fungi's Fun-Tastic Fiesta",
+    pos: '0% 60%',
+    zoom: '200%',
+    image: 'fungus_mechanicus.jpg',
+    start: '2023-12-06 10:00:00',
+    end: '2023-12-18 03:59:59',
+    color: '#5cbcad',
+    url: 'https://www.hoyolab.com/article/23172422',
+    showOnHome: true,
+  },
+  {
+    name: 'Ley Line Overflow',
+    pos: '0% 40%',
+    zoom: '200%',
+    image: 'leyline_overflow.jpg',
+    start: '2023-12-11 04:00:00',
+    end: '2023-12-18 03:59:59',
+    color: '#5baced',
+    url: 'https://www.hoyolab.com/article/23172422',
     showOnHome: true,
   },
 ];

src/data/timeline.js

@@ -49,14 +49,25 @@ export const eventsData = [
     {
       name: 'Graph Adversarial Technology Experiment Log',
       pos: '0% 50%',
-      zoom: '100%',
+      zoom: '250%',
-      image: 'Graph Adversarial Technology Experiment Log tmp.png',
+      image: 'Graph Adversarial Technology Experiment Log.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: "Lil' Fungi's Fun-Tastic Fiesta",
+      pos: '0% 60%',
+      zoom: '200%',
+      image: 'fungus_mechanicus.jpg',
+      start: '2023-12-06 10:00:00',
+      end: '2023-12-18 03:59:59',
+      color: '#5cbcad',
+      url: 'https://www.hoyolab.com/article/23172422',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -94,13 +105,24 @@ export const eventsData = [
     },
     {
       name: "Thelxie's Fantastic Adventures",
-      pos: '40% 60%',
+      pos: '0% 50%',
       zoom: '200%',
-      image: 'Thelxies Fantastic Adventures tmp.png',
+      image: 'Thelxies Fantastic Adventures.png',
       start: '2023-11-23 10:00:00',
       end: '2023-12-11 03:59:59',
       color: '#83abe1',
-      url: 'https://www.hoyolab.com/article/22782228',
+      url: 'https://www.hoyolab.com/article/23129467',
+      showOnHome: true,
+    },
+    {
+      name: 'Ley Line Overflow',
+      pos: '0% 40%',
+      zoom: '200%',
+      image: 'leyline_overflow.jpg',
+      start: '2023-12-11 04:00:00',
+      end: '2023-12-18 03:59:59',
+      color: '#5baced',
+      url: 'https://www.hoyolab.com/article/23172422',
       showOnHome: true,
     },
   ],
@@ -140,6 +162,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Twilight Arbiter - Cyno Banner',
+      pos: '40% 15%',
+      zoom: '200%',
+      image: 'Twilight Arbiter 3.jpg',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#d8b8f7',
+      url: 'https://www.hoyolab.com/article/23172294',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -177,6 +210,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Azure Excursion - Ayato Banner',
+      pos: '40% 15%',
+      zoom: '200%',
+      image: 'Azure Excursion 3.jpg',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#90bce9',
+      url: 'https://www.hoyolab.com/article/23172294',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -214,6 +258,17 @@ export const eventsData = [
       showOnHome: true,
       timezoneDependent: true,
     },
+    {
+      name: 'Epitome Invocation - Weapon Banner',
+      pos: '30% 25%',
+      zoom: '150%',
+      image: 'Epitome Invocation 56.jpg',
+      start: '2023-11-28 18:00:00',
+      end: '2023-12-19 14:59:59',
+      color: '#FFAA4B',
+      url: 'https://www.hoyolab.com/article/23172294',
+      showOnHome: true,
+    },
   ],
   [
     {
@@ -256,6 +311,36 @@ export const eventsData = [
       description:
         "After the active character's Normal or Charged Attack hits an opponent, that character's Normal and Charged Attack CRIT Rate is increased by 6% for 5s. This effect can be triggered once every 0.1s. Max 5 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: '2023-11-16 04:00:00',
+      end: '2023-12-01 04:00:00',
+      color: '#4299E1',
+      description:
+        "When a character's HP increases or decreases, it will be counted. When it reaches a total of 12, a shockwave will be unleashed at the character's position, dealing True DMG to nearby opponents and clearing the count. 1 such shockwave can be unleashed every 4s.",
+    },
+    {
+      name: 'Spiral Abyss',
+      image: 'spiral_abyss.jpg',
+      pos: '50% 20%',
+      start: '2023-12-01 04:00:00',
+      end: '2023-12-16 04:00:00',
+      color: '#4299E1',
+      description:
+        "When off-field characters deal Elemental Skill DMG to an opponent, an Uncanny Mark will be placed upon that opponent. When another active character hits a marked opponent with an attack of the same Elemental Type, a shockwave will be unleashed at that opponent's position, dealing True DMG. The Uncanny Mark lasts 5s, and Marks created through different attacks with different Elemental Types can exist independently. 1 such shockwave can be unleashed every 2s. When a character enters the field, the Uncanny Marks placed by that character on opponents will be removed.",
+    },
+    {
+      name: 'Spiral Abyss',
+      image: 'spiral_abyss.jpg',
+      pos: '50% 20%',
+      start: '2023-12-16 04:00:00',
+      end: '2024-01-01 04:00:00',
+      color: '#4299E1',
+      description:
+        "After a character takes the field, they will gain one stack of Soar every 2.5s. Each stack will increase the DMG dealt by this character by 8%. Max 3 stacks. A character with 3 stacks will unleash a shockwave at an opponent's position when they deal DMG to that opponent, dealing True DMG. This effect will be cleared when the character leaves the field. 1 such shockwave can be unleashed every 1s",
+    },
   ],
   [
     {

src/routes/_index/banner.svelte

@@ -13,25 +13,25 @@
   const dispatch = createEventDispatcher();
 
   const featured = {
-    baizhu: {
+    kamisato_ayato: {
-      name: 'Baizhu',
+      name: 'Kamisato Ayato',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
-    furina: {
+    cyno: {
-      name: 'Furina',
+      name: 'Cyno',
       rarity: 'legendary',
       count: 0,
       average: '...',
       percentage: '...',
     },
   };
-  const bannerId = 300056;
+  const bannerId = 300057;
-  const image = 'baizhu furina.png';
+  const image = 'ayato cyno.png';
   const width = 800;
-  const height = 490;
+  const height = 467;
 
   let loading = true;
   let user = '';

src/routes/achievement/index.svelte

@@ -69,6 +69,7 @@
     '3.8',
     '4.0',
     '4.1',
+    '4.2',
   ].map((e) => ({
     label: e,
     value: e,

src/routes/index.svelte

@@ -1,6 +1,6 @@
 <script context="module">
   export async function load({ fetch }) {
-    const promoted = ['baizhu', 'collei', 'beidou'];
+    const promoted = ['cyno', 'kamisato_ayato'];
     const builds = {};
     for (const p of promoted) {
       const response = await fetch(`/characters/build/${p}.json`);

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 characters', 'Update weapons', 'Update timelines'];
+const changelog = ['Update banners', 'Update timelines'];
 
 const channel = new BroadcastChannel('paimonmoe-sw');