mirror of
https://github.com/wangdage12/Snap.Hutao.git
synced 2026-02-18 02:42:15 +08:00
Compare commits
43 Commits
1.17.2.0
...
e9ed7928d6
| Author | SHA1 | Date | |
|---|---|---|---|
|
e9ed7928d6 | ||
|
|
4d2943d1c9 | ||
|
|
74e9427451 | ||
|
|
cb6d728c35 | ||
|
|
f87b80cc9e | ||
|
|
4b313b134e | ||
|
|
0c775a5d3d | ||
|
|
00cd5a8c07 | ||
|
|
d93ae2bb83 | ||
|
|
2f148488f4 | ||
|
|
df92894307 | ||
|
|
5fad9ad855 | ||
|
|
1ed2f4f29e | ||
|
|
db6df72791 | ||
|
|
bd9f188ac1 | ||
|
|
56c36a01ae | ||
|
|
da6f248509 | ||
|
|
068eb65fef | ||
|
|
09a8cded2f | ||
|
|
c38fdf30d0 | ||
|
|
bc1ff03d0a | ||
|
|
b288860c3b | ||
|
|
1e40a6e576 | ||
|
|
d342b37dc0 | ||
|
|
179177a77c | ||
|
|
6c68a55d81 | ||
|
|
7bd61c8035 | ||
|
|
c19b71e2c4 | ||
|
|
45b7383fc1 | ||
|
|
c83a2f3e9d | ||
|
|
2bab0baf69 | ||
|
|
2726e74731 | ||
|
|
6d08f669e7 | ||
|
|
84b9b97059 | ||
|
|
0b846f11b7 | ||
|
|
c9adc06210 | ||
|
|
6c9f50b055 | ||
|
|
6c515caa88 | ||
|
|
b834ae5425 | ||
|
|
49ae21e02c | ||
|
|
88f81c5582 | ||
|
|
b9130979c1 | ||
|
|
0de6d4b71c |
93
.github/ISSUE_TEMPLATE/CHS-bug-report.yml
vendored
93
.github/ISSUE_TEMPLATE/CHS-bug-report.yml
vendored
@@ -1,93 +0,0 @@
|
||||
name: 问题反馈
|
||||
description: 通过这个议题向开发团队反馈你发现的程序中的问题
|
||||
title: "[Bug]: 在这里填写一个合适的标题"
|
||||
type: "Bug"
|
||||
labels: ["priority:none"]
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
> **请在上方以一句话简短地概括你的问题作为标题**
|
||||
> 请按下方的要求填写完整的问题表单，以便我们更快的定位问题。
|
||||
|
||||
- type: input
|
||||
id: winver
|
||||
attributes:
|
||||
label: Windows 版本
|
||||
description: |
|
||||
`Win+R` 输入 `winver` 回车后在打开的窗口第二行可以找到
|
||||
placeholder: 例：22000.556
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: shver
|
||||
attributes:
|
||||
label: Snap Hutao 版本
|
||||
description: 在应用标题，应用程序的反馈中心界面中可以找到
|
||||
placeholder: 例：1.9.9.0
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: deviceid
|
||||
attributes:
|
||||
label: 设备 ID
|
||||
description: |
|
||||
> 在胡桃工具箱的反馈中心界面，你可以找到并复制你的设备 ID
|
||||
> 如果你的问题涉及程序崩溃，请填写该项，这将有助于我们定位问题
|
||||
> 如果你的程序已经无法启动，请下载并运行[诊断工具](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.Diagnostic.Tooling.exe)，它将显示你的设备 ID
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: user-set-category
|
||||
attributes:
|
||||
label: 问题分类
|
||||
description: 请设置一个你认为合适的分类，这将帮助我们快速定位问题
|
||||
options:
|
||||
- 安装和环境
|
||||
- 游戏启动器
|
||||
- 祈愿记录
|
||||
- 成就管理
|
||||
- 我的角色
|
||||
- 实时便笺
|
||||
- 养成计算
|
||||
- 深境螺旋/胡桃数据库
|
||||
- Wiki
|
||||
- 米游社账号面板
|
||||
- 每日签到奖励
|
||||
- 胡桃通行证/胡桃云
|
||||
- 用户界面
|
||||
- 文件缓存
|
||||
- 公告
|
||||
- 其它
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: what-happened
|
||||
attributes:
|
||||
label: 发生了什么？
|
||||
description: |
|
||||
详细的描述问题发生前后的行为，以便我们解决问题。**如果你的问题涉及程序崩溃，你应当检查 Windows 事件查看器，并将相关的 `.Net 错误`详情附上**
|
||||
如果你无法找到该日志，请下载并运行[诊断工具](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.Diagnostic.Tooling.exe)，它将转储问题日志至工具运行目录中的 `Snap.Hutao Error Log.txt`
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: what-expected
|
||||
attributes:
|
||||
label: 你期望发生的行为？
|
||||
description: 详细的描述你期望发生的行为，突出与目前（可能不正确的）行为的不同
|
||||
validations:
|
||||
required: false
|
||||
|
||||
- type: checkboxes
|
||||
id: checklist-final
|
||||
attributes:
|
||||
label: 最后一步
|
||||
description: 回顾你的回答
|
||||
options:
|
||||
- label: 我认为上述的描述已经足以详细，以允许开发人员能复现该问题
|
||||
required: true
|
||||
26
.github/ISSUE_TEMPLATE/CHS-feature-request.yml
vendored
26
.github/ISSUE_TEMPLATE/CHS-feature-request.yml
vendored
@@ -1,26 +0,0 @@
|
||||
name: 功能请求
|
||||
description: 通过这个议题来向开发团队分享你的想法
|
||||
title: "[Feat]: 在这里填写一个合适的标题"
|
||||
type: "Feature"
|
||||
labels: ["needs-triage", "priority:none"]
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
请按下方的要求填写完整的问题表单。
|
||||
|
||||
- type: textarea
|
||||
id: back
|
||||
attributes:
|
||||
label: 背景与动机
|
||||
description: 添加此功能的理由，如果你想要实现多个功能，请分别发起多个单独的议题
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: req
|
||||
attributes:
|
||||
label: 想要实现或优化的功能
|
||||
description: 详细的描述一下你想要的功能，描述的越具体，采纳的可能性越高
|
||||
validations:
|
||||
required: true
|
||||
84
.github/ISSUE_TEMPLATE/CHS-network-issue.yml
vendored
84
.github/ISSUE_TEMPLATE/CHS-network-issue.yml
vendored
@@ -1,84 +0,0 @@
|
||||
name: 网络问题
|
||||
description: 通过这个议题来反馈网络问题
|
||||
title: "[Network]: 在这里填写一个合适的标题"
|
||||
type: "Bug"
|
||||
labels: ["area-Network"]
|
||||
assignees:
|
||||
- Lightczx
|
||||
- Masterain98
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
**请先在上方为工单设置一个合适的标题**
|
||||
**请按下方的要求填写完整的问题表单，以便我们更快的定位问题。**
|
||||
|
||||
- type: textarea
|
||||
id: network-diagnosis-report
|
||||
attributes:
|
||||
label: 提交你的网络诊断报告
|
||||
description: |
|
||||
停下！
|
||||
**在填写下面的问题之前请先使用我们的网络诊断工具**
|
||||
**这个工具将会生成一份报告并加密压缩，请将这份报告拖入下面的框中，让其与你的工单一起被上传提交**
|
||||
- 你可以点击下面的链接以下载网络诊断工具：
|
||||
- [GitHub](https://github.com/Masterain98/network-diagnosis-tool/releases/latest/download/SH-Network-Diagnosis.exe)
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: user-geo-location
|
||||
attributes:
|
||||
label: 你的地理位置
|
||||
description: |
|
||||
中国用户请精确到省级行政区
|
||||
海外用户请精确到国家
|
||||
placeholder: 北京
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: user-isp
|
||||
attributes:
|
||||
label: 你的运营商
|
||||
description: 海外用户请选其它
|
||||
options:
|
||||
- 中国电信
|
||||
- 中国联通
|
||||
- 中国移动
|
||||
- 中国广电
|
||||
- 其它
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: user-issue-category
|
||||
attributes:
|
||||
label: 你的问题
|
||||
description: 选择一个问题类别
|
||||
options:
|
||||
- 完全无法连接服务器
|
||||
- 连接速度慢
|
||||
- 获取到了不正确的页面或数据
|
||||
- 客户端图片下载错误
|
||||
- 客户端图片预下载错误
|
||||
- 其它
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: what-happened
|
||||
attributes:
|
||||
label: 你的问题（补充）
|
||||
description: 如果你在上一项中选择了`其它`或者你有更多信息需要提供，请在这里写下来
|
||||
validations:
|
||||
required: false
|
||||
|
||||
- type: checkboxes
|
||||
id: checklist-final
|
||||
attributes:
|
||||
label: 最后一步
|
||||
description: 检查你提交的议题
|
||||
options:
|
||||
- label: 我已经在该议题中上传了包含网络诊断报告的加密压缩包
|
||||
required: true
|
||||
93
.github/ISSUE_TEMPLATE/ENG-bug-report.yml
vendored
93
.github/ISSUE_TEMPLATE/ENG-bug-report.yml
vendored
@@ -1,93 +0,0 @@
|
||||
name: BUG Report [English Form]
|
||||
description: Tell us what issue you get
|
||||
title: "[ENG][Bug]: Place your Issue Title Here"
|
||||
type: "Bug"
|
||||
labels: ["priority:none"]
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
> **Please use one sentence to briefly describe your issue as title above**
|
||||
> Please follow the instruction below to fill the form, so we can locate the issue quickly
|
||||
|
||||
- type: input
|
||||
id: winver
|
||||
attributes:
|
||||
label: Windows Version
|
||||
description: |
|
||||
Use `Win+R` and input `winver`, Windows build version is usually at the second line
|
||||
placeholder: e.g. 22000.556
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: shver
|
||||
attributes:
|
||||
label: Snap Hutao Version
|
||||
description: You can find the version in application's title bar
|
||||
placeholder: e.g. 1.9.9.0
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: deviceid
|
||||
attributes:
|
||||
label: Device ID
|
||||
description: |
|
||||
> In Snap Hutao's Feedback Center, you can find and copy your device ID
|
||||
> If your issue is about program crash, please fill this so we can dump the log and locate the source easier
|
||||
> If your program cannot startup, please download and run [Diagnostic Tooling](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.Diagnostic.Tooling.exe), it will shows your device ID.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: user-set-category
|
||||
attributes:
|
||||
label: Issue Category
|
||||
description: Please select the most associated category of your issue
|
||||
options:
|
||||
- Installation and Environment
|
||||
- Game Launcher
|
||||
- Wish Export
|
||||
- Achievement
|
||||
- My Character
|
||||
- Realtime Note
|
||||
- Develop Plan
|
||||
- Spiral Abyss
|
||||
- Wiki
|
||||
- MiHoYo Account Panel
|
||||
- Daily Checkin Reward
|
||||
- Hutao Passport/Hutao Cloud
|
||||
- User Interface
|
||||
- File Cache
|
||||
- Announcement
|
||||
- Other
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: what-happened
|
||||
attributes:
|
||||
label: What Happened?
|
||||
description: |
|
||||
Describe your issue in detail to help us identify the issue. **If your issue is about program crash, you should check Windows Event Viewer, and attach associated `.Net Error` details here**If your program cannot startup, please download and run [this PowerShell script](https://github.com/DGP-Studio/ISSUE_TEMPLATES/releases/download/get_device_id/GetHutaoDeviceId.ps1), it will shows your device ID.
|
||||
If you cannot find it, please download and run [Diagnosis Tool](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.Diagnostic.Tooling.exe), it will dump the error log to `Snap.Hutao Error Log.txt` in the working directory of the tool.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: what-expected
|
||||
attributes:
|
||||
label: What is expected?
|
||||
description: Describe expected outcome, highlight the difference with current outcome
|
||||
validations:
|
||||
required: false
|
||||
|
||||
- type: checkboxes
|
||||
id: checklist-final
|
||||
attributes:
|
||||
label: Last Step
|
||||
description: Review your Form
|
||||
options:
|
||||
- label: I believe the description above is detail enough to allow developers to reproduce the issue
|
||||
required: true
|
||||
26
.github/ISSUE_TEMPLATE/ENG-feature-request.yml
vendored
26
.github/ISSUE_TEMPLATE/ENG-feature-request.yml
vendored
@@ -1,26 +0,0 @@
|
||||
name: Feature Request [English Form]
|
||||
description: Tell us about your thought
|
||||
title: "[Feat]: Place your title here"
|
||||
type: "Feature"
|
||||
labels: ["needs-triage", "priority:none"]
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please fill the form below
|
||||
|
||||
- type: textarea
|
||||
id: back
|
||||
attributes:
|
||||
label: Background & Motivation
|
||||
description: Reason why this feature is needed. If multiple features is requested, please open multiple issues for each of them.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: req
|
||||
attributes:
|
||||
label: Detail of the Feature
|
||||
description: Descripbe the feaure in detail. The more detailed and convincing the desciprtion the more likyly feature will be accepted.
|
||||
validations:
|
||||
required: true
|
||||
79
.github/ISSUE_TEMPLATE/ENG-network-issue.yml
vendored
79
.github/ISSUE_TEMPLATE/ENG-network-issue.yml
vendored
@@ -1,79 +0,0 @@
|
||||
name: Network Issue [English Form]
|
||||
description: Submit this issue form when network issue affect your client experience
|
||||
title: "[Network]: Place your title here"
|
||||
type: "Bug"
|
||||
labels: ["area-Network"]
|
||||
assignees:
|
||||
- Lightczx
|
||||
- Masterain98
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
**Please use one sentence to briefly describe your issue as title above**
|
||||
**Please follow the instruction below to fill the form, so we can locate the issue quickly**
|
||||
|
||||
- type: textarea
|
||||
id: network-diagnosis-report
|
||||
attributes:
|
||||
label: Submit Your Network Diagnosis Report
|
||||
description: |
|
||||
STOP HERE!
|
||||
**Please run our network diagnosis tool before filling this form**
|
||||
**The diagnosis tool will generate a report and add it into a password-protected archive. Drag the `.zip` archive to the box below so it can be uploaded.**
|
||||
- Use the following link to download the Network Diagnosis Tool:
|
||||
- [GitHub](https://github.com/Masterain98/network-diagnosis-tool/releases/latest/download/SH-Network-Diagnosis.exe)
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: user-geo-location
|
||||
attributes:
|
||||
label: Your Geographical Location
|
||||
description: |
|
||||
Description accurate to country
|
||||
placeholder: USA
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: input
|
||||
id: user-isp
|
||||
attributes:
|
||||
label: Your ISP Name
|
||||
description: |
|
||||
Name of your Internet service provider
|
||||
placeholder: AT&T
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: dropdown
|
||||
id: user-issue-category
|
||||
attributes:
|
||||
label: Issue Category
|
||||
description: Select an issue category
|
||||
options:
|
||||
- Cannot connect to server completely
|
||||
- Slow spped
|
||||
- Fetched wrong page or data
|
||||
- Image download error in the client
|
||||
- Image set pre-download error (client welcome wizard process)
|
||||
- Other
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: what-happened
|
||||
attributes:
|
||||
label: Your Issue (cont.)
|
||||
description: If you selected `Other` in previous dropdown, please explain your issue in detail here.
|
||||
validations:
|
||||
required: false
|
||||
|
||||
- type: checkboxes
|
||||
id: checklist-final
|
||||
attributes:
|
||||
label: One Last Step
|
||||
description: Check your issue form
|
||||
options:
|
||||
- label: I confirm I have attached the network diagnosis report archive in the issue
|
||||
required: true
|
||||
31
.github/ISSUE_TEMPLATE/MGMT-publish.yml
vendored
31
.github/ISSUE_TEMPLATE/MGMT-publish.yml
vendored
@@ -1,31 +0,0 @@
|
||||
name: Publish Process
|
||||
description: FOR ADMIN USE ONLY. WILL CAUSE A BAN IF NO PERMISSION.
|
||||
title: "[Publish]: Version 1.9.98"
|
||||
labels: ["Publish"]
|
||||
assignees:
|
||||
- Lightczx
|
||||
body:
|
||||
- type: textarea
|
||||
id: main-body
|
||||
attributes:
|
||||
label: Publish Process
|
||||
value: |
|
||||
|
||||
## 创建版本
|
||||
|
||||
- [ ] 同步一次 [Crowdin](https://crowdin.com/project/snap-hutao) 翻译
|
||||
- [ ] 发布 RC 版本（Optional）
|
||||
- [ ] 合并入主分支
|
||||
- [ ] 整理更新内容，等待翻译
|
||||
- [ ] 在 [Snap.Hutao.Docs@next-patch](https://github.com/DGP-Studio/Snap.Hutao.Docs/tree/next-patch) 分支更新文档并直接开 PR
|
||||
- [ ] 更新日志
|
||||
- [ ] 功能文档更新
|
||||
|
||||
- type: checkboxes
|
||||
id: checklist-final
|
||||
attributes:
|
||||
label: Final Check
|
||||
description: Understand what you are doing
|
||||
options:
|
||||
- label: I understand that I will get banned from repository if I don't have permission to use this template
|
||||
required: true
|
||||
14
.github/ISSUE_TEMPLATE/config.yml
vendored
14
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,14 +0,0 @@
|
||||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: Snap Hutao 官方文档 / Snap Hutao Document
|
||||
url: https://hut.ao
|
||||
about: 请在提出问题前阅读文档 / Read the document before submit the issue
|
||||
|
||||
- name: 常见问题 / FAQ
|
||||
url: https://hut.ao/advanced/FAQ.html
|
||||
about: 常见的用户提出的问题 / Common questions asked by users
|
||||
|
||||
- name: 常见程序异常 / Common Program Exceptions
|
||||
url: https://hut.ao/advanced/exceptions.html
|
||||
about: 用户通常能自行解决这些问题 / Users may solve these problems by themselves
|
||||
|
||||
13
.github/ISSUE_TEMPLATE/task.yml
vendored
13
.github/ISSUE_TEMPLATE/task.yml
vendored
@@ -1,13 +0,0 @@
|
||||
name: 内部任务
|
||||
description: 此Issue模板仅用于创建内部任务，非 DGP Studio 成员请勿使用
|
||||
title: "[Task]: 在这里填写一个合适的标题"
|
||||
type: "Task"
|
||||
labels: ["priority:none"]
|
||||
body:
|
||||
- type: textarea
|
||||
id: content
|
||||
attributes:
|
||||
label: 背景与动机
|
||||
description: 添加相关的说明
|
||||
validations:
|
||||
required: true
|
||||
4
.github/workflows/alpha.yml
vendored
4
.github/workflows/alpha.yml
vendored
@@ -95,7 +95,7 @@ jobs:
|
||||
|
||||
- name: Cache NuGet packages
|
||||
if: ${{ needs.select-runner.outputs.runner == 'windows-latest' }}
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: ~/.nuget/packages
|
||||
key: ${{ runner.os }}-nuget-${{ hashFiles('**/Snap.Hutao.csproj') }}
|
||||
@@ -113,7 +113,7 @@ jobs:
|
||||
|
||||
- name: Upload signed msix
|
||||
if: success() && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}
|
||||
path: ${{ github.workspace }}/src/output/Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}.msix
|
||||
|
||||
4
.github/workflows/canary.yml
vendored
4
.github/workflows/canary.yml
vendored
@@ -59,7 +59,7 @@ jobs:
|
||||
|
||||
- name: Cache NuGet packages
|
||||
if: ${{ steps.merge.outputs.continue == 'true' }}
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: ~/.nuget/packages
|
||||
key: ${{ runner.os }}-nuget-${{ hashFiles('**/Snap.Hutao.csproj') }}
|
||||
@@ -77,7 +77,7 @@ jobs:
|
||||
|
||||
- name: Upload signed msix
|
||||
if: ${{ success() && steps.merge.outputs.continue == 'true' }}
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: Snap.Hutao.Canary-${{ steps.cake.outputs.version }}
|
||||
path: ${{ github.workspace }}/src/output/Snap.Hutao.Canary-${{ steps.cake.outputs.version }}.msix
|
||||
|
||||
2
.github/workflows/lock_closed_issues.yml
vendored
2
.github/workflows/lock_closed_issues.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
||||
action:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: dessant/lock-threads@v5
|
||||
- uses: dessant/lock-threads@v6
|
||||
with:
|
||||
issue-inactive-days: '30'
|
||||
issue-comment: 'This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related topic.'
|
||||
|
||||
6
.github/workflows/msi-build.yml
vendored
6
.github/workflows/msi-build.yml
vendored
@@ -11,10 +11,10 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout source
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Setup .NET SDK
|
||||
uses: actions/setup-dotnet@v4
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 10.0.x
|
||||
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
run: dotnet build src/Snap.Hutao/Snap.Hutao.Installer/Snap.Hutao.Installer.wixproj -c Release
|
||||
|
||||
- name: Upload MSI Artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: Snap.Hutao-MSI
|
||||
path: |
|
||||
|
||||
100
README.md
100
README.md
@@ -4,7 +4,17 @@
|
||||
**中文**
|
||||
胡桃工具箱是一款以 MIT 协议开源的原神工具箱，专为现代化 Windows 平台设计，旨在改善桌面端玩家的游戏体验。
|
||||
|
||||
该版本注入功能暂不可用，并且由于缺失资源和开发能力，不建议长期使用
|
||||
自带的注入功能只有FPS调整，只保证FPS调整长期可用，你可以使用`注入选项`下方的第三方工具来使用更多功能，本项目提供的所有注入功能都不会影响游戏的公平性。
|
||||
|
||||
官网：https://htserver.wdg.cloudns.ch/
|
||||
|
||||
**该版本的特点：**
|
||||
- 尽量保留原版功能，少重写功能，稳定性强
|
||||
- 只集成没有争议的安全的注入功能
|
||||
- 大部分注入功能以第三方工具形式提供，点击即用
|
||||
- 永久免费的云抽卡日志
|
||||
|
||||
有条件的话可以加入discord服务器：https://discord.gg/ucH3mgeWpQ
|
||||
|
||||
**English**
|
||||
Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed for modern Windows platform to improve the gaming experience for desktop players.
|
||||
@@ -13,11 +23,11 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
|
||||
|
||||
## 🚀 安装 / Installation
|
||||
|
||||
> 如果你的设备不支持ipv6，请下载末尾带有`ipv4`的压缩包，正常情况下请尽量下载普通包（服务器速度快）
|
||||
|
||||
目前 Sanp.Hutao.Rev 更新了打包方式，并采用了标准现代的 msi 安装，方便程序获取管理员权限和更多的功能设置，不再需要原 Depolyment
|
||||
|
||||
可以和之前的版本共存，将之前版本的数据文件夹里面的文件复制到该版本的数据文件夹中即可恢复数据
|
||||
只有`.msi`安装包安装的可以和之前的版本共存，如果通过`.msix`安装包安装则可能出现`0x80073CF3`，备份旧版本数据文件夹后卸载旧版本即可继续安装，将旧版本数据文件夹里面的文件复制到该版本的数据文件夹中即可恢复数据
|
||||
|
||||
有时候我们在对某些功能有重大更改时发布测试版，可在官网的下载，可加入discord服务器报告功能使用情况和获取测试通知
|
||||
|
||||
---
|
||||
|
||||
@@ -25,28 +35,16 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
|
||||
项目启动位置已升级为 VS2026 的 slnx 格式 Snap.Hutao\src\Snap.Hutao\Snap.Hutao.slnx
|
||||
> [!WARNING]
|
||||
> 要使该项目可以长期运行，我们需要以下资源
|
||||
> 1. `src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DataSigning/SaltConstants.cs`中的新签名值
|
||||
> 2. 元数据的编写
|
||||
> 3. 图片资源
|
||||
> 1. 元数据的编写
|
||||
> 2. 图片资源
|
||||
|
||||
已同步原作者的元数据
|
||||
|
||||
V6.2的元数据已在编写中
|
||||
仓库位置：http://server.wdg.cloudns.ch:3000/wdg1122/Snap.Metadata.Test
|
||||
**目前元数据的编写进度：**
|
||||
|
||||
| 项目（V6.2） | 是否完成 |
|
||||
| 项目（V6.3） | 是否完成 |
|
||||
| ----------- | ----------- |
|
||||
| 新角色的基本数据 | ✔️ |
|
||||
| 新版本角色/怪物基础数值 | ❔ |
|
||||
| 新角色的详细资料、名片等 | ❌ |
|
||||
| 新武器 | ✔️ |
|
||||
| 新材料 | ❇️ |
|
||||
| 新怪物 | ❌ |
|
||||
| 新圣遗物 | / |
|
||||
| 新卡池 | ❇️ |
|
||||
| 新成就 | ❌ |
|
||||
| 深境螺旋 | 💠 |
|
||||
| 幻想真境剧诗 | 💠 |
|
||||
| 幽境危战 | ❌ |
|
||||
| 总体数据 | ✔️ |
|
||||
|
||||
✔️：已完成
|
||||
❌：未编写
|
||||
@@ -62,49 +60,55 @@ V6.2的元数据已在编写中
|
||||
https://deepwiki.com/DGP-Studio/Snap.Hutao
|
||||
|
||||
https://deepwiki.com/DGP-Studio/Snap.Hutao.Server
|
||||
|
||||
**该项目所需的其他仓库，欢迎贡献或者自部署**
|
||||
|
||||
- 元数据：[Snap.Metadata](https://github.com/wangdage12/Snap.Metadata)
|
||||
- 服务端：[Snap.Server](https://github.com/wangdage12/Snap.Server)
|
||||
- Web管理后台和官网：[Snap.Server.Web](https://github.com/wangdage12/Snap.Server.Web)
|
||||
|
||||
## 打包测试
|
||||
|
||||
由于采用了 wix 进行打包程序，VS 需要安装 **HeatWave for VS2022**（2026兼容）。需要 msi 安装包时，右键选中 Snap.Hutao.Installer 生成后即可在目标目录找到。默认目录：Snap.Hutao.Installer\bin\x64\Release\en-US\Snap.Hutao.Installer.msi
|
||||
|
||||
### 资源
|
||||
## 资源和服务器状态
|
||||
|
||||
> 注意：普通包的资源服务器只能使用ipv6连接，也就是说，你的电脑必须有ipv6，并且建议你手动配置DNS为`223.5.5.5`
|
||||
> 如果你的设备不支持ipv6，请下载末尾带有`ipv4`的压缩包
|
||||
> 由于数据文件夹中有元数据的仓库和图片缓存，才得以恢复资源文件
|
||||
> 如果你发现之前版本可以显示的图片不能显示了，请查找旧数据文件夹
|
||||
> `C:\Users\<用户名>\AppData\Local\Packages\xxxDGPStudio.SnapHutao_xxx\LocalCache\ImageCache`
|
||||
> 并将`ImageCache`文件夹提供给我，我会尽力恢复资源
|
||||
|
||||
[服务器状态页面](http://serverjp.wdg.cloudns.ch:3001/status/hts)
|
||||
<a href="https://uptimerobot.com" target="_blank" rel="noopener">
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)"
|
||||
srcset="https://raw.githubusercontent.com/wangdage12/wangdage12/main/assets/uptimerobot-logo.svg">
|
||||
<img alt="logo"
|
||||
src="https://raw.githubusercontent.com/wangdage12/wangdage12/main/assets/uptimerobot-logo-dark.svg" width="300">
|
||||
</picture>
|
||||
</a>
|
||||
|
||||
我们将使用[UptimeRobot](https://uptimerobot.com)赞助的监控服务作为新的服务器状态页面，它有更多的功能
|
||||
|
||||
[新服务器状态页面](https://stats.uptimerobot.com/fHxWxdxK61)
|
||||
|
||||
[旧服务器状态页面](http://serverjp.wdg.cloudns.ch:3001/status/hts)
|
||||
|
||||
---
|
||||
|
||||
**元数据仓库：**
|
||||
https://github.com/wangdage12/Snap.Metadata
|
||||
|
||||
镜像：
|
||||
|
||||
仓库镜像：
|
||||
|
||||
|
||||
http://server.wdg.cloudns.ch:3000/wdg1122/Snap.Metadata
|
||||
|
||||
|
||||
|
||||
http://serverjp.wdg.cloudns.ch:3000/wdg1122/Snap.Metadata
|
||||
http://htgit.wdg.cloudns.ch/wdg1122/Snap.Metadata
|
||||
|
||||
---
|
||||
|
||||
**临时API：**
|
||||
**API：**
|
||||
|
||||
|
||||
|
||||
|
||||
http://server.wdg.cloudns.ch:5222/
|
||||
|
||||
|
||||
|
||||
|
||||
http://serverjp.wdg.cloudns.ch:5222/
|
||||
https://htserver.wdg.cloudns.ch/api/
|
||||
|
||||
---
|
||||
|
||||
**临时资源站：**
|
||||
http://server.wdg.cloudns.ch:8007/
|
||||
**图片资源站：**
|
||||
|
||||
http://serverjp.wdg.cloudns.ch:8001/
|
||||
https://htserver.wdg.cloudns.ch/
|
||||
|
||||
BIN
bin/unlockfps.exe
Normal file
BIN
bin/unlockfps.exe
Normal file
Binary file not shown.
@@ -4,5 +4,8 @@ This file contains the declaration of all the localizable strings.
|
||||
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
|
||||
|
||||
<String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
|
||||
<String Id="MainAppTitle" Value="Snap.Hutao" />
|
||||
<String Id="DesktopShortcutTitle" Value="Desktop Shortcut" />
|
||||
<String Id="StartMenuShortcutTitle" Value="Start Menu Shortcut" />
|
||||
|
||||
</WixLocalization>
|
||||
|
||||
@@ -1,21 +1,32 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
|
||||
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
|
||||
<Package
|
||||
Name="Snap.Hutao"
|
||||
Manufacturer="Millennium Science Technology R-D Inst"
|
||||
Version="1.0.0.0"
|
||||
Version="1.18.4.0"
|
||||
UpgradeCode="121203be-60cb-408f-92cc-7080f6598e68"
|
||||
Language="2052"
|
||||
Scope="perMachine">
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<Property Id="ApplicationFolderName" Value="Snap.Hutao" />
|
||||
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
|
||||
<Feature Id="ProductFeature" Title="Snap.Hutao" Level="1">
|
||||
<ComponentGroupRef Id="MainAppComponents" />
|
||||
<ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
|
||||
|
||||
<!-- 快捷方式组件 -->
|
||||
<ComponentRef Id="ApplicationShortcut" />
|
||||
<Feature Id="MainApp" Title="!(loc.MainAppTitle)" Level="1">
|
||||
<ComponentGroupRef Id="MainAppComponents" />
|
||||
</Feature>
|
||||
|
||||
<Feature Id="DesktopShortcutFeature" Title="!(loc.DesktopShortcutTitle)" Level="1">
|
||||
<ComponentRef Id="DesktopShortcut" />
|
||||
</Feature>
|
||||
|
||||
<Feature Id="StartMenuShortcutFeature" Title="!(loc.StartMenuShortcutTitle)" Level="1">
|
||||
<ComponentRef Id="ApplicationShortcut" />
|
||||
</Feature>
|
||||
</Package>
|
||||
|
||||
<!-- 安装目录 -->
|
||||
|
||||
11
src/Snap.Hutao/Snap.Hutao.Installer/Package.zh-cn.wxl
Normal file
11
src/Snap.Hutao/Snap.Hutao.Installer/Package.zh-cn.wxl
Normal file
@@ -0,0 +1,11 @@
|
||||
<!--
|
||||
This file contains the declaration of all the localizable strings.
|
||||
-->
|
||||
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="zh-CN">
|
||||
|
||||
<String Id="DowngradeError" Value="已安装更新版本的 [ProductName]。" />
|
||||
<String Id="MainAppTitle" Value="Snap.Hutao" />
|
||||
<String Id="DesktopShortcutTitle" Value="桌面快捷方式" />
|
||||
<String Id="StartMenuShortcutTitle" Value="开始菜单快捷方式" />
|
||||
|
||||
</WixLocalization>
|
||||
@@ -4,6 +4,8 @@
|
||||
<Platform>x64</Platform>
|
||||
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
|
||||
<Configuration>Release</Configuration>
|
||||
<DefaultCulture>zh-CN</DefaultCulture>
|
||||
<Cultures>zh-CN;en-US</Cultures>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -19,6 +21,13 @@
|
||||
<SuppressRootDirectory>true</SuppressRootDirectory>
|
||||
</HarvestDirectory>
|
||||
|
||||
<PackageReference Include="WixToolset.Heat" Version="4.0.1" />
|
||||
<PackageReference Include="WixToolset.Heat" Version="6.0.2" />
|
||||
<PackageReference Include="WixToolset.UI.wixext" Version="6.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<WixLocalization Include="Package.zh-cn.wxl" />
|
||||
<WixLocalization Include="Package.en-us.wxl" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -39,6 +39,7 @@ internal static class DependencyInjection
|
||||
.AddJsonOptions()
|
||||
.AddDatabase()
|
||||
.AddServices()
|
||||
.AddThirdPartyToolService()
|
||||
.AddResponseValidation()
|
||||
.AddConfiguredHttpClients()
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Snap.Hutao.Core.Text.Json;
|
||||
using Snap.Hutao.Factory.Process;
|
||||
using Snap.Hutao.Model.Entity.Database;
|
||||
using Snap.Hutao.Service.ThirdPartyTool;
|
||||
using Snap.Hutao.Win32;
|
||||
using System.Data.Common;
|
||||
|
||||
@@ -66,5 +67,10 @@ internal static partial class ServiceCollectionExtension
|
||||
.UseSqlite(sqlConnectionString);
|
||||
}
|
||||
}
|
||||
|
||||
public IServiceCollection AddThirdPartyToolService()
|
||||
{
|
||||
return services.AddSingleton<IThirdPartyToolService, ThirdPartyToolService>();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -33,6 +33,8 @@ internal static class HutaoRuntime
|
||||
|
||||
public static WebView2Version WebView2Version { get; } = InitializeWebView2();
|
||||
|
||||
public static string WebView2UserDataDirectory { get; } = InitializeWebView2UserDataDirectory();
|
||||
|
||||
// ⚠️ 延迟初始化以避免循环依赖
|
||||
private static readonly Lazy<bool> LazyIsProcessElevated = new(GetIsProcessElevated);
|
||||
|
||||
@@ -144,6 +146,13 @@ internal static class HutaoRuntime
|
||||
return cacheDir;
|
||||
}
|
||||
|
||||
private static string InitializeWebView2UserDataDirectory()
|
||||
{
|
||||
string directory = Path.Combine(LocalCacheDirectory, "WebView2");
|
||||
Directory.CreateDirectory(directory);
|
||||
return directory;
|
||||
}
|
||||
|
||||
private static bool CheckAppNotificationEnabled()
|
||||
{
|
||||
try
|
||||
|
||||
@@ -23,12 +23,13 @@ internal sealed class YaeNamedPipeServer : IAsyncDisposable
|
||||
private readonly TargetNativeConfiguration config;
|
||||
private readonly ITaskContext taskContext;
|
||||
private readonly IProcess gameProcess;
|
||||
private readonly bool supportsResumeMainThread;
|
||||
|
||||
private readonly NamedPipeServerStream serverStream;
|
||||
|
||||
private volatile bool disposed;
|
||||
|
||||
public YaeNamedPipeServer(IServiceProvider serviceProvider, IProcess gameProcess, TargetNativeConfiguration config)
|
||||
public YaeNamedPipeServer(IServiceProvider serviceProvider, IProcess gameProcess, TargetNativeConfiguration config, bool supportsResumeMainThread = true)
|
||||
{
|
||||
Verify.Operation(HutaoRuntime.IsProcessElevated, "Snap Hutao must be elevated to use Yae.");
|
||||
|
||||
@@ -36,6 +37,7 @@ internal sealed class YaeNamedPipeServer : IAsyncDisposable
|
||||
|
||||
this.gameProcess = gameProcess;
|
||||
this.config = config;
|
||||
this.supportsResumeMainThread = supportsResumeMainThread;
|
||||
|
||||
// Yae is always running elevated, so we don't need to use ACL method.
|
||||
serverStream = new(PipeName);
|
||||
@@ -115,8 +117,11 @@ internal sealed class YaeNamedPipeServer : IAsyncDisposable
|
||||
}
|
||||
|
||||
case YaeCommandKind.RequestResumeThread:
|
||||
{
|
||||
if (supportsResumeMainThread)
|
||||
{
|
||||
gameProcess.ResumeMainThread();
|
||||
}
|
||||
return default;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,9 +20,9 @@ internal static class LoggerFactoryExtension
|
||||
|
||||
#if DEBUG || IS_ALPHA_BUILD || IS_CANARY_BUILD
|
||||
// Alpha and Canary produces noisy events
|
||||
options.Dsn = "https://ec3799184191c344ca06c592cb97a464@sentry.snapgenshin.com/4";
|
||||
options.Dsn = "https://2d3047ff2d451986bc7ef395d1f1fe63@o4507525750521856.ingest.us.sentry.io/4510413123682304";
|
||||
#else
|
||||
options.Dsn = "https://1a1151ce5ac4e7f1536edf085bd483ec@sentry.snapgenshin.com/2";
|
||||
options.Dsn = "https://2d3047ff2d451986bc7ef395d1f1fe63@o4507525750521856.ingest.us.sentry.io/4510413123682304";
|
||||
#endif
|
||||
|
||||
#if DEBUG
|
||||
@@ -36,8 +36,8 @@ internal static class LoggerFactoryExtension
|
||||
options.Environment = GetBuildEnvironment();
|
||||
|
||||
// Suppress logs to generate events and breadcrumbs
|
||||
options.MinimumBreadcrumbLevel = LogLevel.None;
|
||||
options.MinimumEventLevel = LogLevel.None;
|
||||
options.MinimumBreadcrumbLevel = LogLevel.Information;
|
||||
options.MinimumEventLevel = LogLevel.Error;
|
||||
|
||||
options.ProfilesSampleRate = 1.0D;
|
||||
options.TracesSampleRate = 1.0D;
|
||||
|
||||
45
src/Snap.Hutao/Snap.Hutao/Factory/Process/NullProcess.cs
Normal file
45
src/Snap.Hutao/Snap.Hutao/Factory/Process/NullProcess.cs
Normal file
@@ -0,0 +1,45 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.Diagnostics;
|
||||
using Snap.Hutao.Win32.Foundation;
|
||||
|
||||
namespace Snap.Hutao.Factory.Process;
|
||||
|
||||
internal sealed class NullProcess : IProcess
|
||||
{
|
||||
public int Id => 0;
|
||||
|
||||
public nint Handle => 0;
|
||||
|
||||
public HWND MainWindowHandle => default;
|
||||
|
||||
public bool HasExited => true;
|
||||
|
||||
public int ExitCode => 0;
|
||||
|
||||
public void Start()
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
public void ResumeMainThread()
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
public void WaitForExit()
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
public void Kill()
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
}
|
||||
@@ -193,6 +193,32 @@ internal sealed class ProcessFactory
|
||||
|
||||
public static void StartUsingShellExecuteRunAs(string fileName)
|
||||
{
|
||||
// 尝试从app包中启动
|
||||
try
|
||||
{
|
||||
global::System.Diagnostics.Process.Start(new global::System.Diagnostics.ProcessStartInfo
|
||||
{
|
||||
FileName = fileName,
|
||||
UseShellExecute = true,
|
||||
Verb = "runas",
|
||||
});
|
||||
}catch
|
||||
{
|
||||
// 如果失败且filename含有Snap.Hutao.Unpackaged，就直接用Snap.Hutao.exe重启
|
||||
if (fileName.Contains("Snap.Hutao.Unpackaged"))
|
||||
{
|
||||
string currentDirectory = Directory.GetCurrentDirectory();
|
||||
string unpackagedPath = Path.Combine(currentDirectory, "Snap.Hutao.exe");
|
||||
if (File.Exists(unpackagedPath))
|
||||
{
|
||||
fileName = unpackagedPath;
|
||||
}
|
||||
// 否则抛出异常
|
||||
else
|
||||
{
|
||||
throw;
|
||||
}
|
||||
// 重新尝试启动
|
||||
global::System.Diagnostics.Process.Start(new global::System.Diagnostics.ProcessStartInfo
|
||||
{
|
||||
FileName = fileName,
|
||||
@@ -200,4 +226,6 @@ internal sealed class ProcessFactory
|
||||
Verb = "runas",
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -126,6 +126,9 @@ internal static class AvatarIds
|
||||
public static readonly AvatarId Nefer = 10000122;
|
||||
public static readonly AvatarId Durin = 10000123;
|
||||
public static readonly AvatarId Jahoda = 10000124;
|
||||
public static readonly AvatarId Columbina = 10000125;
|
||||
public static readonly AvatarId Zibai = 10000126;
|
||||
public static readonly AvatarId Illuga = 10000127;
|
||||
|
||||
private static readonly FrozenSet<AvatarId> StandardWishIds =
|
||||
[
|
||||
|
||||
@@ -22,9 +22,8 @@ internal static class WeaponIds
|
||||
11401U, 11402U, 11403U, 11405U,
|
||||
12401U, 12402U, 12403U, 12405U,
|
||||
13401U, 13407U,
|
||||
14401U, 14402U, 14403U, 14409U,
|
||||
15401U, 15402U, 15403U, 15405U,
|
||||
15434U
|
||||
14401U, 14402U, 14403U, 14409U, 14433U, 14434U,
|
||||
15401U, 15402U, 15403U, 15405U, 15434U
|
||||
];
|
||||
|
||||
public static readonly FrozenSet<WeaponId> OrangeStandardWishIds =
|
||||
@@ -34,7 +33,8 @@ internal static class WeaponIds
|
||||
13502U, 13505U,
|
||||
14501U, 14502U,
|
||||
15501U, 15502U,
|
||||
15515U, 15518U
|
||||
15515U, 11518U,
|
||||
14522U, 11519U
|
||||
];
|
||||
|
||||
public static bool IsOrangeStandardWish(in WeaponId weaponId)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<Package
|
||||
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
|
||||
@@ -13,7 +13,7 @@
|
||||
<Identity
|
||||
Name="60568DGPStudio.SnapHutao"
|
||||
Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
|
||||
Version="1.17.1.0" />
|
||||
Version="1.18.4.0" />
|
||||
|
||||
<Properties>
|
||||
<DisplayName>Snap Hutao</DisplayName>
|
||||
|
||||
@@ -1208,6 +1208,12 @@
|
||||
<data name="ServiceYaeWaitForGameResponseMessage" xml:space="preserve">
|
||||
<value>正在等待游戏数据</value>
|
||||
</data>
|
||||
<data name="ServiceThirdPartyToolNoExecutableFound" xml:space="preserve">
|
||||
<value>未找到可执行文件</value>
|
||||
</data>
|
||||
<data name="ServiceThirdPartyToolFileNotFound" xml:space="preserve">
|
||||
<value>文件不存在：{0}</value>
|
||||
</data>
|
||||
<data name="UIViewMainTitleBarBackgroundActivityAction" xml:space="preserve">
|
||||
<value>后台任务</value>
|
||||
</data>
|
||||
@@ -1586,6 +1592,12 @@
|
||||
<data name="ViewDialogLaunchGamePackageConvertTitle" xml:space="preserve">
|
||||
<value>正在转换客户端</value>
|
||||
</data>
|
||||
<data name="ViewDialogThirdPartyToolDescription" xml:space="preserve">
|
||||
<value>工具描述：</value>
|
||||
</data>
|
||||
<data name="ViewDialogThirdPartyToolLaunch" xml:space="preserve">
|
||||
<value>启动</value>
|
||||
</data>
|
||||
<data name="ViewDialogQRCodeTitle" xml:space="preserve">
|
||||
<value>使用米游社扫描二维码</value>
|
||||
</data>
|
||||
@@ -2916,6 +2928,9 @@
|
||||
<data name="ViewPageLaunchGameInjectionHeader" xml:space="preserve">
|
||||
<value>注入</value>
|
||||
</data>
|
||||
<data name="ViewPageLaunchGameThirdPartyTools" xml:space="preserve">
|
||||
<value>第三方注入工具：</value>
|
||||
</data>
|
||||
<data name="ViewPageLaunchGameIslandConnected" xml:space="preserve">
|
||||
<value>已连接到游戏，更改设置将会动态反映到游戏中</value>
|
||||
</data>
|
||||
|
||||
@@ -24,8 +24,10 @@ internal static class AvatarViewBuilderExtension
|
||||
{
|
||||
if (detailedCharacter.Costumes is [{ Id: { } id }, ..])
|
||||
{
|
||||
MetadataCostume costume = avatar.Costumes.Single(c => c.Id == id);
|
||||
MetadataCostume? costume = avatar.Costumes.SingleOrDefault(c => c.Id == id);
|
||||
|
||||
if (costume != null)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(costume.FrontIcon);
|
||||
ArgumentNullException.ThrowIfNull(costume.SideIcon);
|
||||
|
||||
@@ -34,6 +36,13 @@ internal static class AvatarViewBuilderExtension
|
||||
builder.View.SideIcon = AvatarIconConverter.IconNameToUri(costume.SideIcon);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Costume not found in metadata, fallback to default avatar icon
|
||||
builder.View.Icon = AvatarIconConverter.IconNameToUri(avatar.Icon);
|
||||
builder.View.SideIcon = AvatarIconConverter.IconNameToUri(avatar.SideIcon);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
builder.View.Icon = AvatarIconConverter.IconNameToUri(avatar.Icon);
|
||||
builder.View.SideIcon = AvatarIconConverter.IconNameToUri(avatar.SideIcon);
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.Setting;
|
||||
using System.IO;
|
||||
|
||||
namespace Snap.Hutao.Service.Game.Island;
|
||||
|
||||
internal static class FpsConfigTest
|
||||
{
|
||||
// 测试用，手动更新FPS配置文件
|
||||
public static void TestConfigUpdate()
|
||||
{
|
||||
// 直接从LocalSetting读取当前FPS设置
|
||||
int currentFps = LocalSetting.Get(SettingKeys.LaunchTargetFps, 60);
|
||||
|
||||
// 配置文件路径
|
||||
string configPath = Path.Combine(AppContext.BaseDirectory, "fps_config.ini");
|
||||
|
||||
// 读取当前配置
|
||||
if (File.Exists(configPath))
|
||||
{
|
||||
string[] lines = File.ReadAllLines(configPath);
|
||||
int configFps = 60;
|
||||
|
||||
foreach (string line in lines)
|
||||
{
|
||||
if (line.StartsWith("FPS="))
|
||||
{
|
||||
configFps = int.Parse(line.Substring(4));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
System.Diagnostics.Debug.WriteLine($"Current FPS from LocalSetting: {currentFps}");
|
||||
System.Diagnostics.Debug.WriteLine($"Current FPS from config file: {configFps}");
|
||||
|
||||
if (currentFps != configFps)
|
||||
{
|
||||
// 更新配置文件
|
||||
for (int i = 0; i < lines.Length; i++)
|
||||
{
|
||||
if (lines[i].StartsWith("FPS="))
|
||||
{
|
||||
lines[i] = $"FPS={currentFps}";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
File.WriteAllLines(configPath, lines);
|
||||
System.Diagnostics.Debug.WriteLine($"Updated config file with FPS: {currentFps}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,550 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.Diagnostics;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Core.Setting;
|
||||
using Snap.Hutao.Service.Game.FileSystem;
|
||||
using Snap.Hutao.Service.Game.Launching.Context;
|
||||
using Snap.Hutao.Web.Hutao;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace Snap.Hutao.Service.Game.Island;
|
||||
|
||||
internal sealed class GameFpsUnlockInterop : IGameIslandInterop, IDisposable
|
||||
{
|
||||
private const string UnlockerExecutableName = "unlockfps.exe";
|
||||
private const string UnlockerConfigName = "fps_config.ini";
|
||||
|
||||
private readonly bool resume;
|
||||
|
||||
private string? unlockerPath;
|
||||
private string? gamePath;
|
||||
private Process? unlockerProcess;
|
||||
|
||||
public GameFpsUnlockInterop(bool resume)
|
||||
{
|
||||
this.resume = resume;
|
||||
}
|
||||
|
||||
public async ValueTask BeforeAsync(BeforeLaunchExecutionContext context)
|
||||
{
|
||||
if (resume)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// 准备 unlocker.exe 到可写的应用数据目录
|
||||
await PrepareUnlockerToDataDirectoryAsync().ConfigureAwait(false);
|
||||
|
||||
// 从应用数据目录获取 unlocker.exe 路径
|
||||
unlockerPath = Path.Combine(HutaoRuntime.DataDirectory, UnlockerExecutableName);
|
||||
|
||||
if (!File.Exists(unlockerPath))
|
||||
{
|
||||
throw HutaoException.InvalidOperation("未找到unlockfps.exe文件，请将genshin-fps-unlock-master编译后的unlockfps.exe放置在Snap.Hutao同目录下");
|
||||
}
|
||||
|
||||
// 添加到 Windows Defender 排除项（需要管理员权限）
|
||||
await AddToDefenderExclusionAsync(unlockerPath).ConfigureAwait(false);
|
||||
|
||||
// 获取游戏路径
|
||||
gamePath = context.FileSystem.GameFilePath;
|
||||
|
||||
// 验证游戏路径
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Game path from Snap.Hutao: {gamePath}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
|
||||
|
||||
if (!File.Exists(gamePath))
|
||||
{
|
||||
throw HutaoException.InvalidOperation($"游戏文件不存在: {gamePath}");
|
||||
}
|
||||
|
||||
// 创建配置文件
|
||||
await CreateUnlockerConfigAsync(context).ConfigureAwait(false);
|
||||
|
||||
// 启动解锁器进程
|
||||
await StartUnlockerProcessAsync(context, CancellationToken.None).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public async ValueTask WaitForExitAsync(LaunchExecutionContext context, CancellationToken token = default)
|
||||
{
|
||||
if (resume)
|
||||
{
|
||||
// 恢复模式下，尝试连接已存在的解锁器进程
|
||||
await MonitorExistingUnlockerAsync(context, token).ConfigureAwait(false);
|
||||
return;
|
||||
}
|
||||
|
||||
// 监控解锁器进程状态（解锁器会自动启动并监控游戏）
|
||||
await MonitorUnlockerProcessAsync(context, token).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private async ValueTask PrepareUnlockerToDataDirectoryAsync()
|
||||
{
|
||||
// 数据目录中的目标路径
|
||||
string dataDirectoryUnlockerPath = Path.Combine(HutaoRuntime.DataDirectory, UnlockerExecutableName);
|
||||
|
||||
// 安装目录中的源路径
|
||||
string installDirectoryUnlockerPath = Path.Combine(AppContext.BaseDirectory, UnlockerExecutableName);
|
||||
|
||||
// 检查是否需要复制
|
||||
bool needsCopy = false;
|
||||
if (!File.Exists(dataDirectoryUnlockerPath))
|
||||
{
|
||||
needsCopy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 比较文件大小和修改时间，如果不同则更新
|
||||
var sourceInfo = new FileInfo(installDirectoryUnlockerPath);
|
||||
var targetInfo = new FileInfo(dataDirectoryUnlockerPath);
|
||||
|
||||
if (sourceInfo.Length != targetInfo.Length || sourceInfo.LastWriteTime > targetInfo.LastWriteTime)
|
||||
{
|
||||
needsCopy = true;
|
||||
}
|
||||
}
|
||||
|
||||
// 如果需要复制，执行复制操作
|
||||
if (needsCopy)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Directory.CreateDirectory(HutaoRuntime.DataDirectory);
|
||||
|
||||
|
||||
File.Copy(installDirectoryUnlockerPath, dataDirectoryUnlockerPath, true);
|
||||
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"unlockfps.exe 已复制到数据目录: {dataDirectoryUnlockerPath}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw HutaoException.InvalidOperation($"复制 unlockfps.exe 到数据目录失败: {ex.Message}", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask AddToDefenderExclusionAsync(string executablePath)
|
||||
{
|
||||
try
|
||||
{
|
||||
// 检查是否已经在排除项中
|
||||
ProcessStartInfo checkInfo = new()
|
||||
{
|
||||
FileName = "powershell.exe",
|
||||
Arguments = $"-Command \"(Get-MpPreference).ExclusionPath -split '\"' | Where-Object {{ $_ -eq '{executablePath}' }}\"",
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
RedirectStandardOutput = true,
|
||||
WindowStyle = ProcessWindowStyle.Hidden,
|
||||
};
|
||||
|
||||
using (Process checkProcess = new() { StartInfo = checkInfo })
|
||||
{
|
||||
checkProcess.Start();
|
||||
string output = await checkProcess.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
|
||||
await checkProcess.WaitForExitAsync().ConfigureAwait(false);
|
||||
|
||||
// 如果输出包含路径，说明已经在排除项中
|
||||
if (!string.IsNullOrWhiteSpace(output) && output.Trim().Contains(executablePath))
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"unlockfps.exe 已在 Windows Defender 排除项中",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 不在排除项中，尝试添加
|
||||
ProcessStartInfo addInfo = new()
|
||||
{
|
||||
FileName = "powershell.exe",
|
||||
Arguments = $"-Command \"Add-MpPreference -ExclusionPath '{executablePath}'\"",
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
RedirectStandardOutput = true,
|
||||
RedirectStandardError = true,
|
||||
WindowStyle = ProcessWindowStyle.Hidden,
|
||||
Verb = "runas", // 请求管理员权限
|
||||
};
|
||||
|
||||
using (Process addProcess = new() { StartInfo = addInfo })
|
||||
{
|
||||
addProcess.Start();
|
||||
string output = await addProcess.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
|
||||
string error = await addProcess.StandardError.ReadToEndAsync().ConfigureAwait(false);
|
||||
await addProcess.WaitForExitAsync().ConfigureAwait(false);
|
||||
|
||||
if (addProcess.ExitCode == 0)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"unlockfps.exe 已成功添加到 Windows Defender 排除项",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"无法添加到 Windows Defender 排除项（需要管理员权限）: {error ?? output}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Warning);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"添加 Windows Defender 排除项失败: {ex.Message}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Warning);
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask CreateUnlockerConfigAsync(BeforeLaunchExecutionContext context)
|
||||
{
|
||||
if (string.IsNullOrEmpty(gamePath))
|
||||
{
|
||||
throw HutaoException.NotSupported("游戏路径未初始化");
|
||||
}
|
||||
|
||||
// 在应用数据目录中创建配置文件
|
||||
string unlockerConfigPath = Path.Combine(HutaoRuntime.DataDirectory, UnlockerConfigName);
|
||||
int targetFps = context.LaunchOptions.TargetFps.Value;
|
||||
|
||||
string configContent = $"[Setting]\nPath={gamePath}\nFPS={targetFps}";
|
||||
|
||||
// 添加重试机制处理可能的权限问题
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
await File.WriteAllTextAsync(unlockerConfigPath, configContent).ConfigureAwait(false);
|
||||
break; // 成功写入，退出循环
|
||||
}
|
||||
catch (UnauthorizedAccessException)
|
||||
{
|
||||
if (i == 2)
|
||||
{
|
||||
throw HutaoException.InvalidOperation($"无法写入配置文件 {unlockerConfigPath}，请检查权限");
|
||||
}
|
||||
await Task.Delay(500).ConfigureAwait(false);
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
if (i == 2)
|
||||
{
|
||||
throw HutaoException.InvalidOperation($"无法写入配置文件 {unlockerConfigPath}，文件可能被占用");
|
||||
}
|
||||
await Task.Delay(500).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask StartUnlockerProcessAsync(BeforeLaunchExecutionContext context, CancellationToken token)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
string configPath = Path.Combine(HutaoRuntime.DataDirectory, UnlockerConfigName);
|
||||
if (!File.Exists(configPath))
|
||||
{
|
||||
throw HutaoException.InvalidOperation($"配置文件不存在: {configPath}");
|
||||
}
|
||||
|
||||
|
||||
string configContent = await File.ReadAllTextAsync(configPath).ConfigureAwait(false);
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Starting unlocker with config: {configContent}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
|
||||
// 构建游戏启动参数，传递给 unlockfps.exe
|
||||
string gameArguments = BuildGameArguments(context);
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Game arguments for unlocker: {gameArguments}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
|
||||
ProcessStartInfo startInfo = new()
|
||||
{
|
||||
FileName = unlockerPath,
|
||||
WorkingDirectory = Path.GetDirectoryName(unlockerPath),
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
RedirectStandardOutput = true,
|
||||
RedirectStandardError = true,
|
||||
WindowStyle = ProcessWindowStyle.Normal,
|
||||
Arguments = gameArguments,
|
||||
};
|
||||
|
||||
unlockerProcess = new Process { StartInfo = startInfo };
|
||||
|
||||
|
||||
unlockerProcess.Start();
|
||||
|
||||
|
||||
Task outputTask = Task.Run(async () =>
|
||||
{
|
||||
while (!unlockerProcess.StandardOutput.EndOfStream)
|
||||
{
|
||||
string line = await unlockerProcess.StandardOutput.ReadLineAsync().ConfigureAwait(false);
|
||||
if (line != null)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Unlocker output: {line}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Task errorTask = Task.Run(async () =>
|
||||
{
|
||||
while (!unlockerProcess.StandardError.EndOfStream)
|
||||
{
|
||||
string line = await unlockerProcess.StandardError.ReadLineAsync().ConfigureAwait(false);
|
||||
if (line != null)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Unlocker error: {line}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Error);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 等待解锁器初始化
|
||||
await Task.Delay(5000).ConfigureAwait(false);
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw HutaoException.Throw($"启动FPS解锁器失败: {ex.Message}", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private string BuildGameArguments(BeforeLaunchExecutionContext context)
|
||||
{
|
||||
LaunchOptions launchOptions = context.LaunchOptions;
|
||||
|
||||
if (!launchOptions.AreCommandLineArgumentsEnabled.Value)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
// 获取米游社登录Ticket
|
||||
string? authTicket = default;
|
||||
bool useAuthTicket = launchOptions.UsingHoyolabAccount.Value
|
||||
&& context.TryGetOption(LaunchExecutionOptionsKey.LoginAuthTicket, out authTicket)
|
||||
&& !string.IsNullOrEmpty(authTicket);
|
||||
|
||||
StringBuilder arguments = new();
|
||||
|
||||
// 构建与 GameProcessFactory.CreateForDefault 相同的命令行参数
|
||||
if (launchOptions.IsBorderless.Value)
|
||||
{
|
||||
arguments.Append(" -popupwindow");
|
||||
}
|
||||
|
||||
if (launchOptions.IsExclusive.Value)
|
||||
{
|
||||
arguments.Append(" -window-mode exclusive");
|
||||
}
|
||||
|
||||
arguments.Append($" -screen-fullscreen {(launchOptions.IsFullScreen.Value ? "1" : "0")}");
|
||||
|
||||
if (launchOptions.IsScreenWidthEnabled.Value)
|
||||
{
|
||||
arguments.Append($" -screen-width {launchOptions.ScreenWidth.Value}");
|
||||
}
|
||||
|
||||
if (launchOptions.IsScreenHeightEnabled.Value)
|
||||
{
|
||||
arguments.Append($" -screen-height {launchOptions.ScreenHeight.Value}");
|
||||
}
|
||||
|
||||
if (launchOptions.IsMonitorEnabled.Value)
|
||||
{
|
||||
arguments.Append($" -monitor {launchOptions.Monitor.Value?.Value ?? 1}");
|
||||
}
|
||||
|
||||
if (launchOptions.IsPlatformTypeEnabled.Value)
|
||||
{
|
||||
arguments.Append($" -platform_type {launchOptions.PlatformType.Value:G}");
|
||||
}
|
||||
|
||||
// 添加米游社登录参数
|
||||
if (useAuthTicket)
|
||||
{
|
||||
arguments.Append($" login_auth_ticket={authTicket}");
|
||||
}
|
||||
|
||||
return arguments.ToString();
|
||||
}
|
||||
|
||||
private async ValueTask MonitorExistingUnlockerAsync(LaunchExecutionContext context, CancellationToken token)
|
||||
{
|
||||
// 恢复模式下，检查是否有解锁器进程在运行
|
||||
Process[] processes = Process.GetProcessesByName(Path.GetFileNameWithoutExtension(UnlockerExecutableName));
|
||||
if (processes.Length == 0)
|
||||
{
|
||||
// 没有找到解锁器进程，但游戏在运行，这是正常情况
|
||||
return;
|
||||
}
|
||||
|
||||
unlockerProcess = processes[0];
|
||||
await MonitorUnlockerProcessAsync(context, token).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private async ValueTask MonitorUnlockerProcessAsync(LaunchExecutionContext context, CancellationToken token)
|
||||
{
|
||||
if (unlockerProcess is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
using (PeriodicTimer timer = new(TimeSpan.FromSeconds(2)))
|
||||
{
|
||||
while (await timer.WaitForNextTickAsync(token).ConfigureAwait(false))
|
||||
{
|
||||
// 检查解锁器进程状态
|
||||
if (unlockerProcess.HasExited)
|
||||
{
|
||||
// 解锁器已退出，这意味着游戏也已退出
|
||||
break;
|
||||
}
|
||||
|
||||
// 同步FPS设置（如果用户在运行时修改了）
|
||||
await SyncFpsSettingsAsync(context.LaunchOptions).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
// 确保解锁器进程已清理
|
||||
CleanupUnlockerProcess();
|
||||
}
|
||||
|
||||
private async ValueTask SyncFpsSettingsAsync(LaunchOptions launchOptions)
|
||||
{
|
||||
if (unlockerProcess is null || unlockerProcess.HasExited)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
string configPath = Path.Combine(HutaoRuntime.DataDirectory, UnlockerConfigName);
|
||||
if (File.Exists(configPath))
|
||||
{
|
||||
string[] lines = await File.ReadAllLinesAsync(configPath).ConfigureAwait(false);
|
||||
int currentFps = launchOptions.TargetFps.Value;
|
||||
|
||||
bool needsUpdate = false;
|
||||
for (int i = 0; i < lines.Length; i++)
|
||||
{
|
||||
if (lines[i].StartsWith("FPS="))
|
||||
{
|
||||
int configFps = int.Parse(lines[i].Substring(4));
|
||||
if (configFps != currentFps)
|
||||
{
|
||||
lines[i] = $"FPS={currentFps}";
|
||||
needsUpdate = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (needsUpdate)
|
||||
{
|
||||
// 添加重试机制处理可能的权限问题
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
await File.WriteAllLinesAsync(configPath, lines).ConfigureAwait(false);
|
||||
break; // 成功写入，退出循环
|
||||
}
|
||||
catch (UnauthorizedAccessException)
|
||||
{
|
||||
if (i == 2) // 最后一次尝试
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"无法写入配置文件 {configPath}，请检查权限",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Error);
|
||||
return;
|
||||
}
|
||||
await Task.Delay(500).ConfigureAwait(false); // 等待500ms后重试
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
if (i == 2) // 最后一次尝试
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"无法写入配置文件 {configPath}，文件可能被占用",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Error);
|
||||
return;
|
||||
}
|
||||
await Task.Delay(500).ConfigureAwait(false); // 等待500ms后重试
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 同步配置失败，记录但不影响主流程
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Failed to sync FPS settings: {ex.Message}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Warning);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void CleanupUnlockerProcess()
|
||||
{
|
||||
if (unlockerProcess is not null && !unlockerProcess.HasExited)
|
||||
{
|
||||
try
|
||||
{
|
||||
unlockerProcess.Kill();
|
||||
unlockerProcess.WaitForExit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 忽略清理过程中的错误
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Failed to cleanup unlocker process: {ex.Message}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Warning);
|
||||
}
|
||||
finally
|
||||
{
|
||||
unlockerProcess.Dispose();
|
||||
unlockerProcess = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
CleanupUnlockerProcess();
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,8 @@ using Snap.Hutao.Service.Game.FileSystem;
|
||||
using Snap.Hutao.Service.Game.PathAbstraction;
|
||||
using Snap.Hutao.Win32;
|
||||
using System.Collections.Immutable;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Snap.Hutao.Service.Game;
|
||||
|
||||
@@ -106,7 +108,7 @@ internal sealed partial class LaunchOptions : DbStoreOptions, IRestrictedGamePat
|
||||
public IObservableProperty<bool> IsSetTargetFrameRateEnabled { get => field ??= CreateProperty(SettingKeys.LaunchIsSetTargetFrameRateEnabled, true); }
|
||||
|
||||
[field: MaybeNull]
|
||||
public IObservableProperty<int> TargetFps { get => field ??= CreateProperty(SettingKeys.LaunchTargetFps, InitializeTargetFpsWithScreenFps); }
|
||||
public IObservableProperty<int> TargetFps { get => field ??= CreateProperty(SettingKeys.LaunchTargetFps, InitializeTargetFpsWithScreenFps).WithValueChangedCallback(OnTargetFpsChanged); }
|
||||
|
||||
[field: MaybeNull]
|
||||
public IObservableProperty<bool> RemoveOpenTeamProgress { get => field ??= CreateProperty(SettingKeys.LaunchRemoveOpenTeamProgress, false); }
|
||||
@@ -165,6 +167,98 @@ internal sealed partial class LaunchOptions : DbStoreOptions, IRestrictedGamePat
|
||||
return HutaoNative.Instance.MakeDeviceCapabilities().GetPrimaryScreenVerticalRefreshRate();
|
||||
}
|
||||
|
||||
private static void OnTargetFpsChanged(int newFps)
|
||||
{
|
||||
// 异步更新配置文件，避免阻塞UI线程
|
||||
Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
string configPath = Path.Combine(AppContext.BaseDirectory, "fps_config.ini");
|
||||
|
||||
|
||||
if (File.Exists(configPath))
|
||||
{
|
||||
string[] lines = await File.ReadAllLinesAsync(configPath).ConfigureAwait(false);
|
||||
bool needsUpdate = true;
|
||||
|
||||
|
||||
foreach (string line in lines)
|
||||
{
|
||||
if (line.StartsWith("FPS="))
|
||||
{
|
||||
int configFps = int.Parse(line.Substring(4));
|
||||
if (configFps == newFps)
|
||||
{
|
||||
needsUpdate = false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// 更新配置文件
|
||||
if (needsUpdate)
|
||||
{
|
||||
for (int i = 0; i < lines.Length; i++)
|
||||
{
|
||||
if (lines[i].StartsWith("FPS="))
|
||||
{
|
||||
lines[i] = $"FPS={newFps}";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
await File.WriteAllLinesAsync(configPath, lines).ConfigureAwait(false);
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Updated fps_config.ini with new FPS: {newFps}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Info);
|
||||
break;
|
||||
}
|
||||
catch (UnauthorizedAccessException)
|
||||
{
|
||||
if (i == 2)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"无法写入配置文件 {configPath}，请检查权限",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Error);
|
||||
return;
|
||||
}
|
||||
await Task.Delay(500).ConfigureAwait(false);
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
if (i == 2)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"无法写入配置文件 {configPath}，文件可能被占用",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Error);
|
||||
return;
|
||||
}
|
||||
await Task.Delay(500).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 记录错误
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Failed to update fps_config.ini: {ex.Message}",
|
||||
category: "fps.unlocker",
|
||||
level: Sentry.BreadcrumbLevel.Warning);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static ImmutableArray<NameValue<int>> InitializeMonitors()
|
||||
{
|
||||
ImmutableArray<NameValue<int>>.Builder monitors = ImmutableArray.CreateBuilder<NameValue<int>>();
|
||||
|
||||
@@ -8,10 +8,10 @@ using Snap.Hutao.Service.Notification;
|
||||
|
||||
namespace Snap.Hutao.Service.Game.Launching.Handler;
|
||||
|
||||
internal sealed class LaunchExecutionGameIslandHandler : AbstractLaunchExecutionHandler
|
||||
internal sealed class LaunchExecutionGameIslandHandler : AbstractLaunchExecutionHandler, IDisposable
|
||||
{
|
||||
private readonly bool resume;
|
||||
private GameIslandInterop? interop;
|
||||
private GameFpsUnlockInterop? interop;
|
||||
|
||||
public LaunchExecutionGameIslandHandler(bool resume)
|
||||
{
|
||||
@@ -63,4 +63,9 @@ internal sealed class LaunchExecutionGameIslandHandler : AbstractLaunchExecution
|
||||
GameLifeCycle.IsIslandConnected.Value = false;
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
interop?.Dispose();
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,20 @@ internal sealed class LaunchExecutionGameProcessStartHandler : AbstractLaunchExe
|
||||
{
|
||||
try
|
||||
{
|
||||
// 对于suspended进程（Yae注入模式、Island模式），需要先Start()创建进程，然后ResumeMainThread()恢复主线程
|
||||
// 对于正常启动的进程（ShellExecute、DiagnosticsProcess），只调用Start()
|
||||
context.Process.Start();
|
||||
|
||||
// 尝试恢复主线程（适用于suspended进程）
|
||||
try
|
||||
{
|
||||
context.Process.ResumeMainThread();
|
||||
}
|
||||
catch (HutaoException ex) when (ex.Message.Contains("ResumeMainThread is not supported"))
|
||||
{
|
||||
// ResumeMainThread不支持，说明是正常启动的进程（DiagnosticsProcess），忽略此错误
|
||||
}
|
||||
|
||||
await context.TaskContext.SwitchToMainThreadAsync();
|
||||
GameLifeCycle.IsGameRunningProperty.Value = true;
|
||||
}
|
||||
|
||||
@@ -2,8 +2,11 @@
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.Diagnostics;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Core.LifeCycle.InterProcess.Yae;
|
||||
using Snap.Hutao.Factory.Process;
|
||||
using Snap.Hutao.Service.Game;
|
||||
using Snap.Hutao.Service.Game.Island;
|
||||
using Snap.Hutao.Service.Game.Launching.Context;
|
||||
using Snap.Hutao.Service.Yae.Achievement;
|
||||
@@ -32,36 +35,57 @@ internal sealed class LaunchExecutionYaeNamedPipeHandler : AbstractLaunchExecuti
|
||||
HutaoException.NotSupported(SH.ServiceGameLaunchingHandlerEmbeddedYaeClientNotElevated);
|
||||
}
|
||||
|
||||
if (!context.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
context.Process.Kill();
|
||||
HutaoException.NotSupported(SH.ServiceGameLaunchingHandlerEmbeddedYaeIslandNotEnabled);
|
||||
return;
|
||||
}
|
||||
|
||||
string dataFolderYaePath = Path.Combine(HutaoRuntime.DataDirectory, "YaeAchievementLib.dll");
|
||||
InstalledLocation.CopyFileFromApplicationUri("ms-appx:///YaeAchievementLib.dll", dataFolderYaePath);
|
||||
|
||||
// 直接使用创建的游戏进程
|
||||
int actualProcessId = context.Process.Id;
|
||||
if (actualProcessId == 0)
|
||||
{
|
||||
throw HutaoException.Throw("游戏进程未正确创建");
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
DllInjectionUtilities.InjectUsingRemoteThread(dataFolderYaePath, "YaeMain", context.Process.Id);
|
||||
DllInjectionUtilities.InjectUsingRemoteThread(dataFolderYaePath, "YaeMain", actualProcessId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Windows Defender Application Control
|
||||
if (HutaoNative.IsWin32(ex.HResult, WIN32_ERROR.ERROR_SYSTEM_INTEGRITY_POLICY_VIOLATION))
|
||||
{
|
||||
context.Process.Kill();
|
||||
throw HutaoException.Throw(SH.ServiceGameLaunchingHandlerEmbeddedYaeErrorSystemIntegrityPolicyViolation);
|
||||
}
|
||||
|
||||
throw;
|
||||
// Access Denied (0x80070005) - 权限不足，无法在远程进程中分配内存
|
||||
if (ex.HResult == unchecked((int)0x80070005))
|
||||
{
|
||||
throw HutaoException.Throw($"无法在游戏进程中注入 DLL (访问被拒绝)。\n\n" +
|
||||
$"可能的原因：\n" +
|
||||
$"1. 游戏进程的完整性级别高于 Snap Hutao\n" +
|
||||
$"2. Windows Defender 或其他安全软件阻止了注入\n" +
|
||||
$"解决方法：\n" +
|
||||
$"1. 检查 Windows Defender 设置，将 Snap Hutao 添加到排除列表\n" +
|
||||
$"2. 以管理员身份运行 Snap Hutao\n" +
|
||||
$"3. 检查是否有其他安全软件（如 360、火绒等）干扰");
|
||||
}
|
||||
|
||||
// 游戏进程由直接启动，已经是运行状态
|
||||
// InjectUsingWindowsHook2 需要手动恢复主线程，但 DiagnosticsProcess 不支持 ResumeMainThread
|
||||
// 这里不使用 InjectUsingWindowsHook2
|
||||
throw new InvalidOperationException($"无法注入 DLL: {ex.Message}. 请确保没有启用 Windows Defender Application Control 或其他安全限制。", ex);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// 获取游戏进程用于命名管道服务器
|
||||
IProcess actualProcess = ProcessFactory.TryGetById(actualProcessId, out IProcess? process)
|
||||
? process
|
||||
: throw HutaoException.Throw($"无法获取进程 ID {actualProcessId}");
|
||||
|
||||
// 已经是运行状态，不需要恢复主线程
|
||||
#pragma warning disable CA2007
|
||||
await using (YaeNamedPipeServer server = new(context.ServiceProvider, context.Process, config))
|
||||
await using (YaeNamedPipeServer server = new(context.ServiceProvider, actualProcess, config, supportsResumeMainThread: false))
|
||||
#pragma warning restore CA2007
|
||||
{
|
||||
receiver.Array = await server.GetDataArrayAsync().ConfigureAwait(false);
|
||||
@@ -69,7 +93,6 @@ internal sealed class LaunchExecutionYaeNamedPipeHandler : AbstractLaunchExecuti
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
context.Process.Kill();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
using Snap.Hutao.Core.Diagnostics;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Factory.Progress;
|
||||
using Snap.Hutao.Factory.Process;
|
||||
using Snap.Hutao.Service.Game.FileSystem;
|
||||
using Snap.Hutao.Service.Game.Launching.Context;
|
||||
using Snap.Hutao.Service.Game.Launching.Handler;
|
||||
@@ -20,6 +21,8 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
private bool invoked;
|
||||
|
||||
protected ImmutableArray<ILaunchExecutionHandler> Handlers { get; init; }
|
||||
protected virtual bool ShouldWaitForProcessExit { get => true; }
|
||||
protected virtual bool ShouldSpinWaitGameExitAfterInvoke { get => true; }
|
||||
|
||||
public static bool Invoking()
|
||||
{
|
||||
@@ -39,7 +42,7 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
finally
|
||||
{
|
||||
Invokers.TryRemove(this, out _);
|
||||
if (!Invoking())
|
||||
if (!Invoking() && ShouldSpinWaitGameExitAfterInvoke)
|
||||
{
|
||||
await GameLifeCycle.SpinWaitGameExitAsync(taskContext).ConfigureAwait(false);
|
||||
}
|
||||
@@ -100,9 +103,16 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
|
||||
fileSystemReference.Exchange(beforeContext.FileSystem);
|
||||
|
||||
using (IProcess? process = CreateProcess(beforeContext))
|
||||
// unlockfps.exe会负责启动游戏
|
||||
IProcess? process = null;
|
||||
if (!beforeContext.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
if (process is null)
|
||||
process = CreateProcess(beforeContext);
|
||||
}
|
||||
|
||||
using (process)
|
||||
{
|
||||
if (process is null && !beforeContext.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -114,7 +124,7 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
TaskContext = taskContext,
|
||||
Messenger = context.ServiceProvider.GetRequiredService<IMessenger>(),
|
||||
LaunchOptions = context.LaunchOptions,
|
||||
Process = process,
|
||||
Process = process ?? new NullProcess(),
|
||||
IsOversea = targetScheme.IsOversea,
|
||||
};
|
||||
|
||||
@@ -123,7 +133,8 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
await handler.ExecuteAsync(executionContext).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
if (process.IsRunning)
|
||||
// 只有在没有启用Island且进程存在时才等待退出
|
||||
if (ShouldWaitForProcessExit && process is { IsRunning: true })
|
||||
{
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseWaitingProcessExit));
|
||||
try
|
||||
@@ -139,6 +150,12 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (ShouldWaitForProcessExit && beforeContext.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseWaitingProcessExit));
|
||||
await taskContext.SwitchToBackgroundAsync();
|
||||
await Task.Delay(30000).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseProcessExited));
|
||||
|
||||
@@ -9,6 +9,9 @@ namespace Snap.Hutao.Service.Game.Launching.Invoker;
|
||||
|
||||
internal sealed class ConvertOnlyLaunchExecutionInvoker : AbstractLaunchExecutionInvoker
|
||||
{
|
||||
protected override bool ShouldWaitForProcessExit { get => false; }
|
||||
protected override bool ShouldSpinWaitGameExitAfterInvoke { get => false; }
|
||||
|
||||
public ConvertOnlyLaunchExecutionInvoker()
|
||||
{
|
||||
Handlers =
|
||||
|
||||
@@ -16,8 +16,8 @@ internal sealed class DefaultLaunchExecutionInvoker : AbstractLaunchExecutionInv
|
||||
new LaunchExecutionGameResourceHandler(convertOnly: false),
|
||||
new LaunchExecutionGameIdentityHandler(),
|
||||
new LaunchExecutionWindowsHDRHandler(),
|
||||
new LaunchExecutionGameProcessStartHandler(),
|
||||
new LaunchExecutionGameIslandHandler(resume: false),
|
||||
new LaunchExecutionGameProcessStartHandler(),
|
||||
new LaunchExecutionOverlayHandler(),
|
||||
new LaunchExecutionStarwardPlayTimeStatisticsHandler(),
|
||||
new LaunchExecutionBetterGenshinImpactAutomationHandler()
|
||||
|
||||
@@ -2,9 +2,14 @@
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.Diagnostics;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Core.LifeCycle.InterProcess.Yae;
|
||||
using Snap.Hutao.Factory.Progress;
|
||||
using Snap.Hutao.Factory.Process;
|
||||
using Snap.Hutao.Service.Game.FileSystem;
|
||||
using Snap.Hutao.Service.Game.Launching.Context;
|
||||
using Snap.Hutao.Service.Game.Launching.Handler;
|
||||
using Snap.Hutao.Service.Game.Package;
|
||||
using Snap.Hutao.Service.Yae.Achievement;
|
||||
|
||||
namespace Snap.Hutao.Service.Game.Launching.Invoker;
|
||||
@@ -28,4 +33,99 @@ internal sealed class YaeLaunchExecutionInvoker : AbstractLaunchExecutionInvoker
|
||||
{
|
||||
return GameProcessFactory.CreateForEmbeddedYae(beforeContext);
|
||||
}
|
||||
|
||||
protected override bool ShouldWaitForProcessExit { get => false; }
|
||||
|
||||
protected override bool ShouldSpinWaitGameExitAfterInvoke { get => false; }
|
||||
|
||||
public async ValueTask InvokeAsync(LaunchExecutionInvocationContext context)
|
||||
{
|
||||
ITaskContext taskContext = context.ServiceProvider.GetRequiredService<ITaskContext>();
|
||||
|
||||
string lockTrace = $"{GetType().Name}.{nameof(InvokeAsync)}";
|
||||
context.LaunchOptions.TryGetGameFileSystem(lockTrace, out IGameFileSystem? gameFileSystem);
|
||||
ArgumentNullException.ThrowIfNull(gameFileSystem);
|
||||
|
||||
using (GameFileSystemReference fileSystemReference = new(gameFileSystem))
|
||||
{
|
||||
if (context.ViewModel.TargetScheme is not { } targetScheme)
|
||||
{
|
||||
throw HutaoException.InvalidOperation(SH.ViewModelLaunchGameSchemeNotSelected);
|
||||
}
|
||||
|
||||
if (context.ViewModel.CurrentScheme is not { } currentScheme)
|
||||
{
|
||||
throw HutaoException.InvalidOperation(SH.ServiceGameLaunchExecutionCurrentSchemeNull);
|
||||
}
|
||||
|
||||
IProgress<LaunchStatus?> progress = CreateStatusProgress(context.ServiceProvider);
|
||||
|
||||
BeforeLaunchExecutionContext beforeContext = new()
|
||||
{
|
||||
ViewModel = context.ViewModel,
|
||||
Progress = progress,
|
||||
ServiceProvider = context.ServiceProvider,
|
||||
TaskContext = taskContext,
|
||||
FileSystem = fileSystemReference,
|
||||
HoyoPlay = context.ServiceProvider.GetRequiredService<IHoyoPlayService>(),
|
||||
Messenger = context.ServiceProvider.GetRequiredService<IMessenger>(),
|
||||
LaunchOptions = context.LaunchOptions,
|
||||
CurrentScheme = currentScheme,
|
||||
TargetScheme = targetScheme,
|
||||
Identity = context.Identity,
|
||||
};
|
||||
|
||||
foreach (ILaunchExecutionHandler handler in Handlers)
|
||||
{
|
||||
await handler.BeforeAsync(beforeContext).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
fileSystemReference.Exchange(beforeContext.FileSystem);
|
||||
|
||||
// Yae注入功能不依赖unlockfps.exe，总是创建游戏进程
|
||||
IProcess? process = CreateProcess(beforeContext);
|
||||
|
||||
using (process)
|
||||
{
|
||||
if (process is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
LaunchExecutionContext executionContext = new()
|
||||
{
|
||||
Progress = progress,
|
||||
ServiceProvider = context.ServiceProvider,
|
||||
TaskContext = taskContext,
|
||||
Messenger = context.ServiceProvider.GetRequiredService<IMessenger>(),
|
||||
LaunchOptions = context.LaunchOptions,
|
||||
Process = process,
|
||||
IsOversea = targetScheme.IsOversea,
|
||||
};
|
||||
|
||||
foreach (ILaunchExecutionHandler handler in Handlers)
|
||||
{
|
||||
await handler.ExecuteAsync(executionContext).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
AfterLaunchExecutionContext afterContext = new()
|
||||
{
|
||||
ServiceProvider = context.ServiceProvider,
|
||||
TaskContext = taskContext,
|
||||
};
|
||||
|
||||
foreach (ILaunchExecutionHandler handler in Handlers)
|
||||
{
|
||||
await handler.AfterAsync(afterContext).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static IProgress<LaunchStatus?> CreateStatusProgress(IServiceProvider serviceProvider)
|
||||
{
|
||||
IProgressFactory progressFactory = serviceProvider.GetRequiredService<IProgressFactory>();
|
||||
LaunchStatusOptions options = serviceProvider.GetRequiredService<LaunchStatusOptions>();
|
||||
return progressFactory.CreateForMainThread<LaunchStatus?, LaunchStatusOptions>(static (status, options) => options.LaunchStatus = status, options);
|
||||
}
|
||||
}
|
||||
@@ -47,6 +47,9 @@ internal sealed partial class HutaoAsAService : IHutaoAsAService
|
||||
}
|
||||
}
|
||||
|
||||
// Filter announcements by Distribution
|
||||
array = [.. array.Where(a => string.IsNullOrEmpty(a.Distribution) || a.Distribution == "Snap Hutao")]; // 请自行修改发行版名称
|
||||
|
||||
foreach (HutaoAnnouncement item in array)
|
||||
{
|
||||
item.DismissCommand = dismissCommand;
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
using Snap.Hutao.Web.ThirdPartyTool;
|
||||
using System.Collections.Immutable;
|
||||
|
||||
namespace Snap.Hutao.Service.ThirdPartyTool;
|
||||
|
||||
internal interface IThirdPartyToolService
|
||||
{
|
||||
/// <summary>
|
||||
/// 获取第三方工具列表
|
||||
/// </summary>
|
||||
/// <param name="token">取消令牌</param>
|
||||
/// <returns>工具列表</returns>
|
||||
ValueTask<ImmutableArray<ToolInfo>> GetToolsAsync(CancellationToken token = default);
|
||||
|
||||
/// <summary>
|
||||
/// 下载工具文件
|
||||
/// </summary>
|
||||
/// <param name="tool">工具信息</param>
|
||||
/// <param name="progress">进度报告</param>
|
||||
/// <param name="token">取消令牌</param>
|
||||
/// <returns>是否下载成功</returns>
|
||||
ValueTask<bool> DownloadToolAsync(ToolInfo tool, IProgress<double>? progress = null, CancellationToken token = default);
|
||||
|
||||
/// <summary>
|
||||
/// 启动工具
|
||||
/// </summary>
|
||||
/// <param name="tool">工具信息</param>
|
||||
/// <returns>是否启动成功</returns>
|
||||
ValueTask<bool> LaunchToolAsync(ToolInfo tool);
|
||||
|
||||
/// <summary>
|
||||
/// 检查工具是否已下载
|
||||
/// </summary>
|
||||
/// <param name="tool">工具信息</param>
|
||||
/// <returns>是否已下载</returns>
|
||||
bool IsToolDownloaded(ToolInfo tool);
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Service.Notification;
|
||||
using Snap.Hutao.Web.Request.Builder;
|
||||
using Snap.Hutao.Web.Request.Builder.Abstraction;
|
||||
using Snap.Hutao.Web.ThirdPartyTool;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
|
||||
namespace Snap.Hutao.Service.ThirdPartyTool;
|
||||
|
||||
[HttpClient(HttpClientConfiguration.Default)]
|
||||
[Service(ServiceLifetime.Singleton, typeof(IThirdPartyToolService))]
|
||||
internal sealed partial class ThirdPartyToolService : IThirdPartyToolService
|
||||
{
|
||||
private const string ApiBaseUrl = "https://htserver.wdg.cloudns.ch/api";
|
||||
private const string ToolsEndpoint = "/tools";
|
||||
|
||||
private readonly IHttpClientFactory httpClientFactory;
|
||||
private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
|
||||
private readonly IMessenger messenger;
|
||||
|
||||
[GeneratedConstructor]
|
||||
public partial ThirdPartyToolService(IServiceProvider serviceProvider, HttpClient httpClient);
|
||||
|
||||
public async ValueTask<ImmutableArray<ToolInfo>> GetToolsAsync(CancellationToken token = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
HttpClient httpClient = httpClientFactory.CreateClient();
|
||||
|
||||
// 添加日志
|
||||
SentrySdk.AddBreadcrumb($"Creating request to: {ApiBaseUrl}{ToolsEndpoint}", category: "ThirdPartyTool");
|
||||
|
||||
HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()
|
||||
.SetRequestUri($"{ApiBaseUrl}{ToolsEndpoint}")
|
||||
.Get();
|
||||
|
||||
SentrySdk.AddBreadcrumb($"Sending HTTP request", category: "ThirdPartyTool");
|
||||
|
||||
ToolApiResponse? response = await builder
|
||||
.SendAsync<ToolApiResponse>(httpClient, token)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
SentrySdk.AddBreadcrumb($"Request completed", category: "ThirdPartyTool");
|
||||
|
||||
if (response is null)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb("Response is null", category: "ThirdPartyTool");
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
|
||||
SentrySdk.AddBreadcrumb($"Response received: Code={response.Code}, Message={response.Message}, Data.Length={response.Data.Length}", category: "ThirdPartyTool");
|
||||
|
||||
if (response.Code != 0)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb($"API returned error code: {response.Code}, Message: {response.Message}", category: "ThirdPartyTool");
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
|
||||
return response.Data;
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb($"HTTP request failed: {ex.Message}", category: "ThirdPartyTool");
|
||||
SentrySdk.CaptureException(ex);
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
catch (TaskCanceledException ex)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb($"Request timed out or was cancelled: {ex.Message}", category: "ThirdPartyTool");
|
||||
SentrySdk.CaptureException(ex);
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb($"Failed to get third party tools: {ex.Message}", category: "ThirdPartyTool");
|
||||
SentrySdk.CaptureException(ex);
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
public async ValueTask<bool> DownloadToolAsync(ToolInfo tool, IProgress<double>? progress = null, CancellationToken token = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
string toolDirectory = GetToolDirectory(tool);
|
||||
Directory.CreateDirectory(toolDirectory);
|
||||
|
||||
int totalFiles = tool.Files.Count;
|
||||
int downloadedFiles = 0;
|
||||
|
||||
using (HttpClient httpClient = httpClientFactory.CreateClient())
|
||||
{
|
||||
foreach (string fileName in tool.Files)
|
||||
{
|
||||
string fileUrl = $"{tool.Url}{fileName}";
|
||||
string localFilePath = Path.Combine(toolDirectory, fileName);
|
||||
|
||||
// 如果文件已存在，跳过下载
|
||||
if (File.Exists(localFilePath))
|
||||
{
|
||||
downloadedFiles++;
|
||||
progress?.Report((double)downloadedFiles / totalFiles * 100);
|
||||
continue;
|
||||
}
|
||||
|
||||
// 下载文件
|
||||
HttpResponseMessage response = await httpClient.GetAsync(fileUrl, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false);
|
||||
response.EnsureSuccessStatusCode();
|
||||
|
||||
using (Stream contentStream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
|
||||
using (FileStream fileStream = new(localFilePath, FileMode.Create, FileAccess.Write, FileShare.None))
|
||||
{
|
||||
await contentStream.CopyToAsync(fileStream, token).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
downloadedFiles++;
|
||||
progress?.Report((double)downloadedFiles / totalFiles * 100);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Error(ex));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public async ValueTask<bool> LaunchToolAsync(ToolInfo tool)
|
||||
{
|
||||
try
|
||||
{
|
||||
string toolDirectory = GetToolDirectory(tool);
|
||||
|
||||
// 查找可执行文件（.exe）
|
||||
string? executablePath = tool.Files.FirstOrDefault(f => f.EndsWith(".exe", StringComparison.OrdinalIgnoreCase));
|
||||
if (string.IsNullOrEmpty(executablePath))
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Warning(SH.ServiceThirdPartyToolNoExecutableFound));
|
||||
return false;
|
||||
}
|
||||
|
||||
string fullPath = Path.Combine(toolDirectory, executablePath);
|
||||
if (!File.Exists(fullPath))
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Warning(SH.FormatServiceThirdPartyToolFileNotFound(fullPath)));
|
||||
return false;
|
||||
}
|
||||
|
||||
// 尝试以管理员权限启动
|
||||
ProcessStartInfo startInfo = new()
|
||||
{
|
||||
FileName = fullPath,
|
||||
WorkingDirectory = toolDirectory,
|
||||
UseShellExecute = true,
|
||||
Verb = "runas", // 请求管理员权限
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
Process.Start(startInfo);
|
||||
}
|
||||
catch (System.ComponentModel.Win32Exception)
|
||||
{
|
||||
// 用户拒绝了管理员权限，尝试以普通权限启动
|
||||
startInfo.Verb = string.Empty;
|
||||
startInfo.UseShellExecute = false;
|
||||
Process.Start(startInfo);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Error(ex));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsToolDownloaded(ToolInfo tool)
|
||||
{
|
||||
string toolDirectory = GetToolDirectory(tool);
|
||||
if (!Directory.Exists(toolDirectory))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查所有文件是否存在
|
||||
foreach (string fileName in tool.Files)
|
||||
{
|
||||
string filePath = Path.Combine(toolDirectory, fileName);
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static string GetToolDirectory(ToolInfo tool)
|
||||
{
|
||||
// 使用数据目录/工具名作为存储路径
|
||||
return Path.Combine(HutaoRuntime.DataDirectory, "Tools", tool.Name);
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,26 @@ internal sealed class TargetNativeConfiguration
|
||||
|
||||
public required uint Decompress { get; init; }
|
||||
|
||||
public static TargetNativeConfiguration Create(uint storeCmdId, uint achievementCmdId, MethodRva methodRva)
|
||||
{
|
||||
return new()
|
||||
{
|
||||
StoreCmdId = storeCmdId,
|
||||
AchievementCmdId = achievementCmdId,
|
||||
|
||||
DoCmd = methodRva.DoCmd,
|
||||
UpdateNormalProperty = methodRva.UpdateNormalProperty,
|
||||
NewString = methodRva.NewString,
|
||||
FindGameObject = methodRva.FindGameObject,
|
||||
EventSystemUpdate = methodRva.EventSystemUpdate,
|
||||
SimulatePointerClick = methodRva.SimulatePointerClick,
|
||||
ToInt32 = methodRva.ToInt32,
|
||||
TcpStatePtr = methodRva.TcpStatePtr,
|
||||
SharedInfoPtr = methodRva.SharedInfoPtr,
|
||||
Decompress = methodRva.Decompress,
|
||||
};
|
||||
}
|
||||
|
||||
public static TargetNativeConfiguration Create(NativeConfiguration config, bool isOversea)
|
||||
{
|
||||
MethodRva methodRva = isOversea ? config.MethodRva.Oversea : config.MethodRva.Chinese;
|
||||
|
||||
32
src/Snap.Hutao/Snap.Hutao/Service/Yae/Metadata/Crc32.cs
Normal file
32
src/Snap.Hutao/Snap.Hutao/Service/Yae/Metadata/Crc32.cs
Normal file
@@ -0,0 +1,32 @@
|
||||
namespace Snap.Hutao.Service.Yae.Metadata;
|
||||
|
||||
internal static class Crc32
|
||||
{
|
||||
private const uint Polynomial = 0xEDB88320;
|
||||
private static readonly uint[] Crc32Table = new uint[256];
|
||||
|
||||
static Crc32()
|
||||
{
|
||||
for (uint i = 0; i < Crc32Table.Length; i++)
|
||||
{
|
||||
uint value = i;
|
||||
for (int j = 0; j < 8; j++)
|
||||
{
|
||||
value = (value >> 1) ^ ((value & 1) * Polynomial);
|
||||
}
|
||||
|
||||
Crc32Table[i] = value;
|
||||
}
|
||||
}
|
||||
|
||||
public static uint Compute(Span<byte> buffer)
|
||||
{
|
||||
uint checksum = 0xFFFFFFFF;
|
||||
foreach (byte b in buffer)
|
||||
{
|
||||
checksum = (checksum >> 8) ^ Crc32Table[(b ^ checksum) & 0xFF];
|
||||
}
|
||||
|
||||
return ~checksum;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Snap.Hutao.Service.Yae.Metadata;
|
||||
|
||||
internal interface IYaeMetadataService
|
||||
{
|
||||
ValueTask<YaeNativeLibConfig?> GetNativeLibConfigAsync(CancellationToken token = default);
|
||||
}
|
||||
@@ -0,0 +1,188 @@
|
||||
using Google.Protobuf;
|
||||
using Snap.Hutao.Core.Protobuf;
|
||||
using Snap.Hutao.Service.Yae.Achievement;
|
||||
|
||||
namespace Snap.Hutao.Service.Yae.Metadata;
|
||||
|
||||
internal static class YaeMetadataParser
|
||||
{
|
||||
private const uint AchievementInfoNativeConfigTag = 42; // field 5, wire type length-delimited
|
||||
private const uint NativeConfigStoreCmdIdTag = 8; // field 1, varint
|
||||
private const uint NativeConfigAchievementCmdIdTag = 16; // field 2, varint
|
||||
private const uint NativeConfigMethodRvaTag = 82; // field 10, length-delimited
|
||||
|
||||
private const uint MapEntryKeyTag = 8; // field 1, varint
|
||||
private const uint MapEntryValueTag = 18; // field 2, length-delimited
|
||||
|
||||
private const uint MethodRvaDoCmdTag = 8;
|
||||
private const uint MethodRvaUpdateNormalPropTag = 24;
|
||||
private const uint MethodRvaNewStringTag = 32;
|
||||
private const uint MethodRvaFindGameObjectTag = 40;
|
||||
private const uint MethodRvaEventSystemUpdateTag = 48;
|
||||
private const uint MethodRvaSimulatePointerClickTag = 56;
|
||||
private const uint MethodRvaToInt32Tag = 64;
|
||||
private const uint MethodRvaTcpStatePtrTag = 72;
|
||||
private const uint MethodRvaSharedInfoPtrTag = 80;
|
||||
private const uint MethodRvaDecompressTag = 88;
|
||||
|
||||
public static YaeNativeLibConfig? ParseNativeLibConfig(byte[] data)
|
||||
{
|
||||
uint storeCmdId = 0;
|
||||
uint achievementCmdId = 0;
|
||||
Dictionary<uint, MethodRva> methodRva = [];
|
||||
bool hasNativeConfig = false;
|
||||
|
||||
CodedInputStream input = new(data);
|
||||
while (input.TryReadTag(out uint tag))
|
||||
{
|
||||
switch (tag)
|
||||
{
|
||||
case AchievementInfoNativeConfigTag:
|
||||
hasNativeConfig = true;
|
||||
using (CodedInputStream nativeConfigStream = input.UnsafeReadLengthDelimitedStream())
|
||||
{
|
||||
ParseNativeConfig(nativeConfigStream, ref storeCmdId, ref achievementCmdId, methodRva);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
input.SkipLastField();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasNativeConfig || methodRva.Count == 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return new YaeNativeLibConfig
|
||||
{
|
||||
StoreCmdId = storeCmdId,
|
||||
AchievementCmdId = achievementCmdId,
|
||||
MethodRva = methodRva,
|
||||
};
|
||||
}
|
||||
|
||||
private static void ParseNativeConfig(CodedInputStream input, ref uint storeCmdId, ref uint achievementCmdId, Dictionary<uint, MethodRva> methodRva)
|
||||
{
|
||||
while (input.TryReadTag(out uint tag))
|
||||
{
|
||||
switch (tag)
|
||||
{
|
||||
case NativeConfigStoreCmdIdTag:
|
||||
storeCmdId = input.ReadUInt32();
|
||||
break;
|
||||
case NativeConfigAchievementCmdIdTag:
|
||||
achievementCmdId = input.ReadUInt32();
|
||||
break;
|
||||
case NativeConfigMethodRvaTag:
|
||||
using (CodedInputStream entryStream = input.UnsafeReadLengthDelimitedStream())
|
||||
{
|
||||
ParseMethodRvaEntry(entryStream, methodRva);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
input.SkipLastField();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void ParseMethodRvaEntry(CodedInputStream input, Dictionary<uint, MethodRva> methodRva)
|
||||
{
|
||||
uint key = 0;
|
||||
MethodRva? value = null;
|
||||
|
||||
while (input.TryReadTag(out uint tag))
|
||||
{
|
||||
switch (tag)
|
||||
{
|
||||
case MapEntryKeyTag:
|
||||
key = input.ReadUInt32();
|
||||
break;
|
||||
case MapEntryValueTag:
|
||||
using (CodedInputStream valueStream = input.UnsafeReadLengthDelimitedStream())
|
||||
{
|
||||
value = ParseMethodRvaConfig(valueStream);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
input.SkipLastField();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (value is not null)
|
||||
{
|
||||
methodRva[key] = value;
|
||||
}
|
||||
}
|
||||
|
||||
private static MethodRva ParseMethodRvaConfig(CodedInputStream input)
|
||||
{
|
||||
uint doCmd = 0;
|
||||
uint updateNormalProp = 0;
|
||||
uint newString = 0;
|
||||
uint findGameObject = 0;
|
||||
uint eventSystemUpdate = 0;
|
||||
uint simulatePointerClick = 0;
|
||||
uint toInt32 = 0;
|
||||
uint tcpStatePtr = 0;
|
||||
uint sharedInfoPtr = 0;
|
||||
uint decompress = 0;
|
||||
|
||||
while (input.TryReadTag(out uint tag))
|
||||
{
|
||||
switch (tag)
|
||||
{
|
||||
case MethodRvaDoCmdTag:
|
||||
doCmd = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaUpdateNormalPropTag:
|
||||
updateNormalProp = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaNewStringTag:
|
||||
newString = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaFindGameObjectTag:
|
||||
findGameObject = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaEventSystemUpdateTag:
|
||||
eventSystemUpdate = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaSimulatePointerClickTag:
|
||||
simulatePointerClick = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaToInt32Tag:
|
||||
toInt32 = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaTcpStatePtrTag:
|
||||
tcpStatePtr = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaSharedInfoPtrTag:
|
||||
sharedInfoPtr = input.ReadUInt32();
|
||||
break;
|
||||
case MethodRvaDecompressTag:
|
||||
decompress = input.ReadUInt32();
|
||||
break;
|
||||
default:
|
||||
input.SkipLastField();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return new MethodRva
|
||||
{
|
||||
DoCmd = doCmd,
|
||||
UpdateNormalProperty = updateNormalProp,
|
||||
NewString = newString,
|
||||
FindGameObject = findGameObject,
|
||||
EventSystemUpdate = eventSystemUpdate,
|
||||
SimulatePointerClick = simulatePointerClick,
|
||||
ToInt32 = toInt32,
|
||||
TcpStatePtr = tcpStatePtr,
|
||||
SharedInfoPtr = sharedInfoPtr,
|
||||
Decompress = decompress,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
using Microsoft.Extensions.Caching.Memory;
|
||||
using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
|
||||
namespace Snap.Hutao.Service.Yae.Metadata;
|
||||
|
||||
[Service(ServiceLifetime.Singleton, typeof(IYaeMetadataService))]
|
||||
[HttpClient(HttpClientConfiguration.Default)]
|
||||
internal sealed partial class YaeMetadataService : IYaeMetadataService
|
||||
{
|
||||
private const string MetadataUrl = "https://rin.holohat.work/schicksal/metadata";
|
||||
private static readonly TimeSpan CacheDuration = TimeSpan.FromHours(6);
|
||||
private static readonly string? LocalMetadataPath = TryGetLocalMetadataPath();
|
||||
|
||||
private readonly IHttpClientFactory httpClientFactory;
|
||||
private readonly IMemoryCache memoryCache;
|
||||
|
||||
[GeneratedConstructor]
|
||||
public partial YaeMetadataService(IServiceProvider serviceProvider);
|
||||
|
||||
public ValueTask<YaeNativeLibConfig?> GetNativeLibConfigAsync(CancellationToken token = default)
|
||||
{
|
||||
Task<YaeNativeLibConfig?> task = memoryCache.GetOrCreateAsync($"{nameof(YaeMetadataService)}.NativeLibConfig", async entry =>
|
||||
{
|
||||
entry.SetSlidingExpiration(CacheDuration);
|
||||
|
||||
byte[] data;
|
||||
if (!string.IsNullOrEmpty(LocalMetadataPath) && File.Exists(LocalMetadataPath))
|
||||
{
|
||||
data = await File.ReadAllBytesAsync(LocalMetadataPath, token).ConfigureAwait(false);
|
||||
if (data.Length > 0)
|
||||
{
|
||||
return YaeMetadataParser.ParseNativeLibConfig(data);
|
||||
}
|
||||
}
|
||||
|
||||
using HttpClient httpClient = httpClientFactory.CreateClient(nameof(YaeMetadataService));
|
||||
data = await httpClient.GetByteArrayAsync(MetadataUrl, token).ConfigureAwait(false);
|
||||
return YaeMetadataParser.ParseNativeLibConfig(data);
|
||||
});
|
||||
|
||||
return new ValueTask<YaeNativeLibConfig?>(task);
|
||||
}
|
||||
|
||||
private static string? TryGetLocalMetadataPath()
|
||||
{
|
||||
try
|
||||
{
|
||||
// 尝试获取用户下载目录下的metadata文件，本地测试和排查问题时使用
|
||||
string userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
|
||||
if (string.IsNullOrEmpty(userProfile))
|
||||
{
|
||||
return default;
|
||||
}
|
||||
|
||||
string localPath = Path.Combine(userProfile, "Downloads", "metadata");
|
||||
return localPath;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return default;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
using Snap.Hutao.Service.Yae.Achievement;
|
||||
|
||||
namespace Snap.Hutao.Service.Yae.Metadata;
|
||||
|
||||
internal sealed class YaeNativeLibConfig
|
||||
{
|
||||
public required uint StoreCmdId { get; init; }
|
||||
|
||||
public required uint AchievementCmdId { get; init; }
|
||||
|
||||
public required IReadOnlyDictionary<uint, MethodRva> MethodRva { get; init; }
|
||||
}
|
||||
@@ -6,7 +6,6 @@ using Snap.Hutao.Core.LifeCycle.InterProcess.Yae;
|
||||
using Snap.Hutao.Factory.ContentDialog;
|
||||
using Snap.Hutao.Model.InterChange.Achievement;
|
||||
using Snap.Hutao.Model.InterChange.Inventory;
|
||||
using Snap.Hutao.Service.Feature;
|
||||
using Snap.Hutao.Service.Game;
|
||||
using Snap.Hutao.Service.Game.FileSystem;
|
||||
using Snap.Hutao.Service.Game.Launching;
|
||||
@@ -15,10 +14,12 @@ using Snap.Hutao.Service.Game.Launching.Invoker;
|
||||
using Snap.Hutao.Service.Notification;
|
||||
using Snap.Hutao.Service.User;
|
||||
using Snap.Hutao.Service.Yae.Achievement;
|
||||
using Snap.Hutao.Service.Yae.Metadata;
|
||||
using Snap.Hutao.Service.Yae.PlayerStore;
|
||||
using Snap.Hutao.ViewModel.Game;
|
||||
using Snap.Hutao.ViewModel.User;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
|
||||
namespace Snap.Hutao.Service.Yae;
|
||||
|
||||
@@ -27,7 +28,7 @@ internal sealed partial class YaeService : IYaeService
|
||||
{
|
||||
private readonly IContentDialogFactory contentDialogFactory;
|
||||
private readonly IServiceProvider serviceProvider;
|
||||
private readonly IFeatureService featureService;
|
||||
private readonly IYaeMetadataService yaeMetadataService;
|
||||
private readonly IUserService userService;
|
||||
private readonly ITaskContext taskContext;
|
||||
private readonly IMessenger messenger;
|
||||
@@ -57,15 +58,12 @@ internal sealed partial class YaeService : IYaeService
|
||||
Identity = GameIdentity.Create(userAndUid, viewModel.GameAccount),
|
||||
};
|
||||
|
||||
if (!TryGetGameVersion(context, out string? version, out bool isOversea))
|
||||
TargetNativeConfiguration? config = await TryGetTargetNativeConfigurationAsync(context).ConfigureAwait(false);
|
||||
if (config is null)
|
||||
{
|
||||
return default;
|
||||
}
|
||||
|
||||
AchievementFieldId? fieldId = await featureService.GetAchievementFieldIdAsync(version).ConfigureAwait(false);
|
||||
ArgumentNullException.ThrowIfNull(fieldId);
|
||||
|
||||
TargetNativeConfiguration config = TargetNativeConfiguration.Create(fieldId.NativeConfig, isOversea);
|
||||
await new YaeLaunchExecutionInvoker(config, receiver).InvokeAsync(context).ConfigureAwait(false);
|
||||
|
||||
UIAF? uiaf = default;
|
||||
@@ -76,7 +74,7 @@ internal sealed partial class YaeService : IYaeService
|
||||
if (data.Kind is YaeCommandKind.ResponseAchievement)
|
||||
{
|
||||
Debug.Assert(uiaf is null);
|
||||
uiaf = AchievementParser.Parse(data.Bytes, fieldId);
|
||||
uiaf = AchievementParser.Parse(data.Bytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -116,15 +114,12 @@ internal sealed partial class YaeService : IYaeService
|
||||
Identity = GameIdentity.Create(userAndUid, viewModel.GameAccount),
|
||||
};
|
||||
|
||||
if (!TryGetGameVersion(context, out string? version, out bool isOversea))
|
||||
TargetNativeConfiguration? config = await TryGetTargetNativeConfigurationAsync(context).ConfigureAwait(false);
|
||||
if (config is null)
|
||||
{
|
||||
return default;
|
||||
}
|
||||
|
||||
AchievementFieldId? fieldId = await featureService.GetAchievementFieldIdAsync(version).ConfigureAwait(false);
|
||||
ArgumentNullException.ThrowIfNull(fieldId);
|
||||
|
||||
TargetNativeConfiguration config = TargetNativeConfiguration.Create(fieldId.NativeConfig, isOversea);
|
||||
await new YaeLaunchExecutionInvoker(config, receiver).InvokeAsync(context).ConfigureAwait(false);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -167,9 +162,9 @@ internal sealed partial class YaeService : IYaeService
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryGetGameVersion(LaunchExecutionInvocationContext context, [NotNullWhen(true)] out string? version, out bool isOversea)
|
||||
private async ValueTask<TargetNativeConfiguration?> TryGetTargetNativeConfigurationAsync(LaunchExecutionInvocationContext context)
|
||||
{
|
||||
const string LockTrace = $"{nameof(YaeService)}.{nameof(TryGetGameVersion)}";
|
||||
const string LockTrace = $"{nameof(YaeService)}.{nameof(TryGetTargetNativeConfigurationAsync)}";
|
||||
|
||||
if (context.LaunchOptions.TryGetGameFileSystem(LockTrace, out IGameFileSystem? gameFileSystem) is not GameFileSystemErrorKind.None)
|
||||
{
|
||||
@@ -178,23 +173,54 @@ internal sealed partial class YaeService : IYaeService
|
||||
|
||||
if (gameFileSystem is null)
|
||||
{
|
||||
version = default;
|
||||
isOversea = false;
|
||||
return false;
|
||||
return default;
|
||||
}
|
||||
|
||||
using (gameFileSystem)
|
||||
{
|
||||
if (!gameFileSystem.TryGetGameVersion(out version) || string.IsNullOrEmpty(version))
|
||||
if (!TryGetGameExecutableHash(gameFileSystem.GameFilePath, out uint hash))
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Error(SH.ServiceYaeGetGameVersionFailed));
|
||||
isOversea = false;
|
||||
return default;
|
||||
}
|
||||
|
||||
YaeNativeLibConfig? nativeConfig = await yaeMetadataService.GetNativeLibConfigAsync().ConfigureAwait(false);
|
||||
if (nativeConfig is null)
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Error(SH.ServiceYaeGetGameVersionFailed));
|
||||
return default;
|
||||
}
|
||||
|
||||
if (!nativeConfig.MethodRva.TryGetValue(hash, out MethodRva? methodRva))
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Error(SH.ServiceYaeGetGameVersionFailed));
|
||||
return default;
|
||||
}
|
||||
|
||||
return TargetNativeConfiguration.Create(nativeConfig.StoreCmdId, nativeConfig.AchievementCmdId, methodRva);
|
||||
}
|
||||
}
|
||||
|
||||
private static bool TryGetGameExecutableHash(string gameFilePath, out uint hash)
|
||||
{
|
||||
try
|
||||
{
|
||||
Span<byte> buffer = stackalloc byte[0x10000];
|
||||
using FileStream stream = File.OpenRead(gameFilePath);
|
||||
int read = stream.ReadAtLeast(buffer, buffer.Length, throwOnEndOfStream: false);
|
||||
if (read < buffer.Length)
|
||||
{
|
||||
hash = default;
|
||||
return false;
|
||||
}
|
||||
|
||||
isOversea = gameFileSystem.IsExecutableOversea;
|
||||
}
|
||||
|
||||
hash = Crc32.Compute(buffer);
|
||||
return true;
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
hash = default;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,9 @@
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<UseWinUI>true</UseWinUI>
|
||||
<UseWPF>False</UseWPF>
|
||||
<!-- 配置版本号 -->
|
||||
<Version>1.18.4.0</Version>
|
||||
|
||||
<UseWindowsForms>False</UseWindowsForms>
|
||||
<ImplicitUsings>False</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
@@ -68,6 +71,23 @@
|
||||
<Delete Files="@(LibFiles)" />
|
||||
</Target>
|
||||
|
||||
<!-- 复制unlockfps.exe到输出目录 -->
|
||||
<Target Name="CopyUnlockFpsExe" AfterTargets="Build">
|
||||
<ItemGroup>
|
||||
<UnlockFpsExeSource Include="$(MSBuildThisFileDirectory)..\..\..\bin\unlockfps.exe" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(UnlockFpsExeSource)" DestinationFolder="$(OutputPath)" ContinueOnError="true" />
|
||||
</Target>
|
||||
|
||||
<!-- 声明unlockfps.exe为项目内容，确保MSIX打包时包含此文件 -->
|
||||
<ItemGroup>
|
||||
<Content Include="$(MSBuildThisFileDirectory)..\..\..\bin\unlockfps.exe">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>unlockfps.exe</PackagePath>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Analyzer Files -->
|
||||
<ItemGroup>
|
||||
<AdditionalFiles Include="ApiEndpoints.csv" />
|
||||
@@ -288,7 +308,7 @@
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.3.14">
|
||||
<PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.3.15">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
||||
@@ -20,6 +20,8 @@ internal partial class ScopedPage : Page
|
||||
|
||||
protected ScopedPage()
|
||||
{
|
||||
// Allow a small set of recent pages to be cached to reduce navigation stutter.
|
||||
NavigationCacheMode = NavigationCacheMode.Enabled;
|
||||
// Events/Override Methods order
|
||||
// ----------------------------------------------------------------------
|
||||
// Page Navigation methods:
|
||||
@@ -103,6 +105,13 @@ internal partial class ScopedPage : Page
|
||||
|
||||
private void OnUnloaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
// When navigation cache is enabled, the page instance is reused.
|
||||
// Do not tear down DataContext/scope here to avoid invalid state on return.
|
||||
if (NavigationCacheMode != NavigationCacheMode.Disabled)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Cancel all tasks executed by the view model
|
||||
viewCts.Cancel();
|
||||
|
||||
|
||||
@@ -13,32 +13,32 @@
|
||||
<x:String x:Key="IconGame">https://launcher-webstatic.mihoyo.com/launcher-public/2024/04/15/9ebf1bc5af2d83ca5fca21adb49cf341_2571779162329842818.png</x:String>
|
||||
|
||||
<!-- AvatarCard -->
|
||||
<x:String x:Key="UI_AvatarIcon_Costume_Card">http://serverjp.wdg.cloudns.ch:8001/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
|
||||
<x:String x:Key="UI_AvatarIcon_Costume_Card">https://htserver.wdg.cloudns.ch/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
|
||||
|
||||
<!-- Bg -->
|
||||
<x:String x:Key="UI_ItemIcon_None">http://serverjp.wdg.cloudns.ch:8001/static/raw/Bg/UI_ItemIcon_None.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_None">https://htserver.wdg.cloudns.ch/static/raw/Bg/UI_ItemIcon_None.png</x:String>
|
||||
|
||||
<!-- Mark -->
|
||||
<x:String x:Key="UI_MarkQuest_Events_Proce">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Events_Start">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Main_Proce">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Main_Start">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
|
||||
<x:String x:Key="UI_MarkTower">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkTower.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Events_Proce">https://htserver.wdg.cloudns.ch/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Events_Start">https://htserver.wdg.cloudns.ch/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Main_Proce">https://htserver.wdg.cloudns.ch/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Main_Start">https://htserver.wdg.cloudns.ch/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
|
||||
<x:String x:Key="UI_MarkTower">https://htserver.wdg.cloudns.ch/static/raw/Mark/UI_MarkTower.png</x:String>
|
||||
<!-- ItemIcon -->
|
||||
<x:String x:Key="UI_ItemIcon_106">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_106.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_204">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_204.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_210">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_210.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_220021">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_220021.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_106">https://htserver.wdg.cloudns.ch/static/raw/ItemIcon/UI_ItemIcon_106.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_204">https://htserver.wdg.cloudns.ch/static/raw/ItemIcon/UI_ItemIcon_204.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_210">https://htserver.wdg.cloudns.ch/static/raw/ItemIcon/UI_ItemIcon_210.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_220021">https://htserver.wdg.cloudns.ch/static/raw/ItemIcon/UI_ItemIcon_220021.png</x:String>
|
||||
|
||||
<!-- EmotionIcon -->
|
||||
<x:String x:Key="UI_EmotionIcon52">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon52.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon71">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon71.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon89">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon89.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon250">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon271">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon271.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon272">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon272.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon293">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon433">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon433.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon445">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon585">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon585.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon52">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon52.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon71">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon71.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon89">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon89.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon250">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon271">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon271.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon272">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon272.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon293">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon433">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon433.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon445">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon585">https://htserver.wdg.cloudns.ch/static/raw/EmotionIcon/UI_EmotionIcon585.png</x:String>
|
||||
</ResourceDictionary>
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
<ContentDialog
|
||||
x:Class="Snap.Hutao.UI.Xaml.View.Dialog.ThirdPartyToolDialog"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:shuxm="using:Snap.Hutao.UI.Xaml.Markup"
|
||||
Title="{x:Bind Tool.Name, Mode=OneWay}"
|
||||
CloseButtonText="{shuxm:ResourceString Name=ContentDialogCancelCloseButtonText}"
|
||||
DefaultButton="Primary"
|
||||
PrimaryButtonText="{shuxm:ResourceString Name=ViewDialogThirdPartyToolLaunch}"
|
||||
Style="{StaticResource DefaultContentDialogStyle}"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Grid RowSpacing="12">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Style="{StaticResource BodyTextBlockStyle}"
|
||||
Text="{shuxm:ResourceString Name=ViewDialogThirdPartyToolDescription}"
|
||||
TextWrapping="Wrap"/>
|
||||
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Style="{StaticResource BodyStrongTextBlockStyle}"
|
||||
Text="{x:Bind Tool.Description, Mode=OneWay}"
|
||||
TextWrapping="Wrap"/>
|
||||
|
||||
<ProgressBar
|
||||
Grid.Row="2"
|
||||
Height="4"
|
||||
IsIndeterminate="{x:Bind IsDownloading.Value, Mode=OneWay, FallbackValue=False}"
|
||||
Visibility="{x:Bind IsDownloading.Value, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
|
||||
</Grid>
|
||||
</ContentDialog>
|
||||
@@ -0,0 +1,77 @@
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Snap.Hutao.Factory.ContentDialog;
|
||||
using Snap.Hutao.Service.Notification;
|
||||
using Snap.Hutao.Service.ThirdPartyTool;
|
||||
using Snap.Hutao.Web.ThirdPartyTool;
|
||||
|
||||
namespace Snap.Hutao.UI.Xaml.View.Dialog;
|
||||
|
||||
[DependencyProperty<ToolInfo>("Tool")]
|
||||
[DependencyProperty<bool>("IsDownloading", DefaultValue = false)]
|
||||
internal sealed partial class ThirdPartyToolDialog : ContentDialog
|
||||
{
|
||||
private readonly IContentDialogFactory contentDialogFactory;
|
||||
private readonly IThirdPartyToolService thirdPartyToolService;
|
||||
private readonly IMessenger messenger;
|
||||
|
||||
[GeneratedConstructor(InitializeComponent = true)]
|
||||
public partial ThirdPartyToolDialog(IServiceProvider serviceProvider);
|
||||
|
||||
public ThirdPartyToolDialog(IServiceProvider serviceProvider, ToolInfo tool)
|
||||
: this(serviceProvider)
|
||||
{
|
||||
Tool = tool;
|
||||
PrimaryButtonClick += OnPrimaryButtonClick;
|
||||
}
|
||||
|
||||
private void OnPrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
|
||||
{
|
||||
args.Cancel = true;
|
||||
HandleLaunchAsync().SafeForget();
|
||||
}
|
||||
|
||||
private async Task HandleLaunchAsync()
|
||||
{
|
||||
// 在 UI 线程上获取 Tool 的引用，避免后续跨线程访问依赖属性
|
||||
ToolInfo? tool = Tool;
|
||||
|
||||
try
|
||||
{
|
||||
IsDownloading = true;
|
||||
|
||||
// 检查工具是否已下载
|
||||
if (tool is not null && !thirdPartyToolService.IsToolDownloaded(tool))
|
||||
{
|
||||
// 下载工具
|
||||
bool downloadSuccess = await thirdPartyToolService.DownloadToolAsync(tool, null).ConfigureAwait(false);
|
||||
if (!downloadSuccess)
|
||||
{
|
||||
await contentDialogFactory.TaskContext.SwitchToMainThreadAsync();
|
||||
IsDownloading = false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 启动工具
|
||||
if (tool is not null)
|
||||
{
|
||||
bool launchSuccess = await thirdPartyToolService.LaunchToolAsync(tool).ConfigureAwait(false);
|
||||
if (launchSuccess)
|
||||
{
|
||||
await contentDialogFactory.TaskContext.SwitchToMainThreadAsync();
|
||||
Hide();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
messenger.Send(InfoBarMessage.Error(ex));
|
||||
}
|
||||
finally
|
||||
{
|
||||
await contentDialogFactory.TaskContext.SwitchToMainThreadAsync();
|
||||
IsDownloading = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -264,7 +264,10 @@
|
||||
<shuxv:UserView x:Name="UserView"/>
|
||||
</NavigationView.PaneFooter>
|
||||
|
||||
<Frame x:Name="ContentFrame" ContentTransitions="{StaticResource NavigationThemeTransitions}"/>
|
||||
<Frame
|
||||
x:Name="ContentFrame"
|
||||
CacheSize="5"
|
||||
ContentTransitions="{StaticResource NavigationThemeTransitions}"/>
|
||||
</NavigationView>
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<shuxc:ScopedPage
|
||||
x:Class="Snap.Hutao.UI.Xaml.View.Page.LaunchGamePage"
|
||||
x:Name="PageRoot"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:cw="using:CommunityToolkit.WinUI"
|
||||
@@ -11,6 +12,7 @@
|
||||
xmlns:shsg="using:Snap.Hutao.Service.Game"
|
||||
xmlns:shsgp="using:Snap.Hutao.Service.Game.PathAbstraction"
|
||||
xmlns:shux="using:Snap.Hutao.UI.Xaml"
|
||||
xmlns:shwt="using:Snap.Hutao.Web.ThirdPartyTool"
|
||||
xmlns:shuxb="using:Snap.Hutao.UI.Xaml.Behavior"
|
||||
xmlns:shuxba="using:Snap.Hutao.UI.Xaml.Behavior.Action"
|
||||
xmlns:shuxc="using:Snap.Hutao.UI.Xaml.Control"
|
||||
@@ -558,6 +560,42 @@
|
||||
Margin="16"
|
||||
Padding="0"
|
||||
cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
|
||||
<StackPanel Spacing="8">
|
||||
<!-- 第三方注入工具 -->
|
||||
<Grid Style="{ThemeResource AcrylicGridCardStyle}" Visibility="{Binding ThirdPartyTools.Value, Converter={StaticResource EmptyCollectionToVisibilityConverter}}">
|
||||
<Grid Padding="16,12" ColumnSpacing="12">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock
|
||||
Grid.Column="0"
|
||||
VerticalAlignment="Center"
|
||||
Style="{StaticResource BodyStrongTextBlockStyle}"
|
||||
Text="{shuxm:ResourceString Name=ViewPageLaunchGameThirdPartyTools}"/>
|
||||
<ItemsControl
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Left"
|
||||
ItemsSource="{Binding ThirdPartyTools.Value, Mode=OneWay}">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<StackPanel Orientation="Horizontal" Spacing="8"/>
|
||||
</ItemsPanelTemplate>
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate x:DataType="shwt:ToolInfo">
|
||||
<Button
|
||||
Padding="12,6"
|
||||
Command="{Binding DataContext.ShowThirdPartyToolDialogCommand, ElementName=PageRoot}"
|
||||
CommandParameter="{Binding}"
|
||||
Content="{Binding Name}"
|
||||
Style="{ThemeResource AccentButtonStyle}"/>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<Grid Style="{ThemeResource AcrylicGridCardStyle}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto"/>
|
||||
@@ -641,30 +679,31 @@
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFovHotSwitchHeader}"
|
||||
IsOn="{Binding LaunchOptions.IsSetFieldOfViewEnabled.Value, Mode=TwoWay}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameHotSwitchDescription}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
<NumberBox
|
||||
Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Padding="10,8,6,6"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFovHeader}"
|
||||
IsEnabled="{Binding LaunchOptions.IsSetFieldOfViewEnabled.Value}"
|
||||
IsEnabled="False"
|
||||
LargeChange="10"
|
||||
Maximum="100"
|
||||
Minimum="0"
|
||||
SmallChange="1"
|
||||
SpinButtonPlacementMode="Inline"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFovDescription}"
|
||||
Value="{Binding LaunchOptions.TargetFov.Value, Mode=TwoWay}"/>
|
||||
ToolTipService.ToolTip=""
|
||||
Value="45"/>
|
||||
<ToggleSwitch
|
||||
Grid.Row="0"
|
||||
Grid.Column="2"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogHeader}"
|
||||
IsEnabled="{Binding LaunchOptions.IsSetFieldOfViewEnabled}"
|
||||
IsOn="{Binding LaunchOptions.DisableFog.Value, Mode=TwoWay}"
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
|
||||
OnContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOn}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogDescription}"/>
|
||||
ToolTipService.ToolTip=""/>
|
||||
|
||||
<ToggleSwitch
|
||||
x:Name="TargetFpsToggleSwitch"
|
||||
@@ -703,9 +742,13 @@
|
||||
Subtitle="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFpsTeachingTipSubtitle}"
|
||||
Target="{x:Bind TargetFpsToggleSwitch}"/>
|
||||
|
||||
<Grid Grid.Row="1" Grid.Column="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<NumberBox
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
Padding="10,8,6,6"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFpsHeader}"
|
||||
IsEnabled="{Binding LaunchOptions.IsSetTargetFrameRateEnabled.Value}"
|
||||
@@ -714,13 +757,15 @@
|
||||
SpinButtonPlacementMode="Inline"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameUnlockFpsDescription}"
|
||||
Value="{Binding LaunchOptions.TargetFps.Value, Mode=TwoWay}"/>
|
||||
|
||||
</Grid>
|
||||
<ToggleSwitch
|
||||
x:Name="FixLowFovSceneToggleSwitch"
|
||||
Grid.Row="1"
|
||||
Grid.Column="2"
|
||||
IsEnabled="{Binding LaunchOptions.IsSetFieldOfViewEnabled}"
|
||||
IsOn="{Binding LaunchOptions.FixLowFovScene.Value, Mode=TwoWay}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameFixLowFovSceneDescription}">
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip="">
|
||||
<mxi:Interaction.Behaviors>
|
||||
<shuxb:ToggleSwitchHeaderHitTestVisibleBehavior/>
|
||||
</mxi:Interaction.Behaviors>
|
||||
@@ -756,10 +801,11 @@
|
||||
x:Name="HideQuestBannerToggleSwitch"
|
||||
Grid.Row="2"
|
||||
Grid.Column="0"
|
||||
IsOn="{Binding LaunchOptions.HideQuestBanner.Value, Mode=TwoWay}"
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
|
||||
OnContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOn}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameHotSwitchDescription}">
|
||||
ToolTipService.ToolTip="">
|
||||
<mxi:Interaction.Behaviors>
|
||||
<shuxb:ToggleSwitchHeaderHitTestVisibleBehavior/>
|
||||
</mxi:Interaction.Behaviors>
|
||||
@@ -798,34 +844,38 @@
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameRemoveOpenTeamProgressHeader}"
|
||||
IsOn="{Binding LaunchOptions.RemoveOpenTeamProgress.Value, Mode=TwoWay}"
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
|
||||
OnContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOn}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameRemoveOpenTeamProgressDescription}"/>
|
||||
ToolTipService.ToolTip=""/>
|
||||
<ToggleSwitch
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameEventCameraMoveHotSwitchHeader}"
|
||||
IsOn="{Binding LaunchOptions.DisableEventCameraMove.Value, Mode=TwoWay}"
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
|
||||
OnContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOn}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameHotSwitchDescription}"/>
|
||||
ToolTipService.ToolTip=""/>
|
||||
|
||||
<ToggleSwitch
|
||||
Grid.Row="3"
|
||||
Grid.Column="0"
|
||||
Header="{shuxm:ResourceString Name=ViewOverlayDisableShowDamageTextToolTip}"
|
||||
IsOn="{Binding LaunchOptions.DisableShowDamageText.Value, Mode=TwoWay}"
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
OffContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOff}"
|
||||
OnContent="{shuxm:ResourceString Name=ViewPageLaunchGameDisableFogOn}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameHotSwitchDescription}"/>
|
||||
ToolTipService.ToolTip=""/>
|
||||
<ToggleSwitch
|
||||
x:Name="RedirectCombineEntryToggleSwitch"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
IsOn="{Binding LaunchOptions.RedirectCombineEntry.Value, Mode=TwoWay}"
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
Style="{ThemeResource DefaultToggleSwitchStyle}"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandRedirectCombineEntryDescription}">
|
||||
ToolTipService.ToolTip="">
|
||||
<mxi:Interaction.Behaviors>
|
||||
<shuxb:ToggleSwitchHeaderHitTestVisibleBehavior/>
|
||||
</mxi:Interaction.Behaviors>
|
||||
@@ -867,39 +917,51 @@
|
||||
Grid.Row="3"
|
||||
Grid.Column="2"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandUsingTouchScreenHeader}"
|
||||
IsEnabled="{Binding LaunchOptions.IsGameRunning.Value, Converter={StaticResource BoolNegationConverter}}"
|
||||
IsOn="{Binding LaunchOptions.UsingTouchScreen.Value, Mode=TwoWay}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
|
||||
<ToggleSwitch
|
||||
Grid.Row="4"
|
||||
Grid.Column="0"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowOriginalResinHeader}"
|
||||
IsOn="{Binding LaunchOptions.ResinListItemId000106Allowed.Value, Mode=TwoWay}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
<ToggleSwitch
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowPrimogemHeader}"
|
||||
IsOn="{Binding LaunchOptions.ResinListItemId000201Allowed.Value, Mode=TwoWay}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
<ToggleSwitch
|
||||
Grid.Row="4"
|
||||
Grid.Column="2"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowFragileResinHeader}"
|
||||
IsOn="{Binding LaunchOptions.ResinListItemId107009Allowed.Value, Mode=TwoWay}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
|
||||
<ToggleSwitch
|
||||
Grid.Row="5"
|
||||
Grid.Column="0"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowTransientResinHeader}"
|
||||
IsOn="{Binding LaunchOptions.ResinListItemId107012Allowed.Value, Mode=TwoWay}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
<ToggleSwitch
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowCondensedResinHeader}"
|
||||
IsOn="{Binding LaunchOptions.ResinListItemId220007Allowed.Value, Mode=TwoWay}"/>
|
||||
IsEnabled="False"
|
||||
IsOn="False"
|
||||
ToolTipService.ToolTip=""/>
|
||||
</Grid>
|
||||
</ContentControl>
|
||||
</ScrollViewer>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</PivotItem>
|
||||
</Pivot>
|
||||
|
||||
@@ -6,6 +6,7 @@ using Microsoft.UI.Windowing;
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.UI.Xaml.Input;
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.Logging;
|
||||
using Snap.Hutao.Core.Setting;
|
||||
using Snap.Hutao.UI.Input.LowLevel;
|
||||
@@ -337,7 +338,8 @@ internal sealed partial class CompactWebView2Window : Microsoft.UI.Xaml.Window,
|
||||
{
|
||||
AdditionalBrowserArguments = "--do-not-de-elevate --autoplay-policy=no-user-gesture-required",
|
||||
};
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, null, options);
|
||||
string userDataFolder = HutaoRuntime.WebView2UserDataDirectory;
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, userDataFolder, options);
|
||||
await WebView.EnsureCoreWebView2Async(environment);
|
||||
}
|
||||
catch (SEHException ex)
|
||||
|
||||
@@ -5,6 +5,7 @@ using Microsoft.UI;
|
||||
using Microsoft.UI.Windowing;
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.Logging;
|
||||
using Snap.Hutao.UI.Windowing;
|
||||
using Snap.Hutao.UI.Windowing.Abstraction;
|
||||
@@ -154,7 +155,8 @@ internal sealed partial class WebView2Window : Microsoft.UI.Xaml.Window,
|
||||
{
|
||||
AdditionalBrowserArguments = "--do-not-de-elevate",
|
||||
};
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, null, options);
|
||||
string userDataFolder = HutaoRuntime.WebView2UserDataDirectory;
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, userDataFolder, options);
|
||||
await WebView.EnsureCoreWebView2Async(environment);
|
||||
}
|
||||
catch (SEHException)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Copyright (c) Millennium-Science-Technology-R-D-Inst. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
@@ -16,11 +17,13 @@ using Snap.Hutao.Service.Game.PathAbstraction;
|
||||
using Snap.Hutao.Service.Game.Scheme;
|
||||
using Snap.Hutao.Service.Navigation;
|
||||
using Snap.Hutao.Service.Notification;
|
||||
using Snap.Hutao.Service.ThirdPartyTool;
|
||||
using Snap.Hutao.Service.User;
|
||||
using Snap.Hutao.UI.Input.LowLevel;
|
||||
using Snap.Hutao.UI.Xaml.View.Dialog;
|
||||
using Snap.Hutao.UI.Xaml.View.Window;
|
||||
using Snap.Hutao.ViewModel.User;
|
||||
using Snap.Hutao.Web.ThirdPartyTool;
|
||||
using System.Collections.Immutable;
|
||||
using System.IO;
|
||||
|
||||
@@ -54,6 +57,9 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView
|
||||
|
||||
public ImmutableArray<LaunchScheme> KnownSchemes { get; } = KnownLaunchSchemes.Values;
|
||||
|
||||
private IObservableProperty<ImmutableArray<ToolInfo>> thirdPartyToolsField = new ObservableProperty<ImmutableArray<ToolInfo>>(ImmutableArray<ToolInfo>.Empty);
|
||||
public IObservableProperty<ImmutableArray<ToolInfo>> ThirdPartyTools { get => thirdPartyToolsField; }
|
||||
|
||||
LaunchScheme? IViewModelSupportLaunchExecution.TargetScheme { get => TargetSchemeFilteredGameAccountsView.Scheme; }
|
||||
|
||||
LaunchScheme? IViewModelSupportLaunchExecution.CurrentScheme { get => Shared.GetCurrentLaunchSchemeFromConfigurationFile(); }
|
||||
@@ -123,9 +129,51 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView
|
||||
|
||||
await HandleGamePathEntryChangeAsync().ConfigureAwait(false);
|
||||
Shared.ResumeLaunchExecutionAsync(this).SafeForget();
|
||||
|
||||
// 初始化第三方工具列表（不阻塞页面加载）
|
||||
_ = InitializeThirdPartyToolsInBackgroundAsync(token);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private async Task InitializeThirdPartyToolsInBackgroundAsync(CancellationToken token)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Yield to let navigation/UI finish first.
|
||||
await Task.Yield();
|
||||
|
||||
if (token.IsCancellationRequested || IsViewUnloaded.Value)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ImmutableArray<ToolInfo> tools = await InitializeThirdPartyToolsAsync(token).ConfigureAwait(false);
|
||||
|
||||
if (token.IsCancellationRequested || IsViewUnloaded.Value)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
await taskContext.SwitchToMainThreadAsync();
|
||||
if (!token.IsCancellationRequested && !IsViewUnloaded.Value)
|
||||
{
|
||||
thirdPartyToolsField.Value = tools;
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb($"Failed to initialize third party tools: {ex.Message}", category: "ThirdPartyTool");
|
||||
SentrySdk.CaptureException(ex);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
[Command("IdentifyMonitorsCommand")]
|
||||
private static async Task IdentifyMonitorsAsync()
|
||||
{
|
||||
@@ -302,4 +350,47 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel, IView
|
||||
|
||||
await GameLifeCycle.TryKillGameProcessAsync(taskContext).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
[Command("ShowThirdPartyToolDialogCommand")]
|
||||
private async Task ShowThirdPartyToolDialogAsync(ToolInfo tool)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateUI("Show third party tool dialog", "LaunchGameViewModel.Command"));
|
||||
|
||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
||||
{
|
||||
ThirdPartyToolDialog dialog = await scope.ServiceProvider
|
||||
.GetRequiredService<IContentDialogFactory>()
|
||||
.CreateInstanceAsync<ThirdPartyToolDialog>(scope.ServiceProvider, tool);
|
||||
|
||||
await dialog.ShowAsync();
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask<ImmutableArray<ToolInfo>> InitializeThirdPartyToolsAsync(CancellationToken token)
|
||||
{
|
||||
try
|
||||
{
|
||||
SentrySdk.AddBreadcrumb("Starting to initialize third party tools", category: "ThirdPartyTool");
|
||||
IThirdPartyToolService thirdPartyToolService = serviceProvider.GetRequiredService<IThirdPartyToolService>();
|
||||
SentrySdk.AddBreadcrumb("Got IThirdPartyToolService instance", category: "ThirdPartyTool");
|
||||
|
||||
// Note: service API is not cancellable; we only honor cancellation before/after the call.
|
||||
token.ThrowIfCancellationRequested();
|
||||
ImmutableArray<ToolInfo> tools = await thirdPartyToolService.GetToolsAsync().ConfigureAwait(false);
|
||||
token.ThrowIfCancellationRequested();
|
||||
|
||||
SentrySdk.AddBreadcrumb($"Got {tools.Length} tools from service", category: "ThirdPartyTool");
|
||||
return tools;
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
SentrySdk.AddBreadcrumb($"Failed to initialize third party tools: {ex.Message}", category: "ThirdPartyTool");
|
||||
SentrySdk.CaptureException(ex);
|
||||
return ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,9 +6,9 @@ namespace Snap.Hutao.Web.Endpoint.Hutao;
|
||||
[Service(ServiceLifetime.Singleton, typeof(IHutaoEndpoints), Key = HutaoEndpointsKind.Release)]
|
||||
internal sealed class HutaoEndpointsForRelease : IHutaoEndpoints
|
||||
{
|
||||
string IHomaRootAccess.Root { get => "http://server.wdg.cloudns.ch:5222"; }
|
||||
string IHomaRootAccess.Root { get => "https://htserver.wdg.cloudns.ch/api"; }
|
||||
|
||||
string IInfrastructureRootAccess.Root { get => "http://server.wdg.cloudns.ch:5222"; }
|
||||
string IInfrastructureRootAccess.Root { get => "https://htserver.wdg.cloudns.ch/api"; }
|
||||
|
||||
string IInfrastructureRawRootAccess.RawRoot { get => "http://server.wdg.cloudns.ch:5222"; }
|
||||
string IInfrastructureRawRootAccess.RawRoot { get => "https://htserver.wdg.cloudns.ch/api"; }
|
||||
}
|
||||
@@ -5,7 +5,7 @@ namespace Snap.Hutao.Web.Endpoint.Hutao;
|
||||
|
||||
internal static class StaticResourcesEndpoints
|
||||
{
|
||||
public static string Root { get => "http://server.wdg.cloudns.ch:8007"; }
|
||||
public static string Root { get => "https://htserver.wdg.cloudns.ch"; }
|
||||
|
||||
public static Uri UIIconNone { get; } = StaticRaw("Bg", "UI_Icon_None.png").ToUri();
|
||||
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
namespace Snap.Hutao.Web.Hoyolab.DataSigning;
|
||||
|
||||
/// <summary>
|
||||
/// Salt constants for data signing
|
||||
/// Values are obtained from https://github.com/UIGF-org/Hoyolab.Salt
|
||||
/// This file should normally be generated by Snap.Hutao.SourceGeneration.Automation.SaltConstantGenerator
|
||||
/// But is provided manually when the generator fails to fetch values from the network.
|
||||
///
|
||||
/// IMPORTANT: For local builds, you must manually obtain salt values from:
|
||||
/// https://github.com/UIGF-org/Hoyolab.Salt
|
||||
/// </summary>
|
||||
|
||||
internal static class SaltConstants
|
||||
{
|
||||
// Version numbers - Update these according to the current miHoYo app versions
|
||||
public const string CNVersion = "2.95.1";
|
||||
public const string OSVersion = "2.54.0";
|
||||
|
||||
// Salt keys for Chinese (CN) server
|
||||
// These are placeholder values - MUST be replaced with actual values from UIGF-org/Hoyolab.Salt
|
||||
public const string CNK2 = "sfYPEgpxkOe1I3XVMLdwp1Lyt9ORgZsq";
|
||||
public const string CNLK2 = "sidQFEglajEz7FA0Aj7HQPV88zpf17SO";
|
||||
|
||||
// Salt keys for Overseas (OS) server
|
||||
public const string OSK2 = "599uqkwc0dlqu3h6epzjzfhgyyrd44ae";
|
||||
public const string OSLK2 = "rk4xg2hakoi26nljpr099fv9fck1ah10";
|
||||
|
||||
// Note: The actual salt values are security-sensitive and should not be committed
|
||||
// to public repositories. For local builds, obtain them from the UIGF organization
|
||||
// and replace the placeholders above.
|
||||
}
|
||||
@@ -16,4 +16,6 @@ internal class UploadAnnouncement
|
||||
public string Link { get; set; } = default!;
|
||||
|
||||
public string? MaxPresentVersion { get; set; }
|
||||
|
||||
public string? Distribution { get; set; }
|
||||
}
|
||||
@@ -17,13 +17,13 @@ internal sealed partial class HutaoPassportClient
|
||||
{
|
||||
private const string PublicKey = """
|
||||
-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5W2SEyZSlP2zBI1Sn8Gd
|
||||
TwbZoXlUGNKyoVrY8SVYu9GMefdGZCrUQNkCG/Np8pWPmSSEFGd5oeug/oIMtCZQ
|
||||
NOn0drlR+pul/XZ1KQhKmj/arWjN1XNok2qXF7uxhqD0JyNT/Fxy6QvzqIpBsM9S
|
||||
7ajm8/BOGlPG1SInDPaqTdTRTT30AuN+IhWEEFwT3Ctv1SmDupHs2Oan5qM7Y3uw
|
||||
b6K1rbnk5YokiV2FzHajGUymmSKXqtG1USZzwPqImpYb4Z0M/StPFWdsKqexBqMM
|
||||
mkXckI5O98GdlszEmQ0Ejv5Fx9fR2rXRwM76S4iZTfabYpiMbb4bM42mHMauupj6
|
||||
9QIDAQAB
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy4i0acb1/rTjwNt4Wsi/
|
||||
AgRLztRRGhludiYOWskqS6o0wTy6+DkGNZew/8qy93Tmv/mhYMoBhDJACD7Dpzu6
|
||||
2cdiPl6MW8wuAE+H86Mh7ghWxnUAvdK6Cp3qbk7MaJF2zI/2yYesGYhcf7HZmZmC
|
||||
RldyQnH9SP30FRhmbSAqGAjVSObwfa3W9islkbYB2SkcXguK+hONZmtqISoiUK1/
|
||||
d+ZEpL01MNWI06iUxin+iT3yk68o6reLOk/Yoqjj12pONIwbu7Up4noLhhhmBdR3
|
||||
7Xy9csCounngKoBw+7tEmmzJzeqYm/zeHp/Jpy/996dIxAiq6jVvNpWaT9Es6s08
|
||||
cwIDAQAB
|
||||
-----END PUBLIC KEY-----
|
||||
""";
|
||||
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
using Snap.Hutao.Web.Response;
|
||||
using System.Collections.Immutable;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace Snap.Hutao.Web.ThirdPartyTool;
|
||||
|
||||
internal sealed class ToolApiResponse
|
||||
{
|
||||
[JsonPropertyName("code")]
|
||||
public int Code { get; set; }
|
||||
|
||||
[JsonPropertyName("message")]
|
||||
public string Message { get; set; } = default!;
|
||||
|
||||
[JsonPropertyName("data")]
|
||||
public ImmutableArray<ToolInfo> Data { get; set; } = ImmutableArray<ToolInfo>.Empty;
|
||||
}
|
||||
19
src/Snap.Hutao/Snap.Hutao/Web/ThirdPartyTool/ToolInfo.cs
Normal file
19
src/Snap.Hutao/Snap.Hutao/Web/ThirdPartyTool/ToolInfo.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace Snap.Hutao.Web.ThirdPartyTool;
|
||||
|
||||
internal sealed class ToolInfo
|
||||
{
|
||||
[JsonPropertyName("name")]
|
||||
public string Name { get; set; } = default!;
|
||||
|
||||
[JsonPropertyName("desc")]
|
||||
public string Description { get; set; } = default!;
|
||||
|
||||
[JsonPropertyName("url")]
|
||||
public string Url { get; set; } = default!;
|
||||
|
||||
[JsonPropertyName("files")]
|
||||
public List<string> Files { get; set; } = default!;
|
||||
}
|
||||
Reference in New Issue
Block a user