diff --git a/src/locales/en.json b/src/locales/en.json index 0375ccf4..21d1457b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -146,6 +146,7 @@ "readFaq": "Read the FAQ", "openFaq": "Open FAQ", "choosePlatform": "Choose your platform", + "chooseMethod": "Choose the desired method", "nonew": "No New Wishes", "importNotice1": "Imported wishes will be appended or replaced accordingly to existing data", "importNotice2": "If you don't have any data saved before, first wish will be counted as pity 1", @@ -208,6 +209,10 @@ "q7": "It didn't read all my wish history!?", "a7": "Wish history older than 6 months will be gone from the mihoyo server itself, so if you don't have a backup somewhere, it's gone sadly" }, + "logLocation": { + "global": "%userprofile%\\AppData\\LocalLow\\miHoYo\\Genshin Impact\\output_log.txt", + "china": "%userprofile%\\AppData\\LocalLow\\miHoYo\\原神\\output_log.txt" + }, "guide": { "video": "Video Tutorial", "pc": [ @@ -218,12 +223,12 @@ "Paste link here... https://webstatic..." ], "pc2": [ - "Open Genshin Impact in this PC", - "Then open the wish history and wait it to load", - "Open Start, then search for Powershell", - "Open Windows Powershell, then copy & paste the script below to the Powershell", - "iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/7eab70647f4ed902cfab84779588cc8dac5177f8/getlink_global.ps1'))", - "iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/7eab70647f4ed902cfab84779588cc8dac5177f8/getlink_china.ps1'))", + "Open Genshin Impact in this PC (If you use multiple account please restart the game)", + "Then open the wish history in the game and wait it to load", + "Press START on your keyboard, then search for Powershell", + "Click Windows Powershell, then copy & paste the script below to the Powershell", + "iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/b75733bd23e19145bf992da941ffa943619a92b4/getlink_global.ps1'))", + "iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/b75733bd23e19145bf992da941ffa943619a92b4/getlink_china.ps1'))", "You can review the script", "here", "https://gist.github.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235", @@ -231,6 +236,15 @@ "Paste the text to the textbox below", "Paste the link here... https://webstatic..." ], + "pclog": [ + "Open Genshin Impact in this PC (If you use multiple account please restart the game)", + "Then open the wish history in the game and wait it to load", + "Press WINDOWS+R on your keyboard, then enter:", + "A notepad window will open, then press CTRL+F then enter:", + "Copy all the link from https://webstatic until #/log the url looks like this: https://webstatic-sea.mihoyo.com/hk4e/event/e20190909gacha/index.html?*****#/log", + "Paste the text to the textbox below", + "Paste the link here... https://webstatic..." + ], "android": [ "Open Wish (in the game)", "Press History", @@ -253,6 +267,22 @@ "A browser should open up. Copy the link and paste it below", "Paste link here... https://genshin.mihoyo..." ], + "ios2": [ + "Download Stream on App Store", + "here", + "https://apps.apple.com/app/stream/id1312141691", + "Open the app, then allow VPN in system preferences (Settings > General > VPN)", + "Install CA (click Sniff Now on Stream App > Install CA > A pop up window will appear and choose allow > Now CA is downloaded", + "Go to settings > General > VPN & Device management > Click on Stream Generated CA and install", + "Open Genshin Impact then open Wish screen, stay on that page", + "Back to Stream App > Choose I've trusted > Tap Sniff Now Button", + "Back to Genshin Impact then open the Wish history page", + "Wait for page to load", + "Back to Stream App > Stop Sniffing", + "Click Sniff History > Choose a request that end by .json (the link start with https://hk4e-api-os.mihoyo.com/)", + "Click Request tab, then copy the link and paste it below", + "Paste link here... https://hk4e-api-os.mihoyo.com..." + ], "ps": [ "The steps below might be not working, you can link your PS account with miHoYo account then use the pc/mobile instruction", "You can only use this importer if you have an in-game mail with QR Code to open the web event", diff --git a/src/routes/wish/import.svelte b/src/routes/wish/import.svelte index d93f11d8..3e4d6a12 100644 --- a/src/routes/wish/import.svelte +++ b/src/routes/wish/import.svelte @@ -36,11 +36,12 @@ ]; const steps = { - pc: 6, + pc: 7, + pclog: 7, android: 9, - ios: 7, + ios: 11, ps: 5, - pclocal: 4, + pclocal: 5, }; const videoTutorial = { @@ -668,7 +669,7 @@ @@ -693,16 +694,45 @@ > PS - + {#if ['pc', 'pclog', 'pclocal'].includes(selectedType)} +
+
+
+ 4 +
+
+
+
+

{$t('wish.import.chooseMethod')}

+
+ + + +
+
+
+ {/if} {#if videoTutorial[selectedType] !== undefined}
@@ -723,7 +753,7 @@
- {4 + i} + {5 + i}
@@ -736,7 +766,7 @@
- 7 + 8
@@ -757,7 +787,7 @@
- 8 + 9
@@ -768,7 +798,7 @@
- 9 + 10
@@ -776,6 +806,75 @@

{$t('wish.import.guide.pc2.10')}

+ {:else if selectedType === 'pclog'} + {#each Array(2) as _, i} +
+
+
+ {5 + i} +
+
+
+
+

{$t(`wish.import.guide.pclog.${i}`)}

+
+
+ {/each} + +
+
+
+ 7 +
+
+
+
+

{$t('wish.import.guide.pclog.2')}

+ 
+          {$server === 'China' ? $t('wish.import.logLocation.china') : $t('wish.import.logLocation.global')}
+
+
+
+
+
+
+ 8 +
+
+
+
+

+ {$t('wish.import.guide.pclog.3')} + OnGetWebViewPageFinish:https://webstatic +

+
+
+
+
+
+ 9 +
+
+
+
+

{$t('wish.import.guide.pclog.4')}

+
+
+
+
+
+ 10 +
+
+
+
+

{$t('wish.import.guide.pclog.5')}

+
+
{:else if selectedType === 'pclocal'}
@@ -793,7 +892,7 @@
- 4 + 5
@@ -804,7 +903,7 @@
- 5 + 6
@@ -823,7 +922,7 @@
- 6 + 7
@@ -834,7 +933,7 @@
- 7 + 8
@@ -842,6 +941,36 @@

{$t('wish.import.guide.pclocal.8')}

+ {:else if selectedType === 'ios'} +
+
+
+ 4 +
+
+
+
+

+ {$t('wish.import.guide.ios2.0')} + + {$t('wish.import.guide.ios2.1')} + +

+
+
+ {#each Array(10) as _, i} +
+
+
+ {5 + i} +
+
+
+
+

{$t(`wish.import.guide.ios2.${i + 3}`)}

+
+
+ {/each} {:else} {#each Array(steps[selectedType]) as _, i}
@@ -869,8 +998,12 @@
{#if selectedType === 'pc'} + {:else if selectedType === 'pclog'} + {:else if selectedType === 'pclocal'}