diff --git a/src/locales/en.json b/src/locales/en.json index c9c27a9f..6578ef08 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -184,6 +184,7 @@ "You can also enable Drive Sync in the Settings to synchronize and backup your wish history to your Google Drive", "Please note that the old feedback link does not work anymore, please follow the new instructions below!" ], + "notice30": "Wish history is changed on v3.0, please follow the new instruction below!", "faqs": { "title": "Import Wish History FAQ", "q1": "How does it work?", diff --git a/src/routes/wish/import.svelte b/src/routes/wish/import.svelte index fe5c1508..944687ae 100644 --- a/src/routes/wish/import.svelte +++ b/src/routes/wish/import.svelte @@ -12,6 +12,7 @@ mdiContentSave, mdiDatabaseImport, mdiLoading, + mdiYoutube, } from '@mdi/js'; import dayjs from 'dayjs'; import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'; @@ -52,14 +53,14 @@ const steps = { pc: 7, pclog: 7, - android: 9, + android: 1, ios: 11, ps: 5, pclocal: 5, }; const videoTutorial = { - android: 'https://youtu.be/pe_aROJ8Av8', + android: 'https://www.youtube.com/watch?v=6C5Zqhcm3NI', pc: 'https://www.youtube.com/watch?v=FCwZkHeIezw', pclog: 'https://www.youtube.com/watch?v=cl5HDd0bqKw', ios: 'https://www.youtube.com/watch?v=WfBpraUq41c', @@ -85,9 +86,9 @@ }; let powershellScript = - "iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/41853f2b76dcb845cf8cb0c44174fb63459920f4/getlink_global.ps1'))"; + 'iex(irm https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/d40fa0fd74d85d692543c1621669f5f9375b5975/getlink.ps1)'; let powershellScriptChina = - "iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/41853f2b76dcb845cf8cb0c44174fb63459920f4/getlink_china.ps1'))"; + 'iex "&{$(irm https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/d40fa0fd74d85d692543c1621669f5f9375b5975/getlink.ps1)} china"'; let powershellScriptSource = 'https://gist.github.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235'; let copiedScript = false; let news = ''; @@ -889,6 +890,9 @@ +

+ {$t('wish.import.notice30')} +

@@ -950,17 +954,17 @@ > iOS - + -->
- {#if ['pc', 'pclog', 'pclocal'].includes(selectedType)} + {#if videoTutorial[selectedType] !== undefined}
@@ -1004,9 +1008,14 @@
-
- - {$t('wish.import.guide.video')} +
@@ -1263,7 +1272,18 @@
{:else} - {#each Array(steps[selectedType]) as _, i} +
+
+
+ 4 +
+
+
+
+

Text tutorial is coming soon, for now please watch the video above!

+
+
+ {/if}
@@ -1296,7 +1316,7 @@ {:else if selectedType === 'ios'} {:else} - + {/if}
{#if !processingLog} diff --git a/src/service-worker.js b/src/service-worker.js index 25d36fa6..8a242016 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -7,16 +7,7 @@ const IMAGE_CACHE = `cacheimg${IMAGE_CACHE_VER}`; const IMAGE_URL = `${self.location.origin}/images/`; -const changelog = [ - 'Update Tighnari banner', - 'Update weapons', - 'Update timeline', - 'Update furnishing', - 'Update achievement', - 'Add edit furnishing inventory directly on furnishing set', - 'Adjust item order on calculator result', - 'Bug fixes', -]; +const changelog = ['Update wish import instruction']; const channel = new BroadcastChannel('paimonmoe-sw');