mirror of
https://github.com/MadeBaruna/paimon-moe.git
synced 2025-01-23 08:47:08 +01:00
Update wish import instructions
This commit is contained in:
Made Baruna
parent
24d5a7e87c
commit
3e118cb7e5
2 changed files with 188 additions and 25 deletions
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
<button
|
||||
disabled={processingLog}
|
||||
on:click={() => changeSelectedType('pc')}
|
||||
class="pill {selectedType === 'pc' ? 'active' : ''}"
|
||||
class="pill {['pc', 'pclog', 'pclocal'].includes(selectedType) ? 'active' : ''}"
|
||||
>
|
||||
PC
|
||||
</button>
|
||||
|
|
@ -693,16 +694,45 @@
|
|||
>
|
||||
PS
|
||||
</button>
|
||||
<button
|
||||
disabled={processingLog}
|
||||
on:click={() => changeSelectedType('pclocal')}
|
||||
class="pill {selectedType === 'pclocal' ? 'active' : ''}"
|
||||
>
|
||||
PC Local
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{#if ['pc', 'pclog', 'pclocal'].includes(selectedType)}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="step-number border-2 border-white w-8 h-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">4</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex flex-col pb-4 pt-1">
|
||||
<p class="text-white">{$t('wish.import.chooseMethod')}</p>
|
||||
<div class="flex mt-4 flex-wrap">
|
||||
<button
|
||||
disabled={processingLog}
|
||||
on:click={() => changeSelectedType('pc')}
|
||||
class="pill {selectedType === 'pc' ? 'active' : ''}"
|
||||
>
|
||||
Script
|
||||
</button>
|
||||
<button
|
||||
disabled={processingLog}
|
||||
on:click={() => changeSelectedType('pclog')}
|
||||
class="pill {selectedType === 'pclog' ? 'active' : ''}"
|
||||
>
|
||||
Manual Log
|
||||
</button>
|
||||
<button
|
||||
disabled={processingLog}
|
||||
on:click={() => changeSelectedType('pclocal')}
|
||||
class="pill {selectedType === 'pclocal' ? 'active' : ''}"
|
||||
>
|
||||
Local Import
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{#if videoTutorial[selectedType] !== undefined}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
|
|
@ -723,7 +753,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">{4 + i}</span>
|
||||
<span class="text-white font-bold">{5 + i}</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -736,7 +766,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">7</span>
|
||||
<span class="text-white font-bold">8</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -757,7 +787,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">8</span>
|
||||
<span class="text-white font-bold">9</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -768,7 +798,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">9</span>
|
||||
<span class="text-white font-bold">10</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -776,6 +806,75 @@
|
|||
<p class="text-white">{$t('wish.import.guide.pc2.10')}</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else if selectedType === 'pclog'}
|
||||
{#each Array(2) as _, i}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">{5 + i}</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center">
|
||||
<p class="text-white">{$t(`wish.import.guide.pclog.${i}`)}</p>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">7</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center pb-2">
|
||||
<p class="text-white">{$t('wish.import.guide.pclog.2')}</p>
|
||||
<pre
|
||||
class="bg-black text-white bg-opacity-50 whitespace-pre-wrap break-all p-2 rounded-xl text-xs select-all">
|
||||
{$server === 'China' ? $t('wish.import.logLocation.china') : $t('wish.import.logLocation.global')}
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">8</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center">
|
||||
<p class="text-white">
|
||||
{$t('wish.import.guide.pclog.3')}
|
||||
<code
|
||||
class="bg-black text-white bg-opacity-50 whitespace-pre-wrap break-all p-2 rounded-xl text-xs select-all"
|
||||
>OnGetWebViewPageFinish:https://webstatic</code
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">9</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center">
|
||||
<p class="text-white">{$t('wish.import.guide.pclog.4')}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">10</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center pb-8">
|
||||
<p class="text-white">{$t('wish.import.guide.pclog.5')}</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else if selectedType === 'pclocal'}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
|
|
@ -793,7 +892,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">4</span>
|
||||
<span class="text-white font-bold">5</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -804,7 +903,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">5</span>
|
||||
<span class="text-white font-bold">6</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -823,7 +922,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">6</span>
|
||||
<span class="text-white font-bold">7</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -834,7 +933,7 @@
|
|||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">7</span>
|
||||
<span class="text-white font-bold">8</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
|
|
@ -842,6 +941,36 @@
|
|||
<p class="text-white">{$t('wish.import.guide.pclocal.8')}</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else if selectedType === 'ios'}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">4</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center pb-2">
|
||||
<p class="text-white">
|
||||
{$t('wish.import.guide.ios2.0')}
|
||||
<a class="text-blue-400 hover:underline" href={$t('wish.import.guide.ios2.2')} target="_blank">
|
||||
{$t('wish.import.guide.ios2.1')}
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{#each Array(10) as _, i}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
<div class="flex flex-col items-center step">
|
||||
<div class="w-8 rounded-full flex justify-center items-center">
|
||||
<span class="text-white font-bold">{5 + i}</span>
|
||||
</div>
|
||||
<div class="step-bar w-1 bg-white opacity-50 mt-2 h-full" />
|
||||
</div>
|
||||
<div class="content flex-col items-center {i === 9 ? 'pb-8' : ''}">
|
||||
<p class="text-white">{$t(`wish.import.guide.ios2.${i + 3}`)}</p>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
{:else}
|
||||
{#each Array(steps[selectedType]) as _, i}
|
||||
<div class="flex space-x-3 mb-2">
|
||||
|
|
@ -869,8 +998,12 @@
|
|||
<div class="content flex-col items-center pb-4 pt-1 w-full lg:w-1/2 -mt-4">
|
||||
{#if selectedType === 'pc'}
|
||||
<Input bind:value={genshinLink} placeholder={$t('wish.import.guide.pc2.11')} />
|
||||
{:else if selectedType === 'pclog'}
|
||||
<Input bind:value={genshinLink} placeholder={$t('wish.import.guide.pclog.6')} />
|
||||
{:else if selectedType === 'pclocal'}
|
||||
<Textarea bind:value={generatedTextInput} placeholder={$t('wish.import.guide.pclocal.9')} />
|
||||
{:else if selectedType === 'ios'}
|
||||
<Input bind:value={genshinLink} placeholder={$t('wish.import.guide.ios2.13')} />
|
||||
{:else}
|
||||
<Input bind:value={genshinLink} placeholder={$t(`wish.import.guide.${selectedType}.${steps[selectedType]}`)} />
|
||||
{/if}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue