Merge pull request #779 from BeyondDimension/develop

v2.6.3
改进 MessageBoxWindow Style
2026-10-26 12:09:32 +08:00 · 2021-12-12 17:42:31 +08:00 · 2021-12-12 11:39:41 +08:00 · 2021-12-12 01:49:22 +08:00 · 2021-12-12 00:06:26 +08:00 · 2021-12-11 23:58:03 +08:00
37 changed files with 162 additions and 163 deletions
@@ -33,9 +33,9 @@ emit_plist() {
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.2</string>
+	<string>2.6.3</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.2.0</string>
+	<string>2.6.3.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14</string>
 	<key>CFBundleDevelopmentRegion</key>
@@ -7,22 +7,20 @@ Steam++是一款开源的跨平台Steam工具箱，请不要在非官方渠道


 ## 2.6.2更新内容
-
+微软商店版本在微软商店检查获取更新即可，一般会比桌面版晚上一天的审核时间。
 ### 版本亮点
-1. 新增 Android x86 架构包，适用于 Intel、AMD 芯片的设备或虚拟机
-2. ASF 升级至 **V5.2.0.10**
-3. 新增 ASF 控制台字体大小最大行数设置项
-4. 新增 Steam 下载完成定时关机、睡眠功能
-5. 新增 代理设置可自定义 DNS
-6. 新增 ASF 编辑/移除 Bot 功能
-7. 新增 Android ASF 本地挂卡功能 (Beta)
-8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.2** 之后可用)
-9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.2** 之后可用)
-10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.2** 之后可用)
-11. 优化 Desktop 加速代理性能
-12. 优化 Desktop 脚本注入打包的性能
-13. 优化 Desktop 已安装游戏加载性能
-15. 从此版本开始将使用 Github Action 自动化部署发布
+1. ASF 升级至 **V5.2.0.10**
+2. 新增 ASF 控制台字体大小、最大行数设置项
+3. 新增 Steam 下载完成定时关机、睡眠功能
+4. 新增 代理设置可自定义 DNS
+5. 新增 ASF 编辑/移除 Bot 功能
+6. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.2** 之后可用)
+7. 新增 Uplay 相关加速服务 (需要升级到 **2.6.2** 之后可用)
+8. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.2** 之后可用)
+9. 优化 Desktop 加速代理性能
+10. 优化 Desktop 脚本注入打包的性能
+11. 优化 Desktop 已安装游戏加载性能
+12. 从此版本开始将使用 Github Action 自动化部署发布

 ### 修复问题
 1. 改进 Desktop 网络加速现默认使用阿里 DNS(223.5.5.5, 223.6.6.6)
@@ -33,54 +31,21 @@ Steam++是一款开源的跨平台Steam工具箱，请不要在非官方渠道
 6. 修复 Windows Hosts 只读时尝试取消只读属性的操作没有正确执行
 7. 修复 Windows 此软件自动更新删除更新包缓存时因文件占用引发的中断
 8. 修复 Desktop 高 DPI 下动态桌面错位
-9. 改进 Android UI
-10. 改进 Android 冷启动速度
-11. 改进 Android 导入令牌成功后回到列表页
-12. 修复 Android 屏幕捕获设置项不生效
-13. 修复 Android 令牌列表有时不显示值
-14. 修复 本地令牌确认交易在登录时可能会卡住
-15. 修复 Windows 启用动态桌面后全屏可能导致窗口冻结无法操作
-16. 修复 Windows 动态背景有时会被其他窗口遮挡
-17. 改进 本地令牌 登录验证码无法加载时可点击在浏览器中查看验证码图片
-18. 修复 Desktop 加速代理中可能出现的一些错误
-19. 改进 Desktop 令牌详情 UI
-20. 改进 Desktop 账号切换中的用户名信息现在默认隐藏
-21. 修复 Android 确认交易 全选/全不选 复选框勾选时逻辑不正确执行
-22. 改进 Desktop 深色模式与浅色模式的视觉效果
-23. 修复 Pixiv 加速不能登录的问题
-24. 修复 Twitch 加速不计算掉宝进度的问题
-25. 修复 Discord 加速检测更新失败导致无法启动客户端的问题
-26. 修复 Windows 因添加 JumpList 时可能导致的闪退 
+9. 修复 本地令牌确认交易在登录时可能会卡住
+10. 修复 Windows 启用动态桌面后全屏可能导致窗口冻结无法操作
+11. 修复 Windows 动态背景有时会被其他窗口遮挡
+12. 改进 本地令牌 登录验证码无法加载时可点击在浏览器中查看验证码图片
+13. 修复 Desktop 加速代理中可能出现的一些错误
+14. 改进 Desktop 令牌详情 UI
+15. 改进 Desktop 账号切换中的用户名信息现在默认隐藏
+16. 改进 Desktop 深色模式与浅色模式的视觉效果
+17. 修复 Pixiv 加速不能登录的问题
+18. 修复 Twitch 加速不计算掉宝进度的问题
+19. 修复 Discord 加速检测更新失败导致无法启动客户端的问题
+20. 修复 Windows 因添加 JumpList 时可能导致的闪退 
+21. 修复 Desktop 本地令牌 点击锁定后输入密码按回车解锁会循环无限触发锁定的问题


-### 已知问题
- 除 Windows 之外的平台此软件自动更新尚不可用
- Desktop 
-	- macOS
-		- [尚未公证](https://support.apple.com/zh-cn/guide/mac-help/mh40616/10.15/mac/10.15)，这会影响 macOS Catalina（版本 10.15）以上版本
-	- Linux
-		- 系统代理模式加速有部分网站无法访问
-	- Windows
-		- Windows 11 
-			- 在 CPU 不受支持的 Win11 上无法启动，Windows 日志中显示 ```Failed to create CoreCLR, HRESULT: 0x80004005```
-			- 仅 .NET 6.0 受此影响，在几周后的 Insider 中会修复，见 [issue](https://github.com/dotnet/core/issues/6733)
-			- **解决方案：** 可尝试使用旧版本 例如 v2.3.0
-		- Windows 7
-			- 先决条件
-				- 需要安装 Extended Security Update
-			- 在不符合先决条件的情况下运行可能导致
-				- 程序无法正常运行
-				- 运行程序时提示 计算机中丢失 api-ms-win-core-winrt-l1-1-0.dll
-			- **解决方案**
-				- 因 [Windows 7 延长结束日期](https://support.microsoft.com/zh-cn/windows/windows-7-%E6%94%AF%E6%8C%81%E4%BA%8E-2020-%E5%B9%B4-1-%E6%9C%88-14-%E6%97%A5%E7%BB%88%E6%AD%A2-b75d4580-2cc7-895a-2c9c-1466d9a53962)以于 2020 年 1 月 14 日结束支持
-					- 所以必须安装 [Extended Security Update](https://docs.microsoft.com/zh-cn/troubleshoot/windows-client/windows-7-eos-faq/windows-7-extended-security-updates-faq) 支持，在安装第三年的补丁后[结束支持日期](https://docs.microsoft.com/zh-cn/lifecycle/products/windows-7)可延长至 2023 年 1 月 10 日
-					- 可安装 *第三方* 补丁整合包例如 **[UpdatePack7R2](https://cn.bing.com/search?q=UpdatePack7R2)** *或* 购买官方 ESU 产品密钥 解决
-				- 下载 api-ms-win-core-winrt-l1-1-0.dll 文件放入程序根目录(Steam++.exe 所在文件夹)
-					- [从 Github 上直接下载](https://github.com/BeyondDimension/SteamTools/raw/develop/references/runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/api-ms-win-core-winrt-l1-1-0.dll)
-					- [从 Gitee 上直接下载](https://gitee.com/rmbgame/SteamTools/raw/develop/references/runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/api-ms-win-core-winrt-l1-1-0.dll)
-					- [从 NuGet 上下载后提取](https://www.nuget.org/api/v2/package/runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/1.0.1)
-						- .nupkg 文件可使用解压工具打开或解压，找到此文件复制即可
-
 [![steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net)
 [![Steam++ v2.6.2](https://img.shields.io/badge/Steam++-v2.6.2-brightgreen.svg?style=flat-square&color=512bd4)]()

@@ -178,6 +143,7 @@ ios-arm64 | ❌ |
 > [官网](https://steampp.net/)
 > [Github](https://github.com/rmbadmin/SteamTools/releases)
 > [Gitee](https://gitee.com/rmbgame/SteamTools/releases)
+> [Microsoft Store](https://www.microsoft.com/store/productId/9MTCFHS560NG)
 > 分流下载：
 > [hide]
 > [蓝奏云](https://cliencer.lanzoux.com/b0165duja)
@@ -6,9 +6,9 @@
 5. 新增 代理设置可自定义 DNS
 6. 新增 ASF 编辑/移除 Bot 功能
 7. 新增 Android ASF 本地挂卡功能 (Beta)
-8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.2** 之后可用)
-9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.2** 之后可用)
-10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.2** 之后可用)
+8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.3** 之后可用)
+9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.3** 之后可用)
+10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.3** 之后可用)
 11. 优化 Desktop 加速代理性能
 12. 优化 Desktop 脚本注入打包的性能
 13. 优化 Desktop 已安装游戏加载性能
@@ -76,7 +76,7 @@
 						- .nupkg 文件可使用解压工具打开或解压，找到此文件复制即可

 [![steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net)
-[![Steam++ v2.6.2](https://img.shields.io/badge/Steam++-v2.6.2-brightgreen.svg?style=flat-square&color=512bd4)]()
+[![Steam++ v2.6.3](https://img.shields.io/badge/Steam++-v2.6.3-brightgreen.svg?style=flat-square&color=512bd4)]()
  
  
 ##### [不知道该下载哪个文件?](./download-guide.md)
@@ -85,23 +85,23 @@
 ### 文件校验
 |  File  | Checksum (SHA256)  |
 |  ----  |  ----  |
-| Steam++_win_x64_v2.6.2.7z  | SHA256 |
-| Steam++_win_x64_fde_v2.6.2.7z  | SHA256 |
+| Steam++_win_x64_v2.6.3.7z  | SHA256 |
+| Steam++_win_x64_fde_v2.6.3.7z  | SHA256 |
 | | |
-| Steam++_win_x64_v2.6.2.exe  | SHA256 |
-| Steam++_win_x64_fde_v2.6.2.exe  | SHA256 |
+| Steam++_win_x64_v2.6.3.exe  | SHA256 |
+| Steam++_win_x64_fde_v2.6.3.exe  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.2.7z  | SHA256 |
-| Steam++_linux_arm64_v2.6.2.7z  | SHA256 |
+| Steam++_linux_x64_v2.6.3.7z  | SHA256 |
+| Steam++_linux_arm64_v2.6.3.7z  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.2.deb  | SHA256 |
-| Steam++_linux_arm64_v2.6.2.deb  | SHA256 |
+| Steam++_linux_x64_v2.6.3.deb  | SHA256 |
+| Steam++_linux_arm64_v2.6.3.deb  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.2.rpm  | SHA256 |
-| Steam++_linux_arm64_v2.6.2.rpm  | SHA256 |
+| Steam++_linux_x64_v2.6.3.rpm  | SHA256 |
+| Steam++_linux_arm64_v2.6.3.rpm  | SHA256 |
 | | |
-| Steam++_macos_x64_v2.6.2.dmg  | SHA256 |
+| Steam++_macos_x64_v2.6.3.dmg  | SHA256 |
 | | |
-| Steam++_android_arm64_v8a_v2.6.2.apk  | SHA256 |
-| Steam++_android_armeabi_v7a_v2.6.2.apk  | SHA256 |
-| Steam++_android_x86_v2.6.2.apk  | SHA256 |
+| Steam++_android_arm64_v8a_v2.6.3.apk  | SHA256 |
+| Steam++_android_armeabi_v7a_v2.6.3.apk  | SHA256 |
+| Steam++_android_x86_v2.6.3.apk  | SHA256 |
@@ -12,7 +12,7 @@ namespace System.Properties
        ///   <item> macOS：\packaging\build-osx-app.sh &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
        /// </list>
        /// </summary>
-        public const string Version = "2.6.2";
+        public const string Version = "2.6.3";

        //public const string InfoVersion = Version + "-beta";
    }
@@ -136,9 +136,9 @@
    <PackageReference Include="Xamarin.Google.MLKit.BarcodeScanning" />
  </ItemGroup>

-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
+  <!--<ItemGroup Condition="'$(Configuration)'=='Debug'">
    <PackageReference Include="LeakCanaryBinding" />
-  </ItemGroup>
+  </ItemGroup>-->

  <ItemGroup>
    <ProjectReference Include="..\ST.Client.XamarinForms\ST.Client.XamarinForms.csproj" />
@@ -10,7 +10,7 @@
  <Identity
    Name="4651ED44255E.47979655102CE"
    Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-    Version="2.6.2.0" />
+    Version="2.6.3.0" />

  <Properties>
    <DisplayName>Steam++</DisplayName>
@@ -15,6 +15,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>true</PublishSingleFile>
    <PublishTrimmed>false</PublishTrimmed>
    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -15,6 +15,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>true</PublishSingleFile>
    <PublishTrimmed>false</PublishTrimmed>
    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -15,6 +15,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>true</PublishSingleFile>
    <PublishTrimmed>false</PublishTrimmed>
    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -15,6 +15,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>true</PublishSingleFile>
    <PublishTrimmed>false</PublishTrimmed>
    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -15,6 +15,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>true</PublishSingleFile>
    <PublishTrimmed>false</PublishTrimmed>
    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -15,6 +15,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishSingleFile>true</PublishSingleFile>
    <PublishTrimmed>false</PublishTrimmed>
    <EnableCompressionInSingleFile>false</EnableCompressionInSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -19,7 +19,7 @@

  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <!--目前裁剪存在问题，禁用-->
    <PublishTrimmed>false</PublishTrimmed>
    <TrimMode>link</TrimMode>
@@ -20,6 +20,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <!--“GenerateBundle”任务意外失败。-->
    <!--System.IO.IOException: 文件“bin\Release\Publish\win-x64\Steam++.exe”正由另一进程使用，因此该进程无法访问此文件。-->
    <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -14,7 +14,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net6.0</TargetFramework>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
  </PropertyGroup>
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net6.0</TargetFramework>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
  </PropertyGroup>
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net6.0</TargetFramework>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
  </PropertyGroup>
@@ -20,6 +20,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <!--“GenerateBundle”任务意外失败。-->
    <!--System.IO.IOException: 文件“bin\Release\Publish\win-x64\Steam++.exe”正由另一进程使用，因此该进程无法访问此文件。-->
    <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -20,6 +20,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <!--“GenerateBundle”任务意外失败。-->
    <!--System.IO.IOException: 文件“bin\Release\Publish\win-x64\Steam++.exe”正由另一进程使用，因此该进程无法访问此文件。-->
    <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -14,7 +14,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net6.0</TargetFramework>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
  </PropertyGroup>
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net6.0</TargetFramework>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
  </PropertyGroup>
@@ -13,7 +13,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <TargetFramework>net6.0</TargetFramework>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
  </PropertyGroup>
@@ -20,6 +20,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <!--“GenerateBundle”任务意外失败。-->
    <!--System.IO.IOException: 文件“bin\Release\Publish\win-x64\Steam++.exe”正由另一进程使用，因此该进程无法访问此文件。-->
    <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
  </PropertyGroup>
 </Project>
@@ -159,7 +159,8 @@
                          <Setter Property="VerticalAlignment" Value="Center"/>
                        </Style>
                      </DockPanel.Styles>
-                      <WrapPanel DockPanel.Dock="Left"
+                      <StackPanel DockPanel.Dock="Left"
+                                  Orientation="Horizontal"
                                 VerticalAlignment="Center">
                        <Ellipse
                                x:Name="circle"
@@ -201,7 +202,7 @@
                                   Margin="5 0 0 0"
                                   Text="{Binding .,Converter={StaticResource BotStatusConverter}}
                                     StringFormat={}{0}"/>
-                      </WrapPanel>
+                      </StackPanel>

                      <RelativePanel DockPanel.Dock="Right"
                                 VerticalAlignment="Center"
@@ -264,19 +265,19 @@
                              CommandParameter="{Binding}">
                        <PathIcon Data="{StaticResource SettingsDrawing}" />
                      </Button>
-                      
+
                      <Button VerticalAlignment="Center"
                              Command="{ReflectionBinding #u.DataContext.EditBotFile}"
                              CommandParameter="{Binding}"
                              ToolTip.Tip="{ReflectionBinding Path=Res.Edit,Mode=OneWay,Source={x:Static resx:R.Current}}">
                        <PathIcon Data="{StaticResource CodeDrawing}" />
                      </Button>
-                      
+
                      <Button ToolTip.Tip="{ReflectionBinding Path=Res.ASF_Enable,Mode=OneWay,Source={x:Static resx:R.Current}}"
                              IsVisible="{Binding !KeepRunning}"
                              Command="{ReflectionBinding #u.DataContext.EnableOrDisableBot}"
                              CommandParameter="{Binding}">
-                        <PathIcon Data="{StaticResource ShutdownDrawing}" 
+                        <PathIcon Data="{StaticResource ShutdownDrawing}"
                                  Foreground="#00FF7F"/>
                      </Button>

@@ -12,10 +12,13 @@
        UseLayoutRounding="True"
        WindowStartupLocation="CenterScreen"
        SizeToContent="WidthAndHeight"
-        MinWidth="450" MinHeight="50"
-        MaxWidth="900" MaxHeight="600"
+        MinWidth="450"
+        MinHeight="50"
+        MaxWidth="900"
+        MaxHeight="600"
        ShowInTaskbar="False"
-        Padding="0" Background="Transparent"
+        Padding="0"
+        Background="{x:Null}"
        ExtendClientAreaTitleBarHeightHint="30"
        CanResize="False"
        Title="{Binding Title}"
@@ -26,41 +29,52 @@
      <Setter Property="Title" Value="MessageBox"/>
    </Style>
  </Design.DesignStyle>
-  <Grid RowDefinitions="1,30,*,Auto,1">
-    <controls:TitleBar Grid.RowSpan="5"></controls:TitleBar>
-    <StackPanel Margin="12 10 12 5" Grid.Row="2" x:Name="content">
-      <DockPanel>
-        <TextBlock Text="{Binding Content}" MaxWidth="500"
-                   Margin="12,0" FontSize="14"
+  <Panel>
+    <controls:TitleBar />
+    <DockPanel Margin="{StaticResource TitleBarAfterMargin}">
+      <ScrollViewer Padding="12 0 12 0"
+                    DockPanel.Dock="Top"
+                    HorizontalScrollBarVisibility="Disabled"
+                    VerticalScrollBarVisibility="Auto"
+                    MaxHeight="500"
+                    MaxWidth="900"
+                    Grid.Row="2"
+                    x:Name="content">
+        <StackPanel>
+          <TextBox Classes="Content readonlybox"
+                   IsReadOnly="True"
+                   Text="{Binding Content}"
+                   FontSize="14"
                   HorizontalAlignment="Left"
                   TextWrapping="WrapWithOverflow"
                   VerticalAlignment="Center"/>
+        </StackPanel>
+      </ScrollViewer>
+      <DockPanel Grid.Row="3"
+                 DockPanel.Dock="Bottom"
+                 Margin="10 0">
+        <Border DockPanel.Dock="Top">
+          <Separator Classes="Separator"/>
+        </Border>
+        <CheckBox
+                  IsVisible="{Binding IsShowRememberChoose}"
+                  Margin="10 0 0 0"
+                  IsChecked="{Binding RememberChoose}"
+                  Content="{ReflectionBinding Path=Res.RememberChooseNotToAskAgain,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+        <WrapPanel  Grid.Row="3" Margin="0 6"
+             HorizontalAlignment="Right">
+          <WrapPanel.Styles>
+            <Style Selector="Button">
+              <Setter Property="MinWidth" Value="100"></Setter>
+              <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+              <Setter Property="Margin" Value="6"></Setter>
+              <Setter Property="IsDefault" Value="True"></Setter>
+            </Style>
+          </WrapPanel.Styles>
+          <Button Content="{ReflectionBinding Path=Res.Confirm,Mode=OneWay,Source={x:Static resx:R.Current}}" Command="{Binding OK}"></Button>
+          <Button Content="{ReflectionBinding Path=Res.Cancel,Mode=OneWay,Source={x:Static resx:R.Current}}" Command="{Binding Cancel}" IsVisible="{Binding IsCancelcBtn}"></Button>
+        </WrapPanel>
      </DockPanel>
-
-      <Border Margin="0 15 0 0">
-        <Separator Classes="Separator"/>
-      </Border>
-    </StackPanel>
-    <DockPanel Grid.Row="3"
-               Margin="10,0,10,0">
-      <CheckBox
-                IsVisible="{Binding IsShowRememberChoose}"
-                Margin="10 0 0 0"
-                IsChecked="{Binding RememberChoose}"
-                Content="{ReflectionBinding Path=Res.RememberChooseNotToAskAgain,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
-      <WrapPanel  Grid.Row="3"
-           HorizontalAlignment="Right">
-        <WrapPanel.Styles>
-          <Style Selector="Button">
-            <Setter Property="MinWidth" Value="100"></Setter>
-            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
-            <Setter Property="Margin" Value="6"></Setter>
-            <Setter Property="IsDefault" Value="True"></Setter>
-          </Style>
-        </WrapPanel.Styles>
-        <Button Content="{ReflectionBinding Path=Res.Confirm,Mode=OneWay,Source={x:Static resx:R.Current}}" Command="{Binding OK}"></Button>
-        <Button Content="{ReflectionBinding Path=Res.Cancel,Mode=OneWay,Source={x:Static resx:R.Current}}" Command="{Binding Cancel}" IsVisible="{Binding IsCancelcBtn}"></Button>
-      </WrapPanel>
    </DockPanel>
-  </Grid>
+  </Panel>
 </Window>
@@ -21,6 +21,7 @@ namespace System.Application.UI.Views.Windows
            //}
            InitializeComponent();
            ExtendClientAreaChromeHints = Avalonia.Platform.ExtendClientAreaChromeHints.NoChrome;
+            // https://github.com/AvaloniaUI/Avalonia/issues/3422

 #if DEBUG
            this.AttachDevTools();
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="2.6.2" package="net.steampp.app" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="2.6.3" package="net.steampp.app" android:installLocation="auto">
  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
  <application android:fullBackupContent="@xml/auto_backup_rules"></application>
  <!-- Required for API Level 30 to make sure the app can detect browsers and other apps where communication is needed.-->
@@ -52,14 +52,14 @@
    <WarningLevel>4</WarningLevel>
    <AndroidManagedSymbols>true</AndroidManagedSymbols>
    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <BundleAssemblies>true</BundleAssemblies>
+    <BundleAssemblies>false</BundleAssemblies>
    <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
-    <AotAssemblies>true</AotAssemblies>
-    <EnableLLVM>true</EnableLLVM>
-    <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
    <AndroidLinkMode>None</AndroidLinkMode>
    <MandroidI18n />
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
+    <AndroidSupportedAbis>armeabi-v7a;x86_64;arm64-v8a</AndroidSupportedAbis>
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
  </PropertyGroup>
  <ItemGroup>
@@ -63,6 +63,10 @@ namespace System.Application.Services
        /// </summary>
        void OnExitRestoreHosts();

+        /// <summary>
+        /// 获取当前 hosts 文件是否包含修改过的标签，注意：产生异常时也将返回 <see langword="false"/>，并 <see cref="Toast"/> 显示 <see cref="Exception"/>
+        /// </summary>
+        /// <returns></returns>
        bool ContainsHostsByTag();

        enum EncodingType : byte
@@ -619,16 +619,24 @@ namespace System.Application.Services.Implementation

        public bool ContainsHostsByTag()
        {
-            var filePath = s.HostsFilePath;
-            var fileInfo = new FileInfo(filePath);
-            if (fileInfo.Exists && fileInfo.Length <= MaxFileLength)
+            try
            {
-                var lines = File.ReadAllLines(filePath, GetEncoding());
-                if (lines.Reverse().Any(x => x.StartsWith(MarkEnd)))
+                var filePath = s.HostsFilePath;
+                var fileInfo = new FileInfo(filePath);
+                if (fileInfo.Exists && fileInfo.Length <= MaxFileLength)
                {
-                    return true;
+                    var lines = File.ReadAllLines(filePath, GetEncoding());
+                    if (lines.Reverse().Any(x => x.StartsWith(MarkEnd)))
+                    {
+                        return true;
+                    }
                }
            }
+            catch (Exception ex)
+            {
+                Log.Error(TAG, ex, "ContainsHostsByTag fail.");
+                Toast.Show(AppResources.OperationHostsError_.Format(ex.GetAllMessage()));
+            }
            return false;
        }

@@ -122,13 +122,13 @@ namespace System.Application.Services
                                                var h = host.Split(' ');
                                                return KeyValuePair.Create(h[1], h[0]);
                                            }
-                                            return KeyValuePair.Create(host, IPAddress.Loopback.ToString());
+                                            return KeyValuePair.Create(host, httpProxyService.ProxyIp.ToString());
                                        });
                                    }).ToDictionaryIgnoreRepeat(x => x.Key, y => y.Value);

                                    if (httpProxyService.IsEnableScript)
                                    {
-                                        hosts.TryAdd(IHttpProxyService.LocalDomain, IPAddress.Loopback.ToString());
+                                        hosts.TryAdd(IHttpProxyService.LocalDomain, httpProxyService.ProxyIp.ToString());
                                    }

                                    var r = hostsFileService.UpdateHosts(hosts);
@@ -120,6 +120,8 @@ namespace System.Application.UI.ViewModels
            @string.AppendFormatLine("response.Version: {0}", response.Version);
            @string.AppendLine(htmlString);
            DebugString = @string.ToString();
+            var r = await MessageBox.ShowAsync(DebugString);
+            Toast.Show(r.ToString());
        }

        //static async void TestTextBoxWindow(int state)
@@ -308,7 +308,11 @@ namespace System.Application.UI.ViewModels
        {
            try
            {
-                if (GameLibrarySettings.AFKAppList.Value != null && !GameLibrarySettings.AFKAppList.Value.ContainsKey(app.AppId))
+                if (GameLibrarySettings.AFKAppList.Value == null)
+                {
+                    GameLibrarySettings.AFKAppList.Value = new Dictionary<uint, string?>();
+                }
+                if (!GameLibrarySettings.AFKAppList.Value.ContainsKey(app.AppId))
                {
                    GameLibrarySettings.AFKAppList.Value.Add(app.AppId, app.DisplayName);
                    GameLibrarySettings.AFKAppList.RaiseValueChanged();
@@ -24,7 +24,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <UseSystemResourceKeys>true</UseSystemResourceKeys>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
    <!-- set to true to enable publishing with ready to run native code -->
    <PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2>
    <!-- set to false to use crossgen like in 5.0 -->
@@ -478,6 +478,7 @@ namespace System.Application.Steps
            foreach (var item in publishDirs)
            {
                var install7zFilePath = item.BuildDownloads[AppDownloadType.Compressed_7z].Path;
+                var install7zFileName = Path.GetFileName(install7zFilePath);
                var outputFileName = Path.GetFileNameWithoutExtension(install7zFilePath) + FileEx.EXE;
                var outputFilePath = Path.Combine(new FileInfo(install7zFilePath).DirectoryName!, outputFileName);

@@ -486,6 +487,7 @@ namespace System.Application.Steps
                     .Replace("${{ Steam++_OutPutFileName }}", outputFileName)
                     .Replace("${{ Steam++_AppFileDir }}", appFileDirPath)
                     .Replace("${{ Steam++_7zFilePath }}", install7zFilePath)
+                     .Replace("${{ Steam++_7zFileName }}", install7zFileName)
                     .Replace("${{ Steam++_OutPutFilePath }}", outputFilePath)
                     ;
                File.WriteAllText(nsiFilePath, nsiFileContent2);
@@ -273,10 +273,7 @@ namespace System.Application
                services.TryAddCloudServiceClient<CloudServiceClient>(c =>
                {
 #if NETCOREAPP3_0_OR_GREATER
-                    c.DefaultRequestVersion = HttpVersion.Version20;
-#endif
-#if NET5_0_OR_GREATER
-                    c.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
+                    c.DefaultRequestVersion = HttpVersion.Version30;
 #endif
                }, configureHandler:
 #if NETCOREAPP2_1_OR_GREATER
Author	SHA1	Message	Date
Aigio L	32a8d35c91	Merge pull request #779 from BeyondDimension/develop v2.6.3	2021-12-12 17:42:31 +08:00
Aigio Liu	796b7f7622	改进 MessageBoxWindow Style	2021-12-12 11:39:41 +08:00
RMBGAME	e7f989627c	fix MsgBox	2021-12-12 01:49:22 +08:00
Aigio Liu	2627d51af4	MessageBox test	2021-12-12 00:06:26 +08:00
RMBGAME	31100b2bac	add MessageBox Scroll	2021-12-11 23:58:03 +08:00
Aigio Liu	f283e87289	fix asf tfm error	2021-12-11 23:17:24 +08:00
Aigio L	dc5e700907	Merge pull request #775 from BeyondDimension/develop v2.6.3	2021-12-11 23:02:00 +08:00
Aigio Liu	44e5bdb895	fix 由于其他程序(例如雷神加速器)占用 hosts 导致关闭加速或退出时闪退 & v2.6.3	2021-12-11 22:54:52 +08:00
RMBGAME	879cda38fa	fix high DPI ASFBot Page UI error	2021-12-11 22:44:19 +08:00
Aigio Liu	dea356eee1	fix PubTool lost 7zFileName	2021-12-11 21:36:30 +08:00
Aigio Liu	1182677aca	Disable AOT	2021-12-11 21:02:15 +08:00
RMBGAME	8891a4658e	fix AFKList null add ex	2021-12-11 18:58:56 +08:00
Aigio Liu	d522ec4523	HTTP/1.1 支持	2021-12-11 18:26:15 +08:00
Aigio Liu	94bb65732e	HTTP/1.1 支持	2021-12-11 18:25:01 +08:00