🚧 测试请求指定网页连接

* ✨ 添加网络测试服务 NetworkTestService

* 🚧 清理日志

* ✨ 添加dns 测试

* ⚡️ 添加 DNS Over Https 测试方式, 调整 DNS解析格式

.github/workflows/CI.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Checkout repository
 #        if: ${{ matrix.os != 'aigio-win10ltsc-vm' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           submodules: recursive
@@ -62,25 +62,25 @@ jobs:
 #        run: dotnet workload install wasm-tools
 
       - name: Restore Workload
-        run: dotnet workload restore
+        run: dotnet workload restore src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj
 
       - name: Verify dotnet info
         run: dotnet --info
 
       - name: Build BD.WTTS.Client.AppHost
-        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Plugins.Accelerator.ReverseProxy
-        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Avalonia.App
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Build BD.WTTS.Client.Avalonia.Designer.HostApp
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - name: Test
-        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q /property:WarningLevel=1 
+        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
 #  release:
 #    name: Release

.github/workflows/dotnet.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
         submodules: recursive
@@ -63,7 +63,7 @@ jobs:
 
     - name: Checkout Credentials repository
       if: ${{ matrix.os == 'windows-latest' && !startsWith(github.ref, 'refs/tags/') && github.event_name == 'push' }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: SteamTools-Team/Credentials
         token: ${{ secrets.REPO_TOKEN }}

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
         submodules: recursive
@@ -65,7 +65,7 @@ jobs:
       
     - name: Checkout NSIS-Build repository
       if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: SteamTools-Team/NSIS-Build
         token: ${{ secrets.REPO_TOKEN }}
@@ -73,7 +73,7 @@ jobs:
 
     - name: Checkout Credentials repository
       if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: SteamTools-Team/Credentials
         token: ${{ secrets.REPO_TOKEN }}
@@ -315,7 +315,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
         submodules: recursive
@@ -365,7 +365,7 @@ jobs:
 
     - name: Checkout Credentials repository
       if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: SteamTools-Team/Credentials
         token: ${{ secrets.REPO_TOKEN }}

.github/workflows/xamarin.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
         submodules: recursive

README.md

@@ -5,7 +5,7 @@
 [English](./README.en.md) | 简体中文
 
 「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。
-
+ 
 ![Release Download](https://img.shields.io/github/downloads/BeyondDimension/SteamTools/total?style=flat-square)
 [![Release Version](https://img.shields.io/github/v/release/BeyondDimension/SteamTools?style=flat-square)](https://github.com/BeyondDimension/SteamTools/releases/latest)
 [![GitHub license](https://img.shields.io/github/license/BeyondDimension/SteamTools?style=flat-square)](LICENSE)
@@ -30,6 +30,7 @@
 </div>
 
 ## 🚀 下载渠道
+- [![Steam 商店](./res/brands/steam.jpg)](https://store.steampowered.com/app/2425030)
 - [![Microsoft 应用商店](./res/brands/msstore.en.png)](https://apps.microsoft.com/store/detail/watt-toolkit/9MTCFHS560NG?hl=zh-cn&gl=cn)
 - [软件官网](https://steampp.net)
 - [GitHub 发行版](https://github.com/BeyondDimension/SteamTools/releases)
@@ -41,22 +42,23 @@
 详见 [./doc/download-guide.md](./doc/download-guide.md)  
 
 ## ✨ 功能
+全新的 3.0 版本，支持自定义插件功能，以下功能为下载时自带的默认插件，可以自行删除或禁用。
 1. 网络加速 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
-    - ~~使用 [Titanium-Web-Proxy](https://github.com/justcoding121/Titanium-Web-Proxy) 开源项目进行本地反代来支持更快的访问游戏网站。~~
 	- 使用 [YARP.ReverseProxy](https://github.com/microsoft/reverse-proxy) 开源项目进行本地反代来支持更快的访问游戏网站。
-2. 脚本配置 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
 	- 通过加速服务拦截网络请求将一些 JS 脚本注入在网页中，提供类似网页插件的功能。
 3. 账号切换 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
-	- 一键切换已在当前 PC 上登录过的 Steam 账号，与管理家庭共享库排序及禁用等功能。
-4. 库存管理 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
-	- 让您直接管理 Steam 游戏库存，可以编辑游戏名称和[自定义封面](https://www.steamgriddb.com)，也能解锁以及反解锁 Steam 游戏成就。
+	- 快速切换已在当前 PC 上登录过的 Steam、Epic、Uplay 等等多平台账号，与管理 Steam 家庭共享库排序及禁用等功能。
+4. 库存游戏 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
+	- 直接管理你的 Steam 游戏库存，可以编辑游戏名称和[自定义封面](https://www.steamgriddb.com)。
 	- 监控 Steam 游戏下载进度实现 Steam 游戏下载完成定时关机功能。
-	- 模拟运行 Steam 游戏，让您不用安装和下载对应的游戏也能挂游玩时间和 Steam 卡片
-	- 自助管理 Steam 游戏云存档，随时删除和上传自定义的存档文件至 Steam 云
+	- 模拟运行 Steam 游戏，让您不用安装和下载对应的游戏也能挂游玩时间和掉落 Steam 卡片
+	- 自助管理 Steam 游戏云存档，随时删除和上传自定义的存档文件至 Steam 云。
+	- 解锁以及反解锁 Steam 游戏成就。
 5. 本地令牌 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
-	- 让您的手机令牌统一保存在电脑中，目前仅支持 Steam 令牌，后续会开发支持更多的令牌种类与云同步令牌。
-6. 自动挂卡 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
-	- 集成 [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm) 在应用内提供 挂机掉落 Steam 集换式卡牌 等功能。
+	- 让您的手机令牌统一保存在电脑中、支持通用HOTP、TOTP、Steam、Google 等令牌导入。
+	- 支持 Steam 登录账号自定绑定生成令牌、支持 Steam 批量确认交易功能。
+6. ~~自动挂卡(新版本开发中)~~ <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
+	- ~~集成 [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm) 在应用内提供 挂机掉落 Steam 集换式卡牌 等功能。~~
 7. 游戏工具 <img src="./res/brands/windows.svg" width="16" height="16" />
 	- 强制游戏窗口使用无边框窗口化、更多功能待开发。
 
@@ -74,8 +76,12 @@
 ## 🧩 截图
 <img src="./res/screenshots/screenshot-windows-accelerator.webp" width="800" />
 <br/>
+<img src="./res/screenshots/screenshot-windows-gameaccount.webp" width="800" />
 <br/>
-<img src="./res/screenshots/screenshot-android-authenticator.png" width="800" />
+<img src="./res/screenshots/screenshot-windows-gamelist.webp" width="800" />
+<br/>
+<br/>
+<!--<img src="./res/screenshots/screenshot-android-authenticator.png" width="800" />-->
 
 ## 从移动端 Steam App 导入令牌指南
 - [Android 添加本地令牌（Xposed）](https://github.com/BeyondDimension/SteamTools/issues/2276)

build/linux/Steam++.sh

@@ -5,12 +5,13 @@ dotnet_exec="$dotnet_path/dotnet"
 export DOTNET_ROOT="$dotnet_path"
 link_exec="$run_path/Steam++"
 # 判断符号链接是否存在
-if [ ! -L "$link_exec" ]; then
+if [ -L "$link_exec" ]; then
+    echo "符号链接 $link_exec 已存在"
+else
+    rm -rf "$link_exec"  2>/dev/null
     echo "创建符号链接 $dotnet_exec 到 $link_exec"
     ln -s "$dotnet_exec" "$link_exec"
     chmod +x "$link_exec"
-else
-    echo "符号链接 $link_exec 已存在"
 fi
 "$link_exec" "$run_path/assemblies/Steam++.dll" "$@"
 exit

build/linux/environment_check.sh

@@ -40,14 +40,14 @@ else
         fi
     }
     certutil_Init() {
-        certutil -d sql:$HOME/.pki/nssdb -L
+        certutil -d $HOME/.pki/nssdb -L
         ret=$?
         if [ $ret -ne 0 ]; then
-            echo "即将初始化 certutil sql:\$HOME/.pki/nssdb"
-            mkdir -p sql:$HOME/.pki
-            mkdir -p sql:$HOME/.pki/nssdb
-            chmod 700 sql:$HOME/.pki/nssdb
-            certutil -d sql:$HOME/.pki/nssdb -N --empty-password
+            echo "即将初始化 certutil \$HOME/.pki/nssdb"
+            mkdir -p $HOME/.pki
+            mkdir -p $HOME/.pki/nssdb
+            chmod 700 $HOME/.pki/nssdb
+            certutil -d $HOME/.pki/nssdb -N --empty-password
         else
             echo "certutil nssdb 正常"
         fi

build/linux/init_desktop.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#添加桌面文件
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
+exec_name="Steam++"
+rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
+echo "#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Watt Toolkit
+Exec=$base_path/$exec_name.sh
+Icon=$base_path/Icons/Watt-Toolkit.png
+Terminal=false
+Type=Application
+StartupNotify=false" >"$HOME/Desktop/Watt Toolkit.desktop"
+chmod +x "$HOME/Desktop/Watt Toolkit.desktop"
+exit 0

build/linux/installWattToolkit.desktop

@@ -0,0 +1,8 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=°²×° Watt Toolkit
+Exec=curl https://steampp.net/pkg/latest/steamdeck/install.sh | bash -s --
+Icon=steamdeck-gaming-return
+Terminal=true
+Type=Application
+StartupNotify=false

build/linux/offline_init.sh

@@ -0,0 +1,208 @@
+#!/bin/bash
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
+mkdir -p "$base_path"
+cd "$base_path" || exit 1
+appVer_path="$base_path/WattToolkit.AppVer"
+exec_name="Steam++"
+tar_name="WattToolkit.tgz"
+tar_path="$base_path/$tar_name"
+app_name="Watt Toolkit"
+PROCESS_NAMES=("$exec_name" "$app_name")
+export LC_ALL=en_US.UTF-8
+Install_certutil() {
+    # 判断发行版类型
+    if command -v certutil &>/dev/null; then
+        echo "certutil 工具已安装。"
+    else
+        echo "证书导入以及验证需要使用 certutil 工具。"
+        # 判断包管理器
+        if command -v apt &>/dev/null; then
+            # 使用 apt (Debian/Ubuntu)
+            sudo apt update
+            sudo apt install -y libnss3-tools
+        elif command -v dnf &>/dev/null; then
+            # 使用 dnf (Fedora)
+            sudo dnf install -y nss-tools
+        elif command -v yum &>/dev/null; then
+            # 使用 yum (CentOS/Red Hat)
+            sudo yum install -y nss-tools
+        elif command -v pacman &>/dev/null; then
+            # 使用 pacman (Arch Linux)
+            # sudo pacman -S nss
+            echo "请手动安装 certutil 工具。"
+            exit 1
+        else
+            echo "请手动安装 certutil 工具。"
+            exit 1
+        fi
+        echo "certutil 工具已安装。"
+    fi
+}
+certutil_Init() {
+    certutil -d $HOME/.pki/nssdb -L
+    ret=$?
+    if [ $ret -ne 0 ]; then
+        echo "即将初始化 certutil \$HOME/.pki/nssdb"
+        mkdir -p $HOME/.pki
+        mkdir -p $HOME/.pki/nssdb
+        chmod 700 $HOME/.pki/nssdb
+        certutil -d $HOME/.pki/nssdb -N --empty-password
+    else
+        echo "certutil nssdb 正常"
+    fi
+}
+Install_jq() {
+    # Check if jq is already installed
+    if command -v jq &>/dev/null; then
+        echo "jq 工具已安装。"
+    else
+        echo "jq 用来解析版本更新。"
+        # Check the package manager
+        if command -v apt &>/dev/null; then
+            # Using apt (Debian/Ubuntu)
+            sudo apt update
+            sudo apt install -y jq
+        elif command -v dnf &>/dev/null; then
+            # Using dnf (Fedora)
+            sudo dnf install -y jq
+        elif command -v yum &>/dev/null; then
+            # Using yum (CentOS/Red Hat)
+            sudo yum install -y jq
+        elif command -v pacman &>/dev/null; then
+            # Using pacman (Arch Linux)
+            sudo pacman -S jq
+        else
+            echo "请手动安装 jq 工具。"
+            exit 1
+        fi
+        echo "请手动安装 jq 工具。"
+    fi
+}
+Install_zenity() {
+    # 判断发行版类型
+    if command -v zenity &>/dev/null; then
+        echo "zenity 工具已安装。"
+    else
+        echo "安装过程需要 zenity 工具。"
+        # 判断包管理器
+        if command -v apt &>/dev/null; then
+            # 使用 apt (Debian/Ubuntu)
+            sudo apt update
+            sudo apt install -y zenity
+        elif command -v dnf &>/dev/null; then
+            # 使用 dnf (Fedora)
+            sudo dnf install -y zenity
+        elif command -v yum &>/dev/null; then
+            # 使用 yum (CentOS/Red Hat)
+            sudo yum install -y zenity
+        elif command -v pacman &>/dev/null; then
+            # 使用 pacman (Arch Linux)
+            # sudo pacman -S zenity
+            echo "请手动安装 zenity 工具。"
+            exit 1
+        else
+            echo "请手动安装 zenity 工具。"
+            exit 1
+        fi
+        echo "zenity 工具已安装。"
+    fi
+}
+
+Show_Run() {
+    local param1=$1
+    # 显示提示框，询问是否运行程序
+    zenity --question --text="$1" --width=400
+
+    # 获取上一个命令的退出码
+    response=$?
+
+    if [ $response -eq 0 ]; then
+        echo "程序已启动。"
+        exit 0 &
+        # 用户点击了 "运行" 按钮，启动程序
+        /bin/sh -c "$base_path/$exec_name.sh"
+    else
+        # 用户点击了 "关闭" 按钮，退出脚本
+        exit 0
+    fi
+}
+Kill_Process() {
+    # 尝试的次数
+    Kill_MAX_RETRIES=3
+
+    # 循环尝试终止进程
+    for process_name in "${PROCESS_NAMES[@]}"; do
+        kill_retry=1
+        while [ $kill_retry -le $Kill_MAX_RETRIES ]; do
+            pid=$(pgrep "$process_name")
+            if [ -n "$pid" ]; then
+                echo "尝试 $kill_retry: 进程 $process_name 正在运行中。正在终止..."
+                kill $pid
+                sleep 2
+            else
+                break
+            fi
+            kill_retry=$((kill_retry + 1))
+        done
+    done
+
+    for process_name in "${PROCESS_NAMES[@]}"; do
+        # 检查是否成功终止进程
+        if pgrep -x "$process_name" >/dev/null; then
+            echo "无法终止程序 $process_name。尝试次数已达上限。"
+            exit 1
+        else
+            echo "程序 $process_name 已成功终止。"
+        fi
+    done
+
+}
+Install_certutil
+Install_zenity
+Install_jq
+certutil_Init
+Kill_Process
+
+dotnet_exec="$dotnet_path/dotnet/dotnet"
+if [ -x "$dotnet_exec" ]; then
+    echo "文件具有执行权限。"
+else
+    chmod +x "$dotnet_exec"
+fi
+chmod +x "$base_path/$exec_name.sh"
+# xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
+InitDesktop() {
+    while true; do
+        # 使用 zenity 提示用户选择安装路径或使用默认路径
+        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
+
+        # 检查用户输入
+        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
+            target_dir="$HOME/.local/share/applications/"
+            break
+        elif [ "$choice" == "$HOME/Desktop" ]; then
+            target_dir="$HOME/Desktop/"
+            break
+        else
+            echo "无效选项，请输入 1 或 2。"
+        fi
+    done
+    #添加桌面文件
+    rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
+    echo "#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Watt Toolkit
+Exec=$base_path/$exec_name.sh
+Icon=$base_path/Icons/Watt-Toolkit.png
+Terminal=false
+Type=Application
+StartupNotify=false" >"$target_dir/Watt Toolkit.desktop"
+    chmod +x "$target_dir/Watt Toolkit.desktop"
+
+}
+InitDesktop
+# update-desktop-database ~/.local/share/applications
+#运行程序
+Show_Run "下载安装完成，是否启动程序？"
+exit 0

build/linux/online_install.sh

@@ -1,12 +1,43 @@
 #!/bin/bash
-base_path="$HOME/WattToolkit"
-mkdir -p "$base_path"
-cd "$base_path" || exit 1
+# 设置默认的 base_path 参数
+default_base_path="$HOME/WattToolkit"
+base_path="$default_base_path"
+
+# 循环直到用户输入有效路径或直接回车
+while true; do
+    # 使用 zenity 提示用户选择安装路径或使用默认路径
+    custom_base_path=$(zenity --entry --title="安装路径" --text="请输入安装路径（默认为 $default_base_path，不输入则使用默认路径）")
+
+    # 如果用户提供了自定义路径，则使用该路径
+    if [ -n "$custom_base_path" ]; then
+        base_path="$custom_base_path"
+        break
+    elif [ -z "$custom_base_path" ]; then
+        # 用户直接回车，使用默认路径
+        break
+    else
+        # 用户输入无效路径，重新提示
+        echo "无效路径，请重新输入。"
+    fi
+done
+
+# 创建安装路径
+mkdir -p "$base_path" || {
+    echo "无法创建安装路径 $base_path，请检查权限或路径是否正确。"
+    exit 1
+}
+
+# 切换到安装路径
+cd "$base_path" || {
+    echo "无法切换到安装路径 $base_path，请检查权限或路径是否正确。"
+    exit 1
+}
+
 appVer_path="$base_path/WattToolkit.AppVer"
 exec_name="Steam++"
 tar_name="WattToolkit.tgz"
 tar_path="$base_path/$tar_name"
-base_url="https://steampp.mossimo.net:8800"
+base_url="https://api.steampp.net"
 architecture=1
 app_name="Watt Toolkit"
 PROCESS_NAMES=("$exec_name" "$app_name")
@@ -41,14 +72,14 @@ Install_certutil() {
     fi
 }
 certutil_Init() {
-    certutil -d sql:$HOME/.pki/nssdb -L
+    certutil -d $HOME/.pki/nssdb -L
     ret=$?
     if [ $ret -ne 0 ]; then
-        echo "即将初始化 certutil sql:\$HOME/.pki/nssdb"
-        mkdir -p sql:$HOME/.pki
-        mkdir -p sql:$HOME/.pki/nssdb
-        chmod 700 sql:$HOME/.pki/nssdb
-        certutil -d sql:$HOME/.pki/nssdb -N --empty-password
+        echo "即将初始化 certutil \$HOME/.pki/nssdb"
+        mkdir -p $HOME/.pki
+        mkdir -p $HOME/.pki/nssdb
+        chmod 700 $HOME/.pki/nssdb
+        certutil -d $HOME/.pki/nssdb -N --empty-password
     else
         echo "certutil nssdb 正常"
     fi
@@ -182,7 +213,9 @@ Get_NewVer() {
 
     sleep 1
     #本地版本 Hash
-    o_sha384=$(cat "AppVer")
+    if [ -f "AppVer" ]; then
+        o_sha384=$(cat "AppVer")
+    fi
     if [ -e "AppVer" ]; then
         if [ "${o_sha384,,}" = "${n_sha384,,}" ]; then
             Show_Run "已是最新版本，是否启动程序？"
@@ -326,17 +359,36 @@ Kill_Process
 #解压
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
-#添加桌面文件
-rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
-echo "#!/usr/bin/env xdg-open
+InitDesktop() {
+    while true; do
+        # 使用 zenity 提示用户选择安装路径或使用默认路径
+        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
+
+        # 检查用户输入
+        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
+            target_dir="$HOME/.local/share/applications/"
+            break
+        elif [ "$choice" == "$HOME/Desktop" ]; then
+            target_dir="$HOME/Desktop/"
+            break
+        else
+            echo "无效选项，请输入 1 或 2。"
+        fi
+    done
+    #添加桌面文件
+    rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
+    echo "#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=Watt Toolkit
 Exec=$base_path/$exec_name.sh
 Icon=$base_path/Icons/Watt-Toolkit.png
 Terminal=false
 Type=Application
-StartupNotify=false" >"$HOME/Desktop/Watt Toolkit.desktop"
-chmod +x "$HOME/Desktop/Watt Toolkit.desktop"
+StartupNotify=false" >"$target_dir/Watt Toolkit.desktop"
+    chmod +x "$target_dir/Watt Toolkit.desktop"
+
+}
+InitDesktop
 # update-desktop-database ~/.local/share/applications
 #运行程序
 Show_Run "下载安装完成，是否启动程序？"

build/linux/uninstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-base_path="$HOME/WattToolkit"
-export LC_ALL=en_US.UTF-8
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
 exec_name="Steam++"
 app_name="Watt Toolkit"
 AppData="$XDG_DATA_HOME/Steam++"
@@ -8,7 +8,37 @@ AppData_t="$HOME/.local/share/Steam++"
 Cache="$XDG_CACHE_HOME/Steam++"
 Cache_t="$HOME/.cache/Steam+"
 PROCESS_NAMES=("$exec_name" "$app_name")
+export LC_ALL=en_US.UTF-8
+#检查是否存在 Steam++.sh 避免卸载错误
+file_to_check="$base_path/Steam++.sh"
+folders_to_check=("dotnet" "modules" "native" "script" "assemblies")
+if [ -e "$file_to_check" ]; then
+    echo "文件 $file_to_check 存在"
+else
+    echo "文件 $file_to_check 不存在"
+    exit 1
+fi
 
+for folder in "${folders_to_check[@]}"; do
+    folder_path="$base_path/$folder"
+    if [ -d "$folder_path" ]; then
+        echo "文件夹 $folder_path 存在"
+    else
+        echo "文件夹 $folder_path 不存在"
+        exit 1
+    fi
+done
+echo "验证该文件夹是 $app_name 安装目录，请确认是否卸载。"
+
+read -p "所有文件和文件夹都存在，确认卸载吗？ (输入 'y' 确认): " confirmation
+
+if [ "${confirmation,,}" == "y" ]; then
+    echo "开始执行卸载操作"
+    # 在这里添加您的卸载操作
+else
+    echo "用户取消卸载操作"
+    exit 0
+fi
 Kill_Process() {
     # 尝试的次数
     Kill_MAX_RETRIES=3
@@ -42,19 +72,28 @@ Kill_Process() {
 }
 Kill_Process
 
-zenity --question --text="是否删除用户数据" --width=400
+zenity --question --text="是否删除证书?" --width=400
 # 获取上一个命令的退出码
-response=$?
+delCer=$?
 
-if [ $response -eq 0 ]; then
-    rm -rfq "$AppData" 2>/dev/null
-    rm -rfq "$AppData_t" 2>/dev/null
+if [ $delCer -eq 0 ]; then
+    certutil -D -d $HOME/.pki/nssdb -n "SteamTools"
+fi
+
+zenity --question --text="是否删除用户数据?" --width=400
+# 获取上一个命令的退出码
+delUserData=$?
+
+if [ $delUserData -eq 0 ]; then
+    rm -rf $AppData 2>/dev/null
+    rm -rf $AppData_t 2>/dev/null
+    certutil -D -d $HOME/.pki/nssdb -n "SteamTools"
 else
     echo "保留用户数据方便下次安装。"
     echo "如需删除可手动删除该目录:$AppData 或者 $AppData_t"
 fi
-rm -rfq "$Cache" 2>/dev/null
-rm -rfq "$Cache_t" 2>/dev/null
-rm -rfq "$base_path" 2>/dev/null
-rm -rfq "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
+rm -rf $Cache 2>/dev/null
+rm -rf $Cache_t 2>/dev/null
+rm -rf $base_path 2>/dev/null
+rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
 zenity --info --text="卸载完成!" --width=300

build/macos/build.sh

@@ -10,11 +10,12 @@ Base_Path="/Users/moxiansheng/Documents/GitHub/SteamTools"
 App_Path="$Base_Path/src/BD.WTTS.Client.Avalonia.App"
 Publish_Path="bin/Release/Publish/assemblies"
 Plugins_Release_Path="bin/Release"
-CodesignKey_Name="mossimo CodesignKey"
+CodesignKey_Name="mossimo code"
 App_Modules_Path="$App_Path/$Publish_Path/modules"
 echo "编译主程序"
 cd "$App_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+
 rm -r "$App_Modules_Path"
 mkdir -p "$App_Modules_Path"
 echo "编译插件"
@@ -29,53 +30,67 @@ Copy_Plugins() {
 echo "编译加速插件"
 Plugins_Accelerator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Accelerator"
 cd "$Plugins_Accelerator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
 
 Plugins_Accelerator_ReverseProxy_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy"
 cd "$Plugins_Accelerator_ReverseProxy_Path"
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net8.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     lipo -create "$Publish_Path/arm64/Steam++.Accelerator" "$Publish_Path/x64/Steam++.Accelerator" -output "$Publish_Path/Steam++.Accelerator"
     Copy_Plugins "$Publish_Path" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "arm64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net8.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     Copy_Plugins "$Publish_Path/arm64" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "x64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     Copy_Plugins "$Publish_Path/x64" "Accelerator" "Steam++.Accelerator"
 fi
 
 echo "编译令牌插件"
 Plugins_Authenticator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Authenticator"
 cd "$Plugins_Authenticator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"
 
 echo "编译账户插件"
 Plugins_GameAccount_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameAccount"
 cd "$Plugins_GameAccount_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"
 
 echo "编译游戏库插件"
 Plugins_GameList_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameList"
 cd "$Plugins_GameList_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos  -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"
 
 echo "复制插件到程序目录"
 cd "$App_Path"
 
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/MonoBundle"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/MonoBundle"
 elif [ "$Build_Mode" = "arm64" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-arm64/Steam++.app/Contents/MonoBundle"
-    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/osx-arm64/Steam++.app/Contents/MonoBundle"
+    cp -r "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents"
 elif [ "$Build_Mode" = "x64" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
-    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
+    cp -r "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents"
 fi
+
+echo "代码签名重新手动签名"
+App_Publish_Path="$App_Path/bin/Release/net8.0-macos/Steam++.app"
+# #代码签名重新手动签名
+codesign --remove-signature "$App_Publish_Path"
+codesign --remove-signature "$App_Publish_Path/Contents/MacOS/Steam++"
+dylibs=$(find "$App_Publish_Path/Contents/MonoBundle" -type f -name "*.dylib")
+for dylib in $dylibs; do
+    codesign --remove-signature "$dylib"
+    codesign -f -s "$CodesignKey_Name" "$dylib"
+done
+codesign -f -s   "$CodesignKey_Name" "$App_Publish_Path/Contents/MacOS/Steam++"
+codesign -f -s "$CodesignKey_Name" "$App_Publish_Path"
+sudo xattr -rd com.apple.quarantine "$App_Publish_Path"

build/settings_v4_app.json

@@ -212,6 +212,15 @@
           "Summary": "菜单排序",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "StartDefaultPageName",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "程序启动时默认页",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -487,6 +496,15 @@
           "Summary": "账号平台设置集合",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "IsShowAccountName",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "是否显示账号用户名",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -498,7 +516,7 @@
         {
           "TypeName": "bool",
           "PropertyName": "GameInstalledFilter",
-          "DefaultValue": "true",
+          "DefaultValue": "false",
           "DefaultValueIsConst": true,
           "Summary": "已安装游戏筛选",
           "IsRegionOrEndregion": null,
@@ -943,6 +961,236 @@
         },
         {
           "Sharp": "endif"
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "UseDoh",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": true,
+          "Summary": "启用 DNS over HTTPS",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "CustomDohAddres",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "自定义 DNS over HTTPS 地址",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "AcceleratorTabsSelectedIndex",
+          "DefaultValue": "0",
+          "DefaultValueIsConst": false,
+          "Summary": "加速页面 Tab 选项卡选中下标",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        }
+      ],
+      "Usings": ""
+    },
+    "SteamIdleSettings": {
+      "ClassFilePath": "..\\src\\BD.WTTS.Client.Plugins.SteamIdleCard\\Settings",
+      "InterfaceFilePath": "..\\src\\BD.WTTS.Client.Plugins.SteamIdleCard\\Settings\\Abstractions",
+      "Properties": [
+        {
+          "TypeName": "TimeSpan",
+          "PropertyName": "IdleTime",
+          "DefaultValue": "TimeSpan.FromMinutes(6)",
+          "DefaultValueIsConst": false,
+          "Summary": "挂卡状态更新时间",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "IdleRule",
+          "PropertyName": "IdleRule",
+          "DefaultValue": "IdleRule.FastMode",
+          "DefaultValueIsConst": false,
+          "Summary": "运行规则",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "IdleSequentital",
+          "PropertyName": "IdleSequentital",
+          "DefaultValue": "IdleSequentital.Default",
+          "DefaultValueIsConst": false,
+          "Summary": "运行顺序",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxIdleCount",
+          "DefaultValue": "30",
+          "DefaultValueIsConst": false,
+          "Summary": "最大并行运行游戏数量",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "MinRunTime",
+          "DefaultValue": "2",
+          "DefaultValueIsConst": false,
+          "Summary": "最少游戏时间 hours",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "SwitchTime",
+          "DefaultValue": "5000",
+          "DefaultValueIsConst": false,
+          "Summary": "自动切换游戏时间间隔 ms",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "RefreshBadgesTime",
+          "DefaultValue": "6",
+          "DefaultValueIsConst": false,
+          "Summary": "自动刷新徽章数据时间间隔 min",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        }
+      ],
+      "Usings": ""
+    },
+    "ASFSettings": {
+      "ClassFilePath": "..\\src\\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\\Settings",
+      "InterfaceFilePath": "..\\src\\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\\Settings\\Abstractions",
+      "Properties": [
+        {
+          "TypeName": "string",
+          "PropertyName": "ArchiSteamFarmExePath",
+          "DefaultValue": "string.Empty",
+          "DefaultValueIsConst": false,
+          "Summary": "ASF 路径",
+          "IsRegionOrEndregion": null,
+          "IsValueType": false
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "AutoRunArchiSteamFarm",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "程序启动时自动运行 ASF",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "CheckArchiSteamFarmExe",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "检查文件安全性",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleMaxLineDefault",
+          "DefaultValue": "200",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MinRangeConsoleMaxLine",
+          "DefaultValue": "DefaultConsoleMaxLineDefault",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数范围最小值",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxRangeConsoleMaxLine",
+          "DefaultValue": "5000",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数范围最大值",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleMaxLine",
+          "DefaultValue": "DefaultConsoleMaxLineDefault",
+          "DefaultValueIsConst": false,
+          "Summary": "控制台最大行数",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleFontSizeDefault",
+          "DefaultValue": "14",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MinRangeConsoleFontSize",
+          "DefaultValue": "8",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxRangeConsoleFontSize",
+          "DefaultValue": "24",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleFontSize",
+          "DefaultValue": "DefaultConsoleFontSizeDefault",
+          "DefaultValueIsConst": false,
+          "Summary": "控制台字体大小",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "IPCPortIdValue",
+          "DefaultValue": "6242",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "IPCPortId",
+          "DefaultValue": "DefaultIPCPortIdValue",
+          "DefaultValueIsConst": false,
+          "Summary": "IPC 端口号，默认值为 <see cref=\"DefaultIPCPortIdValue\" />",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "IPCPortOccupiedRandom",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": false,
+          "Summary": "IPC 端口号被占用时是否随机一个未使用的端口号，默认值 <see langword=\"true\" />",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
         }
       ],
       "Usings": ""

src/AssemblyInfo.Constants.cs

@@ -5,23 +5,25 @@ namespace BD.WTTS;
 /// </summary>
 public static partial class AssemblyInfo
 {
+    const string Version2 = "3.0";
+
     /// <summary>
     /// 语义化应用程序版本
     /// https://semver.org/lang/zh-CN/
     /// </summary>
-    public const string Version = "3.0.0";
+    public const string Version = $"{Version2}.0";
 
     /// <summary>
     /// 预览版本号，范围 1~9，只增不减
     /// </summary>
-    const string ver_for_preview = "7";
+    const string ver_for_preview = "8";
 
     /// <summary>
     /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "1";
+    const string ver_for_rc = "9";
 
-    public const string FileVersion = $"{Version}.{ver_for_rc}0{ver_for_preview}";
+    public const string FileVersion = $"{Version2}.{ver_for_rc}0{ver_for_preview}.0";
 
     //public const string InformationalVersion = Version;
     //public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";

src/AssemblyInfo.Xaml.cs

@@ -22,6 +22,9 @@ global using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Converters")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Markup")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Client.Resources")]
+[assembly: XmlnsDefinition("https://steampp.net/ui", "Mobius.Models")]
+[assembly: XmlnsDefinition("https://steampp.net/ui", "Mobius")]
+
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Services")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins.Abstractions")]

src/Avalonia.Skia.Internals/IFontManagerImpl2.cs

@@ -38,9 +38,9 @@ public interface IFontManagerImpl2 : IFontManagerImpl
         return Impl.TryCreateGlyphTypeface(familyName, style, weight, stretch, out glyphTypeface);
     }
 
-    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
+    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, FontSimulations fontSimulations, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
     {
-        return Impl.TryCreateGlyphTypeface(stream, out glyphTypeface);
+        return Impl.TryCreateGlyphTypeface(stream, fontSimulations, out glyphTypeface);
     }
 
     //IGlyphTypeface IFontManagerImpl.CreateGlyphTypeface(Typeface typeface)

src/BD.WTTS.Client.AppHost.Bridge.Package/Package.appxmanifest

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
+  IgnorableNamespaces="uap rescap desktop desktop2">
+
+	<Identity
+	  Name="4651ED44255E.47979655102CE"
+	  Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
+	  Version="3.0.207.0" />
+
+	<Properties>
+		<DisplayName>Watt Toolkit</DisplayName>
+		<PublisherDisplayName>软妹币玩家</PublisherDisplayName>
+		<Logo>Images\StoreLogo.png</Logo>
+	</Properties>
+
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+	</Dependencies>
+
+	<Resources>
+		<Resource Language="x-generate"/>
+	</Resources>
+
+	<Applications>
+		<Application Id="App"
+		  Executable="$targetnametoken$.exe"
+		  EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+			  DisplayName="Watt Toolkit"
+			  Description="「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。"
+			  BackgroundColor="transparent"
+			  Square150x150Logo="Images\Square150x150Logo.png"
+			  Square44x44Logo="Images\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="Steam++">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo"/>
+						<uap:ShowOn Tile="wide310x150Logo"/>
+						<uap:ShowOn Tile="square310x310Logo"/>
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile >
+				<uap:SplashScreen Image="Images\SplashScreen.png" />
+				<uap:InitialRotationPreference>
+					<uap:Rotation Preference="landscape"/>
+				</uap:InitialRotationPreference>
+				<uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
+			</uap:VisualElements>
+			<Extensions>
+				<desktop:Extension Category="windows.fullTrustProcess" Executable="Steam++\Steam++.exe" />
+				<desktop:Extension Category="windows.startupTask" Executable="Steam++\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
+					<desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
+				</desktop:Extension>
+				<uap:Extension Category="windows.protocol">
+					<uap:Protocol Name="spp">
+						<uap:Logo>Images\Square44x44Logo.png</uap:Logo>
+						<uap:DisplayName>Steam++ URI Scheme</uap:DisplayName>
+					</uap:Protocol>
+				</uap:Extension>
+			</Extensions>
+		</Application>
+	</Applications>
+
+	<Extensions>
+		<desktop2:Extension Category="windows.firewallRules">
+			<desktop2:FirewallRules Executable="Steam++\modules\Accelerator\Steam++.Accelerator.exe">
+				<desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
+				<desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
+			</desktop2:FirewallRules>
+		</desktop2:Extension>
+	</Extensions>
+
+	<Capabilities>
+		<Capability Name="internetClient" />
+		<rescap:Capability Name="runFullTrust" />
+		<rescap:Capability Name="allowElevation" />
+	</Capabilities>
+</Package>

src/BD.WTTS.Client.AppHost.Bridge/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+	</startup>
+	<runtime>
+		<gcServer enabled="false"/>
+		<GCConserveMemory enabled="9"/>
+		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
+	</runtime>
+	<appSettings>
+		<add key="d" value="7.0.11"/>
+	</appSettings>
+</configuration>

src/BD.WTTS.Client.AppHost.Bridge/Steam++.csproj

@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<AssemblyName>Steam++</AssemblyName>
+		<TargetFramework>net472</TargetFramework>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<IsTrimmable>false</IsTrimmable>
+		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
+		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
+		<Prefer32Bit>false</Prefer32Bit>
+		<ApplicationManifest>..\BD.WTTS.Client.AppHost\Properties\app.manifest</ApplicationManifest>
+		<DefineConstants>APP_HOST;WINDOWS_DEKSTOP_BRIDGE;$(DefineConstants)</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<RootNamespace>BD.WTTS</RootNamespace>
+		<EnableMsixTooling>true</EnableMsixTooling>
+		<ServerGarbageCollection>false</ServerGarbageCollection>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<ApplicationIcon Condition="'$(Configuration)'=='Release'">..\..\res\icons\app\v3\Icon.ico</ApplicationIcon>
+		<ApplicationIcon Condition="'$(Configuration)'=='Debug'">..\..\res\icons\app\v3\Icon.ico</ApplicationIcon>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) OR $(TargetFramework.StartsWith('net3')) ">
+		<SignAssembly>True</SignAssembly>
+		<AssemblyOriginatorKeyFile>..\..\WattToolkit.snk</AssemblyOriginatorKeyFile>
+	</PropertyGroup>
+
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) OR $(TargetFramework.StartsWith('net3')) ">
+		<Reference Include="System.Configuration" />
+	</ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<AllowedReferenceRelatedFileExtensions>
+			<!-- Prevent default XML and PDB files copied to output in RELEASE. 
+           		 Only *.allowedextension files will be included, which doesn't exist in my case.
+       		-->
+			.allowedextension
+		</AllowedReferenceRelatedFileExtensions>
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Remove="..\ImplicitUsings.Common.cs" />
+		<Compile Include="..\AssemblyInfo.Constants.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\BD.WTTS.Client\Startup\Startup.CompatibilityCheck.cs" />
+		<Compile Condition="'$(Configuration)'=='Debug'" Include="..\Utils.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Include="..\BD.WTTS.Client.AppHost\**\*.cs" />
+		<Compile Remove="..\BD.WTTS.Client.AppHost\bin\**" />
+		<Compile Remove="..\BD.WTTS.Client.AppHost\obj\**" />
+	</ItemGroup>
+
+</Project>

src/BD.WTTS.Client.AppHost/App.config

@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.10"/>
+		<add key="d" value="8.0.0"/>
 	</appSettings>
 </configuration>

src/BD.WTTS.Client.AppHost/Program.cs

@@ -16,9 +16,9 @@ static unsafe partial class Program
 {
     static Program()
     {
-        dotnet_version_major = "7";
+        dotnet_version_major = "8";
         dotnet_version_minor = "0";
-        dotnet_version_build = "10";
+        dotnet_version_build = "0";
         dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     }
 
@@ -27,7 +27,7 @@ static unsafe partial class Program
     //#else
     //    public const string dotnet_version_major = "7";
     //    public const string dotnet_version_minor = "0";
-    //    public const string dotnet_version_build = "10";
+    //    public const string dotnet_version_build = "11";
     //    public const string dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     //#endif
 
@@ -143,7 +143,9 @@ static unsafe partial class Program
         Architecture.X64 => "x64",
         Architecture.Arm => "Arm32",
         Architecture.Arm64 => "Arm64",
+#if !NETFRAMEWORK
         Architecture.Armv6 => "Armv6",
+#endif
         _ => throw new ArgumentOutOfRangeException(nameof(architecture), architecture, null),
     };
 

src/BD.WTTS.Client.AppHost/Properties/app.manifest

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.AppHost"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="asInvoker" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>
+<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.AppHost"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="requireAdministrator" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>

src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj

@@ -98,14 +98,14 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll')">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll')">
 		<!-- Windows Only -->
 		<!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录-->
-		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll">
+		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Reference Include="System.Drawing.Common">
-			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll</HintPath>
+			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll</HintPath>
 		</Reference>
 	</ItemGroup>
 

src/BD.WTTS.Client.Avalonia.App/Info.plist

@@ -22,6 +22,8 @@
 	<string>NSApplication</string>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
+	<key>CFBundleIconFile</key>
+	<string>AppIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleURLTypes</key>

src/BD.WTTS.Client.Avalonia.App/Properties/app.manifest

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.App"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="asInvoker" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>
+<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.App"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="requireAdministrator" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>

src/BD.WTTS.Client.Avalonia.App/Properties/launchSettings.json

@@ -1,8 +1,7 @@
 {
   "profiles": {
     "BD.WTTS.Client.Avalonia.App": {
-      "commandName": "Project",
-      "commandLineArgs": "-clt devtools -steamrun"
+      "commandName": "Project"
     }
   }
 }

src/BD.WTTS.Client.Avalonia.App/Startup.cs

@@ -248,7 +248,7 @@ sealed partial class Program : Startup
 
     sealed class Essentials_AppVerS : IApplicationVersionService
     {
-        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.Version;
+        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.FileVersion;
 
         string IApplicationVersionService.AssemblyTrademark => AssemblyInfo.Trademark;
     }