diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 640896e7f..ee90e1be9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,6 @@
# Credits to @Scighost from Starward for his contributions!
name: Build-Canary
+run-name: Canary Build for ${{ github.ref }}
on:
workflow_dispatch:
@@ -22,10 +23,7 @@ on:
- "net7.0-windows10.0.22000.0"
- "net7.0-windows10.0.19041.0"
-
-
jobs:
-
build:
runs-on: ${{ github.event.inputs.os }}
strategy:
@@ -36,6 +34,7 @@ jobs:
env:
Configuration: ${{ matrix.configuration }}
Platform: ${{ matrix.platform }}
+ DOTNET_INSTALL_DIR: '.\.dotnet'
steps:
- name: Checkout
@@ -43,6 +42,28 @@ jobs:
with:
submodules: recursive
+ - name: Get short Git SHA
+ id: vars
+ run: |
+ echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+ echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV
+
+ - name: Cache dotnet # cache dotnet install https://stackoverflow.com/questions/75180149/how-to-cache-dotnet-installation-in-github-actions
+ id: cache-dotnet
+ uses: actions/cache@v3
+ with:
+ path: ${{ env.DOTNET_INSTALL_DIR }}
+ key: ${{ runner.os }}-dotnet-7
+ restore-keys: ${{ runner.os }}-dotnet-7
+
+ - name: Cache nuget # cache nuget https://github.com/actions/cache/blob/main/examples.md#c---nuget
+ uses: actions/cache@v3
+ with:
+ path: ~/.nuget/packages
+ key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+ restore-keys: |
+ ${{ runner.os }}-nuget-
+
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
@@ -59,16 +80,16 @@ jobs:
msbuild CollapseLauncher "-property:Configuration=$env:Configuration;Platform=$env:Platform"
dotnet build CollapseLauncher -c $env:Configuration -p:Platform=$env:Platform -f ${{ github.event.inputs.framework }}
- - name: Upload Artifact (Debug)
- uses: actions/upload-artifact@v3.1.2
- if: ${{ matrix.configuration == 'Debug' }}
- with:
- name: collapse_${{ github.sha }}.${{ matrix.platform }}-${{ matrix.configuration }}
- path: ./CollapseLauncher/bin/x64/Debug/net7.0-windows10.0.22000.0/
+# - name: Upload Artifact (Debug)
+# uses: actions/upload-artifact@v3.1.2
+# if: ${{ matrix.configuration == 'Debug' }}
+# with:
+# name: collapse_${{ github.ref }}_${{ steps.vars.outputs.sha_short }}.${{ matrix.platform }}-${{ matrix.configuration }}
+# path: ./CollapseLauncher/bin/x64/Debug/${{ github.event.inputs.framework }}/
- name: Upload Artifact (Release)
uses: actions/upload-artifact@v3.1.2
if: ${{ matrix.configuration == 'Release' }}
with:
- name: collapse_${{ github.sha }}.${{ matrix.platform }}-${{ matrix.configuration }}
- path: ./CollapseLauncher/bin/x64/Release/net7.0-windows10.0.22000.0/
+ name: collapse_${{ matrix.platform }}-${{ matrix.configuration }}_${{ github.event.inputs.framework }}_${{ github.sha }}
+ path: ./CollapseLauncher/bin/x64/Release/${{ github.event.inputs.framework }}/
diff --git a/.gitignore b/.gitignore
index ec67c6883..0b7076548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,83 @@ CollapseLauncher/Invoker/*
*.psd
InstallerProp/Output/*
InstallerProp/temp/**
+
+### Rider ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+.idea/*
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn. Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..c2414dd4f
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+ and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+ overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+ advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+ address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+dev.kemalsetyaa@gmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a4aec7264..afd949ce3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,10 +16,17 @@ If you wish to add new language that isn't yet listed in the Crowdin project, pl
## Tools Needed
Below is a list of tools needed to contribute to this project:
1. **Visual Studio 2022 (Any Edition - 17.4 or later)**
+ - Select .NET desktop development component
2. **Windows SDK (10.0.19043.0 or 10.0.22000.0 ONLY)** via Visual Studio Installer
3. .NET Core 7 SDK: [**(7.0.100 or later)**](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
4. WinUI 3: [**(WindowsAppSDK 1.3.0-230331000 Stable Runtime)**](https://aka.ms/windowsappsdk/1.3/1.3.230331000/windowsappruntimeinstall-x64.exe)
+> **Note**:
+>
+> Starting from November 13rd 2022, you must have Visual Studio 2022 installed on your computer due to the updated minimum system requirement of `WinUI 3 1.3 Stable`.
+>
+> Using a lower Visual Studio version (like VS2019) is possible, but it is not recommended as you need to downgrade **WindowsAppSDK** via *NuGet* to **WindowsAppSDK 1.1.5** or **WindowsAppSDK 1.2-preview2** before building. This has an increased risk of breaking the application and as such, no support will be provided for this method. **This is not recommended for beginner users.**
+
## Restrictions for New Feature(s)
While this software is fully open source and not affiliated with HoYoverse, Cognosphere, or any of its related entities in any way, we are nonetheless bound to their Terms of Service and Code of Conduct when developing Collapse. This means that there are some features that we will **not** implement. We will close any issue or PRs that are made to add such functionality to Collapse. Such features include, but are not limited to:
- Anything that, in any way, interacts with the miHoYo SDK and/or API, including their Authentication and Payment Processing endpoints.
diff --git a/CollapseLauncher/App.xaml b/CollapseLauncher/App.xaml
index 6749198c0..771d2735b 100644
--- a/CollapseLauncher/App.xaml
+++ b/CollapseLauncher/App.xaml
@@ -2,7 +2,8 @@
x:Class="CollapseLauncher.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:CollapseLauncher">
+ xmlns:local="using:CollapseLauncher"
+ xmlns:localUI="using:Microsoft.UI.Xaml.Controls">
@@ -14,7 +15,7 @@
#ffd52a
#ffd52a
#ffd52a
-
+
@@ -46,21 +47,23 @@
-
+
-
-
+
+
+
+
-
-
-
+
+
+
@@ -98,7 +101,7 @@
-
+
@@ -107,21 +110,307 @@
-
+
+
-
+
+
+ ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands
+ ms-appx:///Assets/Fonts/FontAwesomeRegular6.otf#Font Awesome 6 Free
+ ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid
+ 0,47,0,0
+
+
+
+
+
+
-
- ms-appx:///Assets/Fonts/FontAwesomeBrand6.otf#Font Awesome 6 Brands
- ms-appx:///Assets/Fonts/FontAwesomeRegular6.otf#Font Awesome 6 Free
- ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid
-
diff --git a/CollapseLauncher/App.xaml.cs b/CollapseLauncher/App.xaml.cs
index 215452493..9c7436936 100644
--- a/CollapseLauncher/App.xaml.cs
+++ b/CollapseLauncher/App.xaml.cs
@@ -1,6 +1,14 @@
using Hi3Helper;
+using Hi3Helper.Shared.Region;
+using Microsoft.UI;
using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Resources;
using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.Storage;
using static CollapseLauncher.InnerLauncherConfig;
using static Hi3Helper.Logger;
@@ -15,6 +23,10 @@ public App()
{
try
{
+ bool IsAcrylicEnabled = LauncherConfig.GetAppConfigValue("EnableAcrylicEffect").ToBool();
+
+ if (!IsAcrylicEnabled) ToggleBlurBackdrop(false);
+
this.InitializeComponent();
RequestedTheme = CurrentRequestedAppTheme = GetAppTheme();
@@ -39,5 +51,45 @@ public App()
Console.ReadLine();
}
}
+
+ public static async void ToggleBlurBackdrop(bool useBackdrop = true)
+ {
+ // Always wait for the resources to load up
+ while (true)
+ {
+ try
+ {
+ await Task.Delay(250);
+ if (Current.Resources.Count != 0) break;
+ }
+ catch { }
+ }
+
+ // Enumerate the dictionary (MergedDictionaries)
+ foreach (ResourceDictionary resource in Current
+ .Resources
+ .MergedDictionaries)
+ {
+ // Parse the dictionary (ThemeDictionaries) and read the type of KeyValuePair,
+ // then select the value, get the type of ResourceDictionary, then enumerate it
+ foreach (ResourceDictionary list in resource
+ .ThemeDictionaries
+ .OfType>()
+ .Select(x => x.Value)
+ .OfType())
+ {
+ // Parse the dictionary as type of KeyValuePair,
+ // and get the value which has type of AcrylicBrush only, then enumerate it
+ foreach (AcrylicBrush theme in list
+ .OfType>()
+ .Select(x => x.Value)
+ .OfType())
+ {
+ // Set the theme AlwaysUseFallback as per toggle from useBackdrop.
+ theme.AlwaysUseFallback = !useBackdrop;
+ }
+ }
+ }
+ }
}
}
diff --git a/CollapseLauncher/Assets/BG/AiHappy.png b/CollapseLauncher/Assets/Images/AiHappy.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/AiHappy.png
rename to CollapseLauncher/Assets/Images/AiHappy.png
diff --git a/CollapseLauncher/Assets/BG/AponiaFly.png b/CollapseLauncher/Assets/Images/AponiaFly.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/AponiaFly.png
rename to CollapseLauncher/Assets/Images/AponiaFly.png
diff --git a/CollapseLauncher/Assets/BG/PaimonSleep.png b/CollapseLauncher/Assets/Images/PaimonSleep.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/PaimonSleep.png
rename to CollapseLauncher/Assets/Images/PaimonSleep.png
diff --git a/CollapseLauncher/Assets/BG/PaimonWhat.png b/CollapseLauncher/Assets/Images/PaimonWhat.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/PaimonWhat.png
rename to CollapseLauncher/Assets/Images/PaimonWhat.png
diff --git a/CollapseLauncher/Assets/BG/StartUpBG.png b/CollapseLauncher/Assets/Images/StartupBackground.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/StartUpBG.png
rename to CollapseLauncher/Assets/Images/StartupBackground.png
diff --git a/CollapseLauncher/Assets/BG/StartUpBG2.png b/CollapseLauncher/Assets/Images/StartupBackground2.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/StartUpBG2.png
rename to CollapseLauncher/Assets/Images/StartupBackground2.png
diff --git a/CollapseLauncher/Assets/BG/default.png b/CollapseLauncher/Assets/Images/default.png
similarity index 100%
rename from CollapseLauncher/Assets/BG/default.png
rename to CollapseLauncher/Assets/Images/default.png
diff --git a/CollapseLauncher/Assets/Presets/CommunityTools.json b/CollapseLauncher/Assets/Presets/CommunityTools.json
index 1e794d1cd..3d225e8dd 100644
--- a/CollapseLauncher/Assets/Presets/CommunityTools.json
+++ b/CollapseLauncher/Assets/Presets/CommunityTools.json
@@ -80,6 +80,12 @@
"IconGlyph": "",
"Text": "Reddit Community",
"URL": "https://www.reddit.com/r/HonkaiImpact3rd/"
+ },
+ {
+ "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
+ "IconGlyph": "",
+ "Text": "ER Build Guide",
+ "URL": "https://risbi0.github.io/Elysian-Realm/"
}
],
"Genshin": [
@@ -159,4 +165,4 @@
}
]
}
-}
\ No newline at end of file
+}
diff --git a/CollapseLauncher/Classes/BackgroundManagement/BackgroundManagement.cs b/CollapseLauncher/Classes/BackgroundManagement/BackgroundManagement.cs
index 8222c81c4..050db1284 100644
--- a/CollapseLauncher/Classes/BackgroundManagement/BackgroundManagement.cs
+++ b/CollapseLauncher/Classes/BackgroundManagement/BackgroundManagement.cs
@@ -1,7 +1,6 @@
using ColorThiefDotNet;
using Hi3Helper;
using Hi3Helper.Data;
-using Hi3Helper.Preset;
using Hi3Helper.Shared.ClassStruct;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
@@ -13,13 +12,10 @@
using System.Drawing;
using System.IO;
using System.Linq;
-using System.Text.Json;
-using System.Threading;
using System.Threading.Tasks;
using Windows.Graphics.Imaging;
using Windows.Storage.Streams;
using static CollapseLauncher.InnerLauncherConfig;
-using static Hi3Helper.Locale;
using static Hi3Helper.Logger;
using static Hi3Helper.Shared.Region.LauncherConfig;
@@ -34,20 +30,6 @@ public sealed partial class MainPage : Page
private bool BGLastState = true;
private bool IsFirstStartup = true;
- private async ValueTask FetchLauncherLocalizedResources(CancellationToken Token, PresetConfigV2 Preset)
- {
- regionBackgroundProp = Preset.LauncherSpriteURLMultiLang ?
- await TryGetMultiLangResourceProp(Token, Preset) :
- await TryGetSingleLangResourceProp(Token, Preset);
-
- await DownloadBackgroundImage(Token);
-
- await GetLauncherAdvInfo(Token, Preset);
- await GetLauncherCarouselInfo(Token);
- await GetLauncherEventInfo(Token);
- GetLauncherPostInfo();
- }
-
private async Task ChangeBackgroundImageAsRegion()
{
IsCustomBG = GetAppConfigValue("UseCustomBG").ToBool();
@@ -70,236 +52,124 @@ private async Task ChangeBackgroundImageAsRegion()
ReloadPageTheme(this, ConvertAppThemeToElementTheme(CurrentAppTheme));
}
- private async ValueTask FetchLauncherDownloadInformation(CancellationToken Token, PresetConfigV2 Preset)
- {
- using (Stream netStream = (await _httpClient.DownloadFromSessionStreamAsync(
- Preset.LauncherResourceURL,
- 0,
- null,
- Token
- )).Item1)
- {
- _gameAPIProp = (RegionResourceProp)JsonSerializer.Deserialize(netStream, typeof(RegionResourceProp), RegionResourcePropContext.Default) ?? new RegionResourceProp();
-
-#if DEBUG
- if (_gameAPIProp.data.game.latest.decompressed_path != null) LogWriteLine($"Decompressed Path: {_gameAPIProp.data.game.latest.decompressed_path}", LogType.Default, true);
- if (_gameAPIProp.data.game.latest.path != null) LogWriteLine($"ZIP Path: {_gameAPIProp.data.game.latest.path}", LogType.Default, true);
- if (_gameAPIProp.data.pre_download_game?.latest?.decompressed_path != null) LogWriteLine($"Decompressed Path Pre-load: {_gameAPIProp.data.pre_download_game?.latest?.decompressed_path}", LogType.Default, true);
- if (_gameAPIProp.data.pre_download_game?.latest?.path != null) LogWriteLine($"ZIP Path Pre-load: {_gameAPIProp.data.pre_download_game?.latest?.path}", LogType.Default, true);
-#endif
- }
- }
-
- private async ValueTask TryGetMultiLangResourceProp(CancellationToken Token, PresetConfigV2 Preset)
- {
- RegionResourceProp ret = await GetMultiLangResourceProp(Lang.LanguageID.ToLower(), Token, Preset);
-
- return ret.data.adv == null
- || ((ret.data.adv.version ?? 5) <= 4
- && Preset.GameType == GameType.Honkai) ?
- await GetMultiLangResourceProp(Preset.LauncherSpriteURLMultiLangFallback ?? "en-us", Token, Preset) :
- ret;
- }
-
- private async ValueTask GetMultiLangResourceProp(string langID, CancellationToken token, PresetConfigV2 Preset)
- {
- using (Stream netStream = (await _httpClient.DownloadFromSessionStreamAsync(
- string.Format(Preset.LauncherSpriteURL, langID),
- 0,
- null,
- token
- )).Item1)
- {
- return (RegionResourceProp)JsonSerializer.Deserialize(netStream, typeof(RegionResourceProp), RegionResourcePropContext.Default) ?? new RegionResourceProp();
- }
- }
-
- private async ValueTask TryGetSingleLangResourceProp(CancellationToken Token, PresetConfigV2 Preset)
- {
- using (Stream netStream = (await _httpClient.DownloadFromSessionStreamAsync(
- Preset.LauncherSpriteURL,
- 0,
- null,
- Token
- )).Item1)
- {
- return (RegionResourceProp)JsonSerializer.Deserialize(netStream, typeof(RegionResourceProp), RegionResourcePropContext.Default) ?? new RegionResourceProp();
- }
- }
-
- private void ResetRegionProp()
- {
- LastRegionNewsProp = regionNewsProp.Copy();
- regionNewsProp = new HomeMenuPanel()
- {
- sideMenuPanel = null,
- imageCarouselPanel = null,
- articlePanel = null,
- eventPanel = null
- };
- }
-
- private async ValueTask GetLauncherAdvInfo(CancellationToken Token, PresetConfigV2 Preset)
- {
- if (regionBackgroundProp.data.icon.Count == 0) return;
-
- regionNewsProp.sideMenuPanel = new List();
- foreach (RegionSocMedProp item in regionBackgroundProp.data.icon)
- {
- regionNewsProp.sideMenuPanel.Add(new MenuPanelProp
- {
- URL = item.url,
- Icon = await GetCachedSprites(item.img, Token),
- IconHover = await GetCachedSprites(item.img_hover, Token),
- QR = string.IsNullOrEmpty(item.qr_img) ? null : await GetCachedSprites(item.qr_img, Token),
- QR_Description = string.IsNullOrEmpty(item.qr_desc) ? null : item.qr_desc,
- Description = string.IsNullOrEmpty(item.title) || Preset.IsHideSocMedDesc ? item.url : item.title
- });
- }
- }
-
- private async ValueTask GetLauncherCarouselInfo(CancellationToken Token)
+ public static async void ApplyAccentColor(Page page, Bitmap bitmapinput)
{
- if (regionBackgroundProp.data.banner.Count == 0) return;
-
- regionNewsProp.imageCarouselPanel = new List();
- foreach (RegionSocMedProp item in regionBackgroundProp.data.banner)
- {
- regionNewsProp.imageCarouselPanel.Add(new MenuPanelProp
- {
- URL = item.url,
- Icon = await GetCachedSprites(item.img, Token),
- Description = string.IsNullOrEmpty(item.name) ? item.url : item.name
- });
- }
- }
-
- private async ValueTask GetLauncherEventInfo(CancellationToken Token)
- {
- if (string.IsNullOrEmpty(regionBackgroundProp.data.adv.icon)) return;
-
- regionNewsProp.eventPanel = new RegionBackgroundProp
- {
- url = regionBackgroundProp.data.adv.url,
- icon = await GetCachedSprites(regionBackgroundProp.data.adv.icon, Token)
- };
- }
-
- private void GetLauncherPostInfo()
- {
- if (regionBackgroundProp.data.post.Count == 0) return;
-
- regionNewsProp.articlePanel = new PostCarouselTypes();
- foreach (RegionSocMedProp item in regionBackgroundProp.data.post)
- {
- switch (item.type)
- {
- case PostCarouselType.POST_TYPE_ACTIVITY:
- regionNewsProp.articlePanel.Events.Add(item);
- break;
- case PostCarouselType.POST_TYPE_ANNOUNCE:
- regionNewsProp.articlePanel.Notices.Add(item);
- break;
- case PostCarouselType.POST_TYPE_INFO:
- regionNewsProp.articlePanel.Info.Add(item);
- break;
- }
- }
- }
-
- public async ValueTask GetCachedSprites(string URL, CancellationToken token)
- {
- string cacheFolder = Path.Combine(AppGameImgFolder, "cache");
- string cachePath = Path.Combine(cacheFolder, Path.GetFileNameWithoutExtension(URL));
- if (!Directory.Exists(cacheFolder))
- Directory.CreateDirectory(cacheFolder);
-
- FileInfo fInfo = new FileInfo(cachePath);
-
- if (!fInfo.Exists || fInfo.Length < (1 << 10))
- {
- using (FileStream fs = fInfo.Create())
- {
- using (Stream netStream = (await _httpClient.DownloadFromSessionStreamAsync(URL, 0, null, token)).Item1)
- {
- netStream.CopyTo(fs);
- }
- }
- }
-
- return cachePath;
- }
-
- public static async Task ApplyAccentColor(Page page, Bitmap bitmapinput, int quality)
- {
- Windows.UI.Color[] _colors;
switch (CurrentAppTheme)
{
case AppThemeMode.Light:
- _colors = await SetLightColors(bitmapinput, quality);
+ await SetLightColors(bitmapinput);
break;
case AppThemeMode.Dark:
- _colors = await SetDarkColors(bitmapinput, quality);
+ await SetDarkColors(bitmapinput);
break;
default:
if (SystemAppTheme.ToString() == "#FFFFFFFF")
- _colors = await SetLightColors(bitmapinput, quality);
+ await SetLightColors(bitmapinput);
else
- _colors = await SetDarkColors(bitmapinput, quality);
+ await SetDarkColors(bitmapinput);
break;
}
ReloadPageTheme(page, ConvertAppThemeToElementTheme(CurrentAppTheme));
- return _colors;
}
- private static async Task SetLightColors(Bitmap bitmapinput, int quality)
+ private static async Task SetLightColors(Bitmap bitmapinput)
{
- Windows.UI.Color[] _colors = await GetPaletteList(bitmapinput, 128, true, quality);
+ Windows.UI.Color[] _colors = await GetPaletteList(bitmapinput, 10, true, 1);
Application.Current.Resources["SystemAccentColor"] = _colors[0];
- Application.Current.Resources["SystemAccentColorDark1"] = _colors[1];
- Application.Current.Resources["SystemAccentColorDark2"] = _colors[2];
- Application.Current.Resources["SystemAccentColorDark3"] = _colors[3];
- Application.Current.Resources["AccentColor"] = new SolidColorBrush(_colors[0]);
-
- return _colors;
+ Application.Current.Resources["SystemAccentColorDark1"] = _colors[0];
+ Application.Current.Resources["SystemAccentColorDark2"] = _colors[1];
+ Application.Current.Resources["SystemAccentColorDark3"] = _colors[1];
+ Application.Current.Resources["AccentColor"] = new SolidColorBrush(_colors[1]);
}
- private static async Task SetDarkColors(Bitmap bitmapinput, int quality)
+ private static async Task SetDarkColors(Bitmap bitmapinput)
{
- Windows.UI.Color[] _colors = await GetPaletteList(bitmapinput, 255, false, quality);
+ Windows.UI.Color[] _colors = await GetPaletteList(bitmapinput, 10, false, 1);
Application.Current.Resources["SystemAccentColor"] = _colors[0];
- Application.Current.Resources["SystemAccentColorLight1"] = _colors[1];
- Application.Current.Resources["SystemAccentColorLight2"] = _colors[2];
- Application.Current.Resources["SystemAccentColorLight3"] = _colors[3];
+ Application.Current.Resources["SystemAccentColorLight1"] = _colors[0];
+ Application.Current.Resources["SystemAccentColorLight2"] = _colors[1];
+ Application.Current.Resources["SystemAccentColorLight3"] = _colors[0];
Application.Current.Resources["AccentColor"] = new SolidColorBrush(_colors[0]);
-
- return _colors;
}
+
+ private static List _generatedColors = new List();
private static async Task GetPaletteList(Bitmap bitmapinput, int ColorCount, bool IsLight, int quality)
{
byte DefVal = (byte)(IsLight ? 80 : 255);
- Windows.UI.Color[] output = new Windows.UI.Color[4];
try
{
- List ThemedColors = await Task.Run(() => ColorThief.GetPalette(bitmapinput, ColorCount, IsLight ? 1 : quality).Where(x => IsLight ? x.IsDark : !x.IsDark).ToList());
+ LumaUtils.DarkThreshold = IsLight ? 200f : 400f;
+ LumaUtils.IgnoreWhiteThreshold = IsLight ? 900f : 800f;
+ if (!IsLight)
+ LumaUtils.ChangeCoeToBT709();
+ else
+ LumaUtils.ChangeCoeToBT601();
- if (ThemedColors.Count == 0 || ThemedColors.Count < output.Length) throw new Exception($"The image doesn't have {output.Length} matched colors to assign. Fallback to default!");
- for (int i = 0, j = output.Length - 1; i < output.Length; i++, j--)
+ return await Task.Run(() =>
{
- output[i] = DrawingColorToColor(ThemedColors[i]);
- }
+ _generatedColors.Clear();
+
+ while (true)
+ {
+ try
+ {
+ IEnumerable averageColors = ColorThief.GetPalette(bitmapinput, ColorCount, quality, !IsLight)
+ .Where(x => IsLight ? x.IsDark : !x.IsDark)
+ .OrderBy(x => x.Population);
+
+ QuantizedColor dominatedColor = new QuantizedColor(
+ Color.FromArgb(
+ 255,
+ (byte)averageColors.Average(a => a.Color.R),
+ (byte)averageColors.Average(a => a.Color.G),
+ (byte)averageColors.Average(a => a.Color.B)
+ ), (int)averageColors.Average(a => a.Population));
+
+ _generatedColors.Add(dominatedColor);
+ _generatedColors.AddRange(averageColors);
+
+ break;
+ }
+ catch (InvalidOperationException)
+ {
+ if (ColorCount > 100) throw;
+ LogWriteLine($"Regenerating colors by adding 20 more colors to generate: {ColorCount} to {ColorCount + 20}", LogType.Warning, true);
+ ColorCount += 20;
+ }
+ }
+
+ return EnsureLengthCopyLast(_generatedColors
+ .Select(DrawingColorToColor)
+ .ToArray(), 2);
+ }).ConfigureAwait(false);
}
catch (Exception ex)
{
LogWriteLine($"{ex}", LogType.Warning, true);
- Windows.UI.Color defColor = DrawingColorToColor(new QuantizedColor(Color.FromArgb(255, DefVal, DefVal, DefVal), 1));
- return new Windows.UI.Color[] { defColor, defColor, defColor, defColor };
}
- return output;
+ Windows.UI.Color defColor = DrawingColorToColor(new QuantizedColor(Color.FromArgb(255, DefVal, DefVal, DefVal), 1));
+ return new Windows.UI.Color[] { defColor, defColor, defColor, defColor };
+ }
+
+ private static T[] EnsureLengthCopyLast(T[] array, int toLength)
+ {
+ if (array.Length == 0) throw new IndexOutOfRangeException("Array has no content in it");
+ if (array.Length >= toLength) return array;
+
+ T lastArray = array[array.Length - 1];
+ T[] newArray = new T[toLength];
+ Array.Copy(array, newArray, array.Length);
+
+ for (int i = array.Length; i < newArray.Length; i++)
+ {
+ newArray[i] = lastArray;
+ }
+
+ return newArray;
}
private static Windows.UI.Color DrawingColorToColor(QuantizedColor i) => new Windows.UI.Color { R = i.Color.R, G = i.Color.G, B = i.Color.B, A = i.Color.A };
@@ -316,25 +186,21 @@ public async ValueTask GetCachedSprites(string URL, CancellationToken to
FileInfo cachedFileInfo = new FileInfo(cachedFilePath);
- bool isCachedFileExist = cachedFileInfo.Exists && cachedFileInfo.Length > 4 << 15;
- FileStream cachedFileStream = isCachedFileExist ? cachedFileInfo.OpenRead() : cachedFileInfo.Create();
-
- try
+ bool isCachedFileExist = cachedFileInfo.Exists && cachedFileInfo.Length > 1 << 15;
+ using (stream)
+ using (FileStream cachedFileStream = isCachedFileExist ? cachedFileInfo.OpenRead() : cachedFileInfo.Create())
{
- if (!isCachedFileExist)
+ try
{
- await GetResizedImageStream(stream, cachedFileStream, ToWidth, ToHeight);
- }
+ if (!isCachedFileExist)
+ {
+ await GetResizedImageStream(stream, cachedFileStream, ToWidth, ToHeight);
+ }
- bitmapRet = await Task.Run(() => Stream2Bitmap(cachedFileStream.AsRandomAccessStream()));
- bitmapImageRet = await Stream2BitmapImage(cachedFileStream.AsRandomAccessStream());
- }
- catch { throw; }
- finally
- {
- stream?.Dispose();
- cachedFileStream?.Dispose();
- GC.Collect();
+ bitmapRet = await Task.Run(() => Stream2Bitmap(cachedFileStream.AsRandomAccessStream()));
+ bitmapImageRet = await Stream2BitmapImage(cachedFileStream.AsRandomAccessStream());
+ }
+ catch { throw; }
}
return (bitmapRet, bitmapImageRet);
@@ -421,27 +287,6 @@ private static (uint, uint) GetPreservedImageRatio(uint canvasWidth, uint canvas
return ((uint)(imgWidth * ratio), (uint)(imgHeight * ratio));
}
- private async ValueTask DownloadBackgroundImage(CancellationToken Token)
- {
- regionBackgroundProp.imgLocalPath = Path.Combine(AppGameImgFolder, "bg", Path.GetFileName(regionBackgroundProp.data.adv.background));
- SetAndSaveConfigValue("CurrentBackground", regionBackgroundProp.imgLocalPath);
-
- if (!Directory.Exists(Path.Combine(AppGameImgFolder, "bg")))
- Directory.CreateDirectory(Path.Combine(AppGameImgFolder, "bg"));
-
- FileInfo fI = new FileInfo(regionBackgroundProp.imgLocalPath);
-
- if (fI.Exists) return;
-
- using (Stream netStream = (await _httpClient.DownloadFromSessionStreamAsync(regionBackgroundProp.data.adv.background, 0, null, Token)).Item1)
- {
- using (Stream outStream = fI.Create())
- {
- netStream.CopyTo(outStream);
- }
- }
- }
-
private async void ApplyBackgroundAsync() => await ApplyBackground();
private async Task ApplyBackground()
@@ -455,15 +300,10 @@ private async Task ApplyBackground()
(PaletteBitmap, BackgroundBitmap) = await GetResizedBitmap(stream, Width, Height);
- await ApplyAccentColor(this, PaletteBitmap, 7);
+ ApplyAccentColor(this, PaletteBitmap);
FadeOutFrontBg();
FadeOutBackBg();
-
- GC.Collect();
- GC.WaitForPendingFinalizers();
- GC.WaitForFullGCComplete();
- GC.Collect();
}
private async void FadeOutFrontBg()
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
index 0024fa30d..752acfec2 100644
--- a/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
+++ b/CollapseLauncher/Classes/CachesManagement/Honkai/Fetch.cs
@@ -1,4 +1,4 @@
-using CollapseLauncher.Interfaces;
+using CollapseLauncher.Interfaces;
using Hi3Helper;
using Hi3Helper.EncTool;
using Hi3Helper.EncTool.Parser.KianaDispatch;
@@ -82,23 +82,23 @@ private async Task BuildGameRepoURL(CancellationToken token)
KianaDispatch dispatch = null;
Exception lastException = null;
- foreach (string baseURL in _gamePreset.GameDispatchArrayURL)
+ foreach (string baseURL in _gameVersionManager.GamePreset.GameDispatchArrayURL)
{
try
{
// Init the key and decrypt it if exist.
string key = null;
- if (_gamePreset.DispatcherKey != null)
+ if (_gameVersionManager.GamePreset.DispatcherKey != null)
{
mhyEncTool Decryptor = new mhyEncTool();
Decryptor.InitMasterKey(ConfigV2.MasterKey, ConfigV2.MasterKeyBitLength, RSAEncryptionPadding.Pkcs1);
- key = _gamePreset.DispatcherKey;
+ key = _gameVersionManager.GamePreset.DispatcherKey;
Decryptor.DecryptStringWithMasterKey(ref key);
}
// Try assign dispatcher
- dispatch = await KianaDispatch.GetDispatch(baseURL, _gamePreset.GameDispatchURLTemplate, _gamePreset.GameDispatchChannelName, key, _gameVersion.VersionArray, token);
+ dispatch = await KianaDispatch.GetDispatch(baseURL, _gameVersionManager.GamePreset.GameDispatchURLTemplate, _gameVersionManager.GamePreset.GameDispatchChannelName, key, _gameVersion.VersionArray, token);
lastException = null;
break;
}
@@ -112,7 +112,7 @@ private async Task BuildGameRepoURL(CancellationToken token)
if (lastException != null) throw lastException;
// Get gatewayURl and fetch the gateway
- _gameGateway = await KianaDispatch.GetGameserver(dispatch, _gamePreset.GameGatewayDefault, token);
+ _gameGateway = await KianaDispatch.GetGameserver(dispatch, _gameVersionManager.GamePreset.GameGatewayDefault, token);
_gameRepoURL = BuildAssetBundleURL(_gameGateway);
}
@@ -213,7 +213,7 @@ private void BuildDataPatchConfig(MemoryStream stream, List assetInd
try
{
// Deserialize the line and set the type
- CacheAsset content = (CacheAsset)JsonSerializer.Deserialize(line, typeof(CacheAsset), CacheAssetContext.Default);
+ CacheAsset content = (CacheAsset)JsonSerializer.Deserialize(line, typeof(CacheAsset), InternalAppJSONContext.Default);
content.DataType = type;
// Check if the asset is regional and contains only selected language.
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/HonkaiCache.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/HonkaiCache.cs
index 621135aa7..8f4b131c7 100644
--- a/CollapseLauncher/Classes/CachesManagement/Honkai/HonkaiCache.cs
+++ b/CollapseLauncher/Classes/CachesManagement/Honkai/HonkaiCache.cs
@@ -2,6 +2,7 @@
using CollapseLauncher.Statics;
using Hi3Helper.Data;
using Hi3Helper.EncTool.Parser.KianaDispatch;
+using Hi3Helper.Preset;
using Microsoft.UI.Xaml;
using System;
using System.Collections.Generic;
@@ -20,14 +21,15 @@ internal partial class HonkaiCache : ProgressBase, I
private List _updateAssetIndex { get; set; }
#endregion
- public HonkaiCache(UIElement parentUI)
+ public HonkaiCache(UIElement parentUI, IGameVersionCheck GameVersionManager)
: base(
parentUI,
- PageStatics._GameVersion.GameDirAppDataPath,
+ GameVersionManager,
+ GameVersionManager.GameDirAppDataPath,
null,
- PageStatics._GameVersion.GetGameVersionAPI().VersionString)
+ GameVersionManager.GetGameVersionAPI().VersionString)
{
- _gameLang = _gamePreset.GetGameLanguage() ?? "en";
+ _gameLang = _gameVersionManager.GamePreset.GetGameLanguage() ?? "en";
}
~HonkaiCache() => Dispose();
diff --git a/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs b/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs
index d44e03051..0eca1c6b5 100644
--- a/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs
+++ b/CollapseLauncher/Classes/CachesManagement/StarRail/Check.cs
@@ -29,7 +29,7 @@ private async Task> Check(List assetIndex, CancellationTo
RestartStopwatch();
// Get persistent and streaming paths
- string execName = Path.GetFileNameWithoutExtension(_gamePreset.GameExecutableName);
+ string execName = Path.GetFileNameWithoutExtension(_innerGameVersionManager.GamePreset.GameExecutableName);
string baseDesignDataPathPersistent = Path.Combine(_gamePath, @$"{execName}_Data\Persistent\DesignData\Windows");
string baseDesignDataPathStreaming = Path.Combine(_gamePath, @$"{execName}_Data\StreamingAssets\DesignData\Windows");
diff --git a/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs b/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs
index 46c219cda..4b302433b 100644
--- a/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs
+++ b/CollapseLauncher/Classes/CachesManagement/StarRail/Fetch.cs
@@ -9,6 +9,7 @@
using static Hi3Helper.Data.ConverterTool;
using static Hi3Helper.Locale;
using static Hi3Helper.Logger;
+using static CollapseLauncher.GameSettings.Base.SettingsBase;
namespace CollapseLauncher
{
@@ -22,7 +23,7 @@ private async Task> Fetch(CancellationToken token)
try
{
// Subscribe the event listener
- _gameVersionManager.StarRailMetadataTool.HttpEvent += _httpClient_FetchAssetProgress;
+ _innerGameVersionManager.StarRailMetadataTool.HttpEvent += _httpClient_FetchAssetProgress;
// Initialize metadata
// Set total activity string as "Fetching Caches Type: Dispatcher"
@@ -30,7 +31,7 @@ private async Task> Fetch(CancellationToken token)
_status.IsProgressTotalIndetermined = true;
_status.IsIncludePerFileIndicator = false;
UpdateStatus();
- await _gameVersionManager.StarRailMetadataTool.Initialize(token, GetExistingGameRegionID(), Path.Combine(_gamePath, $"{Path.GetFileNameWithoutExtension(_gamePreset.GameExecutableName)}_Data\\Persistent"));
+ await _innerGameVersionManager.StarRailMetadataTool.Initialize(token, GetExistingGameRegionID(), Path.Combine(_gamePath, $"{Path.GetFileNameWithoutExtension(_gameVersionManager.GamePreset.GameExecutableName)}_Data\\Persistent"));
// Iterate type and do fetch
foreach (SRAssetType type in Enum.GetValues(typeof(SRAssetType)))
@@ -62,7 +63,7 @@ private async Task> Fetch(CancellationToken token)
finally
{
// Unsubscribe the event listener and dispose Http client
- _gameVersionManager.StarRailMetadataTool.HttpEvent -= _httpClient_FetchAssetProgress;
+ _innerGameVersionManager.StarRailMetadataTool.HttpEvent -= _httpClient_FetchAssetProgress;
}
// Return asset index
@@ -84,18 +85,18 @@ private async Task> Fetch(CancellationToken token)
switch (type)
{
case SRAssetType.IFix:
- await _gameVersionManager.StarRailMetadataTool.ReadIFixMetadataInformation(token);
- assetProperty = _gameVersionManager.StarRailMetadataTool.MetadataIFix.GetAssets();
+ await _innerGameVersionManager.StarRailMetadataTool.ReadIFixMetadataInformation(token);
+ assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataIFix.GetAssets();
assetIndex.AddRange(assetProperty.AssetList);
return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
case SRAssetType.DesignData:
- await _gameVersionManager.StarRailMetadataTool.ReadDesignMetadataInformation(token);
- assetProperty = _gameVersionManager.StarRailMetadataTool.MetadataDesign.GetAssets();
+ await _innerGameVersionManager.StarRailMetadataTool.ReadDesignMetadataInformation(token);
+ assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataDesign.GetAssets();
assetIndex.AddRange(assetProperty.AssetList);
return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
case SRAssetType.Lua:
- await _gameVersionManager.StarRailMetadataTool.ReadLuaMetadataInformation(token);
- assetProperty = _gameVersionManager.StarRailMetadataTool.MetadataLua.GetAssets();
+ await _innerGameVersionManager.StarRailMetadataTool.ReadLuaMetadataInformation(token);
+ assetProperty = _innerGameVersionManager.StarRailMetadataTool.MetadataLua.GetAssets();
assetIndex.AddRange(assetProperty.AssetList);
return (assetProperty.AssetList.Count, assetProperty.AssetTotalSize);
}
@@ -112,10 +113,10 @@ private async Task> Fetch(CancellationToken token)
private unsafe string GetExistingGameRegionID()
{
#nullable enable
- object? value = GameSettings.Statics.RegistryRoot?.GetValue("App_LastServerName_h2577443795", null);
+ object? value = RegistryRoot?.GetValue("App_LastServerName_h2577443795", null);
if (value == null)
{
- return _gamePreset.GameDispatchDefaultName ?? throw new KeyNotFoundException("Default dispatcher name in metadata is not exist!");
+ return _gameVersionManager.GamePreset.GameDispatchDefaultName ?? throw new KeyNotFoundException("Default dispatcher name in metadata is not exist!");
}
#nullable disable
diff --git a/CollapseLauncher/Classes/CachesManagement/StarRail/StarRailCache.cs b/CollapseLauncher/Classes/CachesManagement/StarRail/StarRailCache.cs
index 996580544..b7ead92fe 100644
--- a/CollapseLauncher/Classes/CachesManagement/StarRail/StarRailCache.cs
+++ b/CollapseLauncher/Classes/CachesManagement/StarRail/StarRailCache.cs
@@ -1,6 +1,5 @@
using CollapseLauncher.GameVersioning;
using CollapseLauncher.Interfaces;
-using CollapseLauncher.Statics;
using Hi3Helper.Data;
using Hi3Helper.EncTool.Parser.AssetMetadata.SRMetadataAsset;
using Microsoft.UI.Xaml;
@@ -14,18 +13,20 @@ namespace CollapseLauncher
internal partial class StarRailCache : ProgressBase, ICache
{
#region Properties
+ private GameTypeStarRailVersion _innerGameVersionManager { get; set; }
private string _cacheRegionalCheckName = "sprite";
private List _updateAssetIndex { get; set; }
- private GameTypeStarRailVersion _gameVersionManager { get => PageStatics._GameVersion as GameTypeStarRailVersion; }
#endregion
- public StarRailCache(UIElement parentUI)
+ public StarRailCache(UIElement parentUI, IGameVersionCheck GameVersionManager)
: base(
parentUI,
- PageStatics._GameVersion.GameDirPath,
+ GameVersionManager,
+ GameVersionManager.GameDirPath,
null,
- PageStatics._GameVersion.GetGameVersionAPI().VersionString)
+ GameVersionManager.GetGameVersionAPI().VersionString)
{
+ _innerGameVersionManager = GameVersionManager as GameTypeStarRailVersion;
}
~StarRailCache() => Dispose();
diff --git a/CollapseLauncher/Classes/ClassesContext.cs b/CollapseLauncher/Classes/ClassesContext.cs
index 51fe31a5a..640b79fd8 100644
--- a/CollapseLauncher/Classes/ClassesContext.cs
+++ b/CollapseLauncher/Classes/ClassesContext.cs
@@ -5,18 +5,9 @@
namespace CollapseLauncher
{
[JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
+ [JsonSerializable(typeof(CommunityToolsProperty))]
[JsonSerializable(typeof(AppUpdateVersionProp))]
- internal sealed partial class AppUpdateVersionPropContext : JsonSerializerContext { }
-
- [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
[JsonSerializable(typeof(NotificationPush))]
- internal sealed partial class NotificationPushContext : JsonSerializerContext { }
-
- [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
[JsonSerializable(typeof(CacheAsset))]
- internal sealed partial class CacheAssetContext : JsonSerializerContext { }
-
- [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
- [JsonSerializable(typeof(CommunityToolsProperty))]
- internal sealed partial class CommunityToolsPropertyContext : JsonSerializerContext { }
+ internal sealed partial class InternalAppJSONContext : JsonSerializerContext { }
}
diff --git a/CollapseLauncher/Classes/EventsManagement/BackgroundActivityManager.cs b/CollapseLauncher/Classes/EventsManagement/BackgroundActivityManager.cs
new file mode 100644
index 000000000..19a289bb7
--- /dev/null
+++ b/CollapseLauncher/Classes/EventsManagement/BackgroundActivityManager.cs
@@ -0,0 +1,290 @@
+using CollapseLauncher.Interfaces;
+using Hi3Helper;
+using Hi3Helper.Data;
+using Hi3Helper.Shared.Region;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using CollapseLauncher.Statics;
+using Hi3Helper.Preset;
+using static Hi3Helper.Locale;
+
+namespace CollapseLauncher
+{
+ internal class BackgroundActivityManager
+ {
+ private static ThemeShadow _infoBarShadow = new ThemeShadow();
+
+ public static Dictionary BackgroundActivities = new Dictionary();
+
+ private static GamePresetProperty CurrentGameProperty;
+
+ public static void Attach(int hashID, IBackgroundActivity activity, string activityTitle, string activitySubtitle)
+ {
+ if (!BackgroundActivities.ContainsKey(hashID))
+ {
+ AttachEventToNotification(hashID, activity, activityTitle, activitySubtitle);
+ BackgroundActivities.Add(hashID, activity);
+#if DEBUG
+ Logger.LogWriteLine($"Background activity with ID: {hashID} has been attached", LogType.Debug, true);
+#endif
+ return;
+ }
+ }
+
+ public static void Detach(int hashID)
+ {
+ if (BackgroundActivities.ContainsKey(hashID))
+ {
+ BackgroundActivities.Remove(hashID);
+ DetachEventFromNotification(hashID);
+#if DEBUG
+ Logger.LogWriteLine($"Background activity with ID: {hashID} has been detached", LogType.Debug, true);
+#endif
+ return;
+ }
+
+#if DEBUG
+ Logger.LogWriteLine($"Cannot detach background activity with ID: {hashID} because it doesn't attached", LogType.Debug, true);
+#endif
+ }
+
+ private static void AttachEventToNotification(int hashID, IBackgroundActivity activity, string activityTitle, string activitySubtitle)
+ {
+ Thickness containerNotClosableMargin = new Thickness(-28, -8, 24, 20);
+ Thickness containerClosableMargin = new Thickness(-28, -8, -28, 20);
+
+ InfoBar _parentNotifUI = new InfoBar()
+ {
+ Tag = hashID,
+ Severity = InfoBarSeverity.Informational,
+ Background = (Brush)Application.Current.Resources["InfoBarAnnouncementBrush"],
+ IsOpen = true,
+ IsClosable = false,
+ Margin = new Thickness(4, 4, 4, 0),
+ CornerRadius = new CornerRadius(8),
+ Shadow = _infoBarShadow,
+ Title = activityTitle,
+ Message = activitySubtitle
+ };
+ _parentNotifUI.Translation += LauncherConfig.Shadow32;
+
+ StackPanel _parentContainer = new StackPanel() { Margin = _parentNotifUI.IsClosable ? containerClosableMargin : containerNotClosableMargin };
+ _parentNotifUI.Content = _parentContainer;
+ Grid _parentGrid = new Grid()
+ {
+ ColumnDefinitions = {
+ new ColumnDefinition() { Width = new GridLength(72) },
+ new ColumnDefinition()
+ }
+ };
+ _parentContainer.Children.Add(_parentGrid);
+
+ StackPanel progressLogoContainer = new StackPanel()
+ {
+ CornerRadius = new CornerRadius(8),
+ Width = 64,
+ Height = 64,
+ Margin = new Thickness(0, 4, 8, 4)
+ };
+ _parentGrid.Children.Add(progressLogoContainer);
+ Grid.SetColumn(progressLogoContainer, 0);
+
+ CurrentGameProperty = GamePropertyVault.GetCurrentGameProperty();
+ switch (CurrentGameProperty._GameVersion.GameType)
+ {
+ case GameType.Honkai:
+ Image progressLogoHonkai = new Image()
+ {
+ Source = new BitmapImage(new Uri("ms-appx:///XAMLs/Prototype/honkai-logo.png")),
+ Width = 64,
+ Height = 64
+ };
+ progressLogoContainer.Children.Add(progressLogoHonkai);
+ break;
+ case GameType.Genshin:
+ Image progressLogoGenshin = new Image()
+ {
+ Source = new BitmapImage(new Uri("ms-appx:///XAMLs/Prototype/genshin-logo.png")),
+ Width = 64,
+ Height = 64
+ };
+ progressLogoContainer.Children.Add(progressLogoGenshin);
+ break;
+ case GameType.StarRail:
+ Image progressLogoStarRail = new Image()
+ {
+ Source = new BitmapImage(new Uri("ms-appx:///XAMLs/Prototype/starrail-logo.png")),
+ Width = 64,
+ Height = 64
+ };
+ progressLogoContainer.Children.Add(progressLogoStarRail);
+ break;
+ case GameType.Zenless:
+ Image progressLogoZenless = new Image()
+ {
+ Source = new BitmapImage(new Uri("ms-appx:///XAMLs/Prototype/zenless-logo.png")),
+ Width = 64,
+ Height = 64
+ };
+ progressLogoContainer.Children.Add(progressLogoZenless);
+ break;
+ case GameType.Unknown:
+ Image progressLogoUnknown = new Image()
+ {
+ Source = new BitmapImage(new Uri("ms-appx:///XAMLs/Prototype/honkai-logo.png")),
+ Width = 64,
+ Height = 64
+ };
+ progressLogoContainer.Children.Add(progressLogoUnknown);
+ break;
+ }
+
+ StackPanel progressStatusContainer = new StackPanel()
+ {
+ Margin = new Thickness(8, -4, 0, 0),
+ VerticalAlignment = VerticalAlignment.Center
+ };
+ _parentGrid.Children.Add(progressStatusContainer);
+ Grid.SetColumn(progressStatusContainer, 1);
+
+ Grid progressStatusGrid = new Grid()
+ {
+ Margin = new Thickness(0, 0, 0, 16),
+ ColumnDefinitions =
+ {
+ new ColumnDefinition(),
+ new ColumnDefinition()
+ },
+ RowDefinitions =
+ {
+ new RowDefinition(),
+ new RowDefinition()
+ }
+ };
+ progressStatusContainer.Children.Add(progressStatusGrid);
+
+ TextBlock progressLeftTitle = new TextBlock()
+ {
+ Style = Application.Current.Resources["BodyStrongTextBlockStyle"] as Style,
+ Text = "Downloading Package: 1 / 3"
+ };
+ TextBlock progressLeftSubtitle = new TextBlock()
+ {
+ Style = Application.Current.Resources["CaptionTextBlockStyle"] as Style,
+ Text = "Speed: 69.42 MB/s"
+ };
+
+ TextBlock progressRightTitle = new TextBlock()
+ {
+ Style = Application.Current.Resources["BodyStrongTextBlockStyle"] as Style,
+ Text = "Estimated Time: 0h 32m left",
+ HorizontalAlignment = HorizontalAlignment.Right
+ };
+ TextBlock progressRightSubtitle = new TextBlock()
+ {
+ Style = Application.Current.Resources["CaptionTextBlockStyle"] as Style,
+ Text = "Progress: 69.42%",
+ HorizontalAlignment = HorizontalAlignment.Right
+ };
+ progressStatusGrid.Children.Add(progressLeftTitle);
+ progressStatusGrid.Children.Add(progressLeftSubtitle);
+ progressStatusGrid.Children.Add(progressRightTitle);
+ progressStatusGrid.Children.Add(progressRightSubtitle);
+ Grid.SetColumn(progressLeftTitle, 0); Grid.SetRow(progressLeftTitle, 0);
+ Grid.SetColumn(progressLeftSubtitle, 0); Grid.SetRow(progressLeftSubtitle, 1);
+ Grid.SetColumn(progressRightTitle, 1); Grid.SetRow(progressRightTitle, 0);
+ Grid.SetColumn(progressRightSubtitle, 1); Grid.SetRow(progressRightSubtitle, 1);
+
+ ProgressBar progressBar = new ProgressBar() { Minimum = 0, Maximum = 100, Value = 69.42 };
+ progressStatusContainer.Children.Add(progressBar);
+
+ Button cancelButton = new Button()
+ {
+ HorizontalAlignment = HorizontalAlignment.Right,
+ Margin = new Thickness(0, 4, 0, 0),
+ CornerRadius = new CornerRadius(14),
+ Style = Application.Current.Resources["AccentButtonStyle"] as Style,
+ Content = new StackPanel()
+ {
+ Orientation = Orientation.Horizontal,
+ Margin = new Thickness(4, 0, 4, 0),
+ Children =
+ {
+ new FontIcon()
+ {
+ FontFamily = Application.Current.Resources["FontAwesomeSolid"] as FontFamily,
+ Glyph = "",
+ FontSize = 18
+ },
+ new TextBlock()
+ {
+ Text = Lang._HomePage.PauseCancelDownloadBtn,
+ FontWeight = FontWeights.Medium,
+ Margin = new Thickness(8, -2, 0, 0),
+ VerticalAlignment = VerticalAlignment.Center
+ }
+ }
+ }
+ };
+
+ cancelButton.Click += (_, args) =>
+ {
+ cancelButton.IsEnabled = false;
+ activity.CancelRoutine();
+ _parentNotifUI.IsOpen = false;
+ };
+
+ activity.ProgressChanged += (_, args) => activity.Dispatch(() =>
+ {
+ progressBar.Value = args.ProgressTotalPercentage;
+ progressLeftSubtitle.Text = string.Format(Lang._Misc.Speed, ConverterTool.SummarizeSizeSimple(args.ProgressTotalSpeed));
+ progressRightTitle.Text = string.Format(Lang._Misc.TimeRemainHMSFormat, args.ProgressTotalTimeLeft);
+ progressRightSubtitle.Text = string.Format(Lang._UpdatePage.UpdateHeader1 + " {0}%", args.ProgressTotalPercentage);
+ });
+
+ activity.StatusChanged += (_, args) => activity.Dispatch(() =>
+ {
+ progressLeftTitle.Text = args.ActivityStatus;
+ if (args.IsCanceled)
+ {
+ cancelButton.IsEnabled = false;
+ cancelButton.Visibility = Visibility.Collapsed;
+ _parentNotifUI.Severity = InfoBarSeverity.Error;
+ _parentNotifUI.Title = "[Error] " + activityTitle;
+ _parentNotifUI.IsClosable = true;
+ _parentContainer.Margin = containerClosableMargin;
+ }
+ if (args.IsCompleted)
+ {
+ cancelButton.IsEnabled = false;
+ cancelButton.Visibility = Visibility.Collapsed;
+ _parentNotifUI.Severity = InfoBarSeverity.Success;
+ _parentNotifUI.Title = "[Completed] " + activityTitle;
+ _parentNotifUI.IsClosable = true;
+ _parentContainer.Margin = containerClosableMargin;
+ }
+ if (args.IsRunning)
+ {
+ cancelButton.IsEnabled = true;
+ cancelButton.Visibility = Visibility.Visible;
+ _parentNotifUI.Severity = InfoBarSeverity.Informational;
+ _parentNotifUI.Title = activityTitle;
+ _parentNotifUI.IsClosable = false;
+ _parentContainer.Margin = containerNotClosableMargin;
+ }
+ });
+
+ _parentNotifUI.Closing += (_, _) => Detach(hashID);
+ _parentContainer.Children.Add(cancelButton);
+
+ NotificationSender.SendCustomNotification(hashID, _parentNotifUI);
+ }
+
+ private static void DetachEventFromNotification(int hashID) => NotificationSender.RemoveCustomNotification(hashID);
+ }
+}
diff --git a/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs b/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
index c60854b6c..4fd910be5 100644
--- a/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
+++ b/CollapseLauncher/Classes/EventsManagement/EventsHandler.cs
@@ -73,7 +73,7 @@ private static async ValueTask GetUpdateMetadata()
await FallbackCDNUtil.DownloadCDNFallbackContent(client, ms, relativePath, default);
ms.Position = 0;
- return (AppUpdateVersionProp)JsonSerializer.Deserialize(ms, typeof(AppUpdateVersionProp), AppUpdateVersionPropContext.Default);
+ return (AppUpdateVersionProp)JsonSerializer.Deserialize(ms, typeof(AppUpdateVersionProp), InternalAppJSONContext.Default);
}
}
@@ -235,6 +235,25 @@ internal static class NotificationSender
{
static NotificationInvoker invoker = new NotificationInvoker();
public static void SendNotification(NotificationInvokerProp e) => invoker.SendNotification(e);
+ public static void SendCustomNotification(int tagID, InfoBar infoBarUI) => invoker.SendNotification(new NotificationInvokerProp
+ {
+ IsCustomNotif = true,
+ CustomNotifAction = NotificationCustomAction.Add,
+ Notification = new NotificationProp
+ {
+ MsgId = tagID,
+ },
+ OtherContent = infoBarUI
+ });
+ public static void RemoveCustomNotification(int tagID) => invoker.SendNotification(new NotificationInvokerProp
+ {
+ IsCustomNotif = true,
+ CustomNotifAction = NotificationCustomAction.Remove,
+ Notification = new NotificationProp
+ {
+ MsgId = tagID,
+ }
+ });
}
internal class NotificationInvoker
@@ -243,12 +262,16 @@ internal class NotificationInvoker
public void SendNotification(NotificationInvokerProp e) => EventInvoker?.Invoke(this, e);
}
+ public enum NotificationCustomAction { Add, Remove }
public class NotificationInvokerProp
{
public TypedEventHandler CloseAction { get; set; } = null;
public UIElement OtherContent { get; set; } = null;
public NotificationProp Notification { get; set; }
public bool IsAppNotif { get; set; } = true;
+ public bool IsCustomNotif { get; set; } = false;
+ public NotificationCustomAction CustomNotifAction { get; set; }
+
}
#endregion
#region BackgroundRegion
@@ -257,14 +280,17 @@ internal static class BackgroundImgChanger
static BackgroundImgChangerInvoker invoker = new BackgroundImgChangerInvoker();
public static async Task WaitForBackgroundToLoad() => await invoker.WaitForBackgroundToLoad();
public static void ChangeBackground(string ImgPath, bool IsCustom = true) => invoker.ChangeBackground(ImgPath, IsCustom);
+ public static void ToggleBackground(bool Hide) => invoker.ToggleBackground(Hide);
}
internal class BackgroundImgChangerInvoker
{
public static event EventHandler ImgEvent;
+ public static event EventHandler IsImageHide;
BackgroundImgProperty property;
public async Task WaitForBackgroundToLoad() => await Task.Run(() => { while (!property.IsImageLoaded) { } });
public void ChangeBackground(string ImgPath, bool IsCustom) => ImgEvent?.Invoke(this, property = new BackgroundImgProperty(ImgPath, IsCustom));
+ public void ToggleBackground(bool Hide) => IsImageHide?.Invoke(this, Hide);
}
internal class BackgroundImgProperty
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
index 4fd03252e..66a195516 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
@@ -7,8 +7,8 @@
using System.IO;
using System.IO.Compression;
using System.Text;
-using static CollapseLauncher.GameSettings.Statics;
using static Hi3Helper.Locale;
+using static CollapseLauncher.GameSettings.Base.SettingsBase;
namespace CollapseLauncher.GameSettings.Base
{
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/SettingsBase.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/SettingsBase.cs
new file mode 100644
index 000000000..faa5da052
--- /dev/null
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/SettingsBase.cs
@@ -0,0 +1,19 @@
+using CollapseLauncher.Interfaces;
+using Microsoft.Win32;
+
+namespace CollapseLauncher.GameSettings.Base
+{
+ internal class SettingsBase : ImportExportBase
+ {
+#nullable enable
+ internal static string? RegistryPath;
+ internal static RegistryKey? RegistryRoot;
+
+ public SettingsBase(IGameVersionCheck GameVersionManager)
+ {
+ _gameVersionManager = GameVersionManager;
+ }
+#nullable disable
+ protected static IGameVersionCheck _gameVersionManager { get; set; }
+ }
+}
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/TypeExtensions.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/TypeExtensions.cs
new file mode 100644
index 000000000..aa4934044
--- /dev/null
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/TypeExtensions.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Reflection;
+
+namespace CollapseLauncher
+{
+ public static class TypeExtensions
+ {
+ public static bool IsInstancePropertyEqual(T self, T to) where T : class
+ {
+ // Check if the one of the value is null, if true check the other value if it's null
+ if (self == null)
+ {
+ if (to != null) return false;
+ else return true;
+ }
+ if (to == null)
+ {
+ if (self != null) return false;
+ else return true;
+ }
+
+ // Get the type of the instance
+ Type type = typeof(T);
+ // Enumerate the PropertyInfo out of instance
+ foreach (PropertyInfo pi in type.GetProperties(BindingFlags.Public | BindingFlags.Instance))
+ {
+ // Get the property name and value from both self and to
+ object selfValue = type.GetProperty(pi.Name).GetValue(self, null);
+ object toValue = type.GetProperty(pi.Name).GetValue(to, null);
+
+ // If the value on both self and to is different, then return false (not equal)
+ if (selfValue != toValue && (selfValue == null || !selfValue.Equals(toValue)))
+ {
+ return false;
+ }
+ }
+
+ // If all passes, then return true (equal)
+ return true;
+ }
+ }
+}
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/Context.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/Context.cs
index 8bf35b30e..76d74071b 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/Context.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/Context.cs
@@ -1,17 +1,10 @@
-using CollapseLauncher.GameSettings.Genshin;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
namespace CollapseLauncher.GameSettings.Genshin.Context
{
[JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
[JsonSerializable(typeof(GeneralData))]
- internal sealed partial class GeneralDataContext : JsonSerializerContext { }
-
- [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
[JsonSerializable(typeof(GraphicsData))]
- internal sealed partial class GraphicsDataContext : JsonSerializerContext { }
-
- [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
[JsonSerializable(typeof(GlobalPerfData))]
- internal sealed partial class GlobalPerfDataContext : JsonSerializerContext { }
+ internal sealed partial class GenshinSettingsJSONContext : JsonSerializerContext { }
}
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
index 0b535cf92..eba4045f7 100644
--- a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
+++ b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
@@ -1,14 +1,13 @@
-using CollapseLauncher.GameSettings.Genshin;
using CollapseLauncher.GameSettings.Genshin.Context;
-using CollapseLauncher.Interfaces;
using Hi3Helper;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
using System.Text;
+using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
-using static CollapseLauncher.GameSettings.Statics;
+using static CollapseLauncher.GameSettings.Base.SettingsBase;
using static Hi3Helper.Logger;
namespace CollapseLauncher.GameSettings.Genshin
@@ -24,77 +23,40 @@ internal class GeneralData
//Using guide from https://github.com/Myp3a/GenshinConfigurator/wiki/Config-format
//Thanks Myp3a!
- ///
- /// deviceUUID
- /// This is supposed to be empty
- ///
- public string deviceUUID { get; set; } = "";
-
- ///
- /// userLocalDataVersionId
- /// This should be static
- /// Value: 0.0.1
- ///
- public string userLocalDataVersionId { get; set; } = "0.0.1";
+ public int mtrAbortTimeOutCount { get; set; } = 3;
///
- /// This define "Text Language" in-game settings.
- /// Valid values: 1-13
- /// Default: 1
- /// English(1)
- /// Simplified Chinese(2)
- /// Traditional Chinese(3)
- /// French(4)
- /// German(5)
- /// Spanish(6)
- /// Portugese(7)
- /// Russian(8)
- /// Japanese(9)
- /// Korean(10)
- /// Thai(11)
- /// Vietnamese(12)
- /// Indonesian(13)
- /// Turkish(14)
- /// Italy(15)
+ /// Could be for PlayStation multiplayer stuff
///
- public int deviceLanguageType { get; set; } = 1;
+ public bool onlyPlayWithPSPlayer { get; set; } = false;
- ///
- /// This define "Voice Language" in-game settings.
- /// Valid values: 0-3
- /// Default: 1
- /// Chinese(0)
- /// English(1)
- /// Japanese(2)
- /// Korean(3)
- ///
- public int deviceVoiceLanguageType { get; set; } = 1;
+ public int urlCheckErrorTraceCount { get; set; } = 30;
- ///
- /// This define "Server Name" last selected in loading menu.
- ///
- public string selectedServerName { get; set; } = "os_usa";
+ public decimal uiPaperWhite { get; set; } = 0.0m;
+ public decimal scenePaperWhite { get; set; } = 0.0m;
- ///
- /// I don't know what this do
- ///
public int localLevelIndex { get; set; } = 0;
- public string deviceID { get; set; } = "";
- public string targetUID { get; set; } = "";
- public string curAccountName { get; set; } = "";
+ public bool disableRewiredDelayInit { get; set; } = false;
+ public bool enableAudioChangeAndroidMinimumBufferCapacity { get; set; } = true;
///
- /// This define "Resolution" index selected in-game.
- /// Valid value: 0-?
- /// Default: 0
+ /// This define "Voice Volume" slider in-game.
+ /// Valid values: 0-10
+ /// Default: 10
///
- public string uiSaveData { get; set; }
+ public int volumeVoice { get; set; } = 10;
+
+ public int mtrTraceCDEachReason { get; set; } = 600;
+ public bool mtrCached { get; set; } = true;
+ public List