diff --git a/src/locales/en.json b/src/locales/en.json
index a18aba6c..deff2294 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -223,6 +223,7 @@
"pc": "Method 1",
"pc3": "Method 2",
"pc4": "Method 2 Alt",
+ "pc5": "Manual",
"android": "Wifi",
"android2": "Cell Data",
"android3": "Alternative"
@@ -260,6 +261,17 @@
"Paste the text to the textbox below",
"Paste the link here... https://webstatic..."
],
+ "pc5": [
+ "Open Genshin Impact in this PC (If you use multiple accounts, please restart the game)",
+ "Then open the wish history in the game and wait it to load",
+ "Then open the folder where your game is installed (example: C:\\Games\\Genshin Impact)",
+ "Then open folder GenshinImpact_Data → webCaches → Cache → Cache_Data",
+ "Right click \"data_2\" file then click \"Open with\" then select Notepad (If you get error like \"The process cannot access the file because it is being used y another process\" please exit the game first",
+ "Press CTRL+F then check \"Wrap around\" and select direction \"Up\" then in the input box search for \"e20190909gacha-v2\" (without the quote) then click Find Next",
+ "Copy all the link from https://webstatic until game_biz=hk4e_global the url looks like this: https://webstatic-sea.hoyoverse.com/genshin/event/e20190909gacha-v2/index.html?.......&game_biz=hk4e_global",
+ "Paste the text to the textbox below",
+ "Paste the link here... https://webstatic..."
+ ],
"pclog": [
"Open Genshin Impact in this PC (If you use multiple accounts, please restart the game)",
"Then open the wish history in the game and wait it to load",
diff --git a/src/routes/wish/import.svelte b/src/routes/wish/import.svelte
index e054081d..60e26ebf 100644
--- a/src/routes/wish/import.svelte
+++ b/src/routes/wish/import.svelte
@@ -53,6 +53,8 @@
const steps = {
pc: 7,
pc3: 8,
+ pc4: 8,
+ pc5: 9,
pclog: 7,
android: 1,
android2: 1,
@@ -92,15 +94,13 @@
},
};
- let powershellScript =
- 'iex "&{$(irm https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/f7f8d9029122e29e366c65afaea236eb3abb1179/getlink.ps1)} global"';
- let powershellScriptChina =
- 'iex "&{$(irm https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/f7f8d9029122e29e366c65afaea236eb3abb1179/getlink.ps1)} china"';
+ let powershellScript = `Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex "&{$((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/f7f8d9029122e29e366c65afaea236eb3abb1179/getlink.ps1'))} global"`;
+ let powershellScriptChina = `Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex "&{$((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235/raw/f7f8d9029122e29e366c65afaea236eb3abb1179/getlink.ps1'))} global"`;
let powershellScriptSource = 'https://gist.github.com/MadeBaruna/1d75c1d37d19eca71591ec8a31178235';
let powershellScriptAlt =
- 'pause;$m=(((Get-Clipboard -TextFormatType Html) | sls "(https:/.+log)").Matches[0].Value);$m;Set-Clipboard -Value $m';
+ 'Read-Host -Prompt "Press Enter to continue";$m=(((Get-Clipboard -TextFormatType Html) | Select-String "(https:/.+log)").Matches[0].Value);$m;Set-Clipboard -Value $m';
let powershellScriptAlt2 =
- "$p = [Enum]::ToObject([System.Net.SecurityProtocolType], 3072); [System.Net.ServicePointManager]::SecurityProtocol = $p; iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/bf36bad751dc9221067ca1e31ab08255/raw/20664d5df5e916cbab169500536d7f366de29395/read.ps1'))";
+ "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://gist.githubusercontent.com/MadeBaruna/bf36bad751dc9221067ca1e31ab08255/raw/20664d5df5e916cbab169500536d7f366de29395/read.ps1'))";
let copiedScript = false;
let news = '';
let showAdvancedOptions = false;
@@ -958,7 +958,7 @@
@@ -986,7 +986,7 @@
- {#if ['pc', 'pc3', 'pc4', 'pclocal'].includes(selectedType)}
+ {#if ['pc', 'pc3', 'pc4', 'pc5', 'pclocal'].includes(selectedType)}