Conversation
…nto CN # Conflicts: # src/XIVLauncher/Windows/ViewModel/Main/Flows/GameInjectionFlow.cs
AtmoOmen
requested changes
Sep 15, 2026
AtmoOmen
left a comment
AtmoOmen
left a comment
Owner
There was a problem hiding this comment.
请勿让代理配置绕开原有的配置体系，目前整个代理系统都游离于其他系统之外。
Author
|
配置已并入主配置、入口已移入 VM、保存即生效 |
AtmoOmen
requested changes
Sep 17, 2026
AtmoOmen
left a comment
AtmoOmen
left a comment
Owner
There was a problem hiding this comment.
- 不要包含“西红柿炒鸡蛋（没有红烧肉版）”式注释。
- 测试内容没有什么意义，请删除。
| /// </summary> | ||
| public static class XLProxyProvider | ||
| { | ||
| public static IWebProxy? Current { get; private set; } |
Owner
There was a problem hiding this comment.
读取点全部发生在构造期，你 Apply 了又没有对那些依赖注入的进行更新，它们拿到的还全都是旧的对象。
| /// 代理配置现已并入启动器主配置 (LauncherSettingsV3) 的统一存储体系, | ||
| /// 启动时自动导入旧文件, 导入成功后删除旧文件。 | ||
| /// </summary> | ||
| public static class ProxySettingsMigration |
Comment on lines
+118
to
+119
| if (!string.IsNullOrEmpty(passwordInput)) | ||
| profile.SetPassword(passwordInput); |
Comment on lines
+135
to
+137
| <xctk:IntegerUpDown Margin="0,4,0,16" Width="140" Minimum="1" Maximum="65535" | ||
| Value="{Binding SelectedProfile.ProxyPort, UpdateSourceTrigger=PropertyChanged}" | ||
| Padding="4" /> |
Comment on lines
+46
to
+53
| public static string GetProxyConfigPath() => | ||
| Path.Join(RoamingPath, "proxyConfigV3.json"); | ||
|
|
||
| /// <summary> | ||
| /// 旧版代理配置路径 (启动器安装目录), 用于首次迁移到 Roaming | ||
| /// </summary> | ||
| public static string GetLegacyProxyConfigPath() => | ||
| Path.Join(AppContext.BaseDirectory, "proxyConfigV3.json"); |
Comment on lines
+9
to
+23
| public sealed record ProxyConfigSnapshot | ||
| ( | ||
| string Type, | ||
| string Host, | ||
| int Port, | ||
| string? Username = null, | ||
| string? Password = null | ||
| ) | ||
| { | ||
| public bool IsDisabled => | ||
| string.IsNullOrWhiteSpace(Host) | ||
| || Port is < 1 or > 65535 | ||
| || string.IsNullOrWhiteSpace(Type) | ||
| || string.Equals(Type, "None", StringComparison.OrdinalIgnoreCase); | ||
| } |
…apshot 拆分独立文件并精简注释
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.