mirror of
https://github.com/wangdage12/Snap.Hutao.git
synced 2026-02-18 02:42:15 +08:00
Compare commits
79 Commits
1.17.1.0
...
56c36a01ae
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
274b2766ce | ||
|
|
b9130979c1 | ||
|
|
5019987c08 | ||
|
|
adaf0972ce | ||
|
|
b9169ad41a | ||
|
|
00af738520 | ||
|
|
3538665bc6 | ||
|
|
c1a1871284 | ||
|
|
01f965d260 | ||
|
|
cadd35a93e | ||
|
|
0de6d4b71c | ||
|
|
a83f119e8a | ||
|
|
2278c83dd2 | ||
|
|
867f8b6558 | ||
|
|
7e6a6a509c | ||
|
|
7aaa61dcf3 | ||
|
|
1fe5b4969e | ||
|
|
e52ed5470e | ||
|
|
4434d76e35 | ||
|
|
4a9c3229a0 | ||
|
|
1090dfa7c6 | ||
|
|
a4eb3d6f8a | ||
|
|
d9c43844b7 | ||
|
|
2cc2cc80ac | ||
|
|
cc926e4352 | ||
|
|
fa4b975f46 | ||
|
|
299cdee329 | ||
|
|
f49f40b5fd | ||
|
|
ff21a91cc6 | ||
|
|
cc47e050d1 | ||
|
|
c2d0156a9d | ||
|
|
eac314f7d9 | ||
|
|
f1132b79f0 | ||
|
|
63c4792e00 | ||
|
|
5f196253b3 | ||
|
|
a7bb931ea5 | ||
|
|
d318dcbfd0 | ||
|
|
e045413ac1 | ||
|
|
1039623cbf | ||
|
|
3f50507490 | ||
|
|
e55d6ea1c5 | ||
|
|
e96c9f1f49 | ||
|
|
f3d47aeffd | ||
|
|
7ee92db156 | ||
|
|
7c25951950 | ||
|
|
2ad17f60bf | ||
|
|
4fdea542b0 | ||
|
|
4d5e5342f2 | ||
|
|
fde960b7cc | ||
|
|
cfc7ba6274 | ||
|
|
c463f1809c | ||
|
|
3d352c1c12 | ||
|
|
fbf3c0c695 |
13
.github/FUNDING.yml
vendored
13
.github/FUNDING.yml
vendored
@@ -1,13 +0,0 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: [DGP-Studio]
|
||||
patreon: # Replace with a single Patreon username
|
||||
open_collective: snaphutao
|
||||
ko_fi: # Replace with a single Ko-fi username
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
liberapay: # Replace with a single Liberapay username
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
otechie: # Replace with a single Otechie username
|
||||
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||
custom: https://afdian.com/a/DismissedLight
|
||||
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
|
||||
6
.github/workflows/alpha.yml
vendored
6
.github/workflows/alpha.yml
vendored
@@ -73,7 +73,7 @@ jobs:
|
||||
runs-on: ${{ needs.select-runner.outputs.runner }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Setup .NET (self-hosted)
|
||||
if: ${{ needs.select-runner.outputs.runner == 'sjc1' }}
|
||||
@@ -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
|
||||
|
||||
6
.github/workflows/canary.yml
vendored
6
.github/workflows/canary.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
ref: develop
|
||||
fetch-depth: 0
|
||||
@@ -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.'
|
||||
|
||||
38
.github/workflows/msi-build.yml
vendored
Normal file
38
.github/workflows/msi-build.yml
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
name: Build MSI Installer
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: windows-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout source
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Setup .NET SDK
|
||||
uses: actions/setup-dotnet@v5
|
||||
with:
|
||||
dotnet-version: 10.0.x
|
||||
|
||||
- name: Install Wix Toolset 4
|
||||
run: dotnet tool install --global wix --version 4.0.1
|
||||
|
||||
- name: Restore NuGet packages
|
||||
run: dotnet restore src/Snap.Hutao/Snap.Hutao.slnx
|
||||
|
||||
- name: Build WinUI 3 project (self-contained)
|
||||
run: dotnet build src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj -c Release
|
||||
|
||||
- name: Build MSI installer
|
||||
run: dotnet build src/Snap.Hutao/Snap.Hutao.Installer/Snap.Hutao.Installer.wixproj -c Release
|
||||
|
||||
- name: Upload MSI Artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: Snap.Hutao-MSI
|
||||
path: |
|
||||
src/Snap.Hutao/Snap.Hutao.Installer/bin/x64/Release/en-US/*.msi
|
||||
7
.gitignore
vendored
7
.gitignore
vendored
@@ -1,4 +1,4 @@
|
||||
desktop.ini
|
||||
desktop.ini
|
||||
|
||||
*.csproj.user
|
||||
*.DotSettings.user
|
||||
@@ -24,4 +24,7 @@ src/Snap.Hutao/Snap.Hutao/Generated Files/
|
||||
|
||||
tools/
|
||||
|
||||
src/Snap.Hutao/Snap.Hutao/AppPackages
|
||||
src/Snap.Hutao/Snap.Hutao/AppPackages
|
||||
/src/Snap.Hutao/Snap.Hutao.Installer/obj
|
||||
/src/Snap.Hutao/Snap.Hutao.Installer/bin/x64/Release/en-US
|
||||
/src/Snap.Hutao/Snap.Hutao.Installer/bin
|
||||
|
||||
179
README.md
179
README.md
@@ -1,54 +1,13 @@
|
||||
<p align="center">
|
||||
<img src="https://github.com/user-attachments/assets/976e057c-f01e-486b-9fa0-04744ae96f99" alt="Snap Hutao Banner" width="600"/>
|
||||
</p>
|
||||
|
||||
<h1 align="center">Snap Hutao</h1>
|
||||
|
||||
<p align="center">
|
||||
🎮 开源的原神工具箱,专为 Windows 平台设计,改善桌面端玩家的游戏体验
|
||||
<br/>
|
||||
🎮 An open-source Genshin Impact toolkit for Windows, designed to improve the desktop gaming experience
|
||||
</p>
|
||||
|
||||
<div align="center">
|
||||
<table>
|
||||
<tr>
|
||||
<td align="center" style="padding:0 10px;">
|
||||
<b>Latest CI/CD Build</sub>
|
||||
</td>
|
||||
<td align="center" style="padding:0 10px;">
|
||||
<b>Latest Release</sub>
|
||||
</td>
|
||||
<td align="center" style="padding:0 10px;">
|
||||
<b>Downloads</sub>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="padding:0 10px;">
|
||||
<a href="https://ci.appveyor.com/project/DGP-Studio/snap-hutao">
|
||||
<img src="https://ci.appveyor.com/api/projects/status/n4s40t9llru4si9y?svg=true" alt="Build Status"/>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center" style="padding:0 10px;">
|
||||
<a href="https://github.com/DGP-Studio/Snap.Hutao/releases/latest">
|
||||
<img src="https://img.shields.io/github/release/DGP-Studio/Snap.Hutao?style=flat" alt="Release"/>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center" style="padding:0 10px;">
|
||||
<img src="https://img.shields.io/github/downloads/DGP-Studio/Snap.Hutao/total.svg?style=flat" alt="Downloads"/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
---
|
||||
|
||||
## 📖 简介 / Introduction
|
||||
|
||||
**中文**
|
||||
胡桃工具箱是一款以 MIT 协议开源的原神工具箱,专为现代化 Windows 平台设计,旨在改善桌面端玩家的游戏体验。
|
||||
|
||||
该版本注入功能暂不可用,并且由于缺失资源和开发能力,不建议长期使用
|
||||
|
||||
有条件的话可以加入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.
|
||||
|
||||
@@ -56,89 +15,77 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
|
||||
|
||||
## 🚀 安装 / Installation
|
||||
|
||||
**中文**
|
||||
你可以按照 [快速开始](https://hut.ao/zh/quick-start.html) 文档中提供的流程安装并设置 Snap Hutao。
|
||||
> 如果你的设备不支持ipv6,请下载末尾带有`ipv4`的压缩包,正常情况下请尽量下载普通包(服务器速度快)
|
||||
|
||||
**English**
|
||||
You can follow the instructions in the [Quick Start](https://hut.ao/en/quick-start.html) document to install and set up Snap Hutao.
|
||||
目前 Sanp.Hutao.Rev 更新了打包方式,并采用了标准现代的 msi 安装,方便程序获取管理员权限和更多的功能设置,不再需要原 Depolyment
|
||||
|
||||
只有`.msi`安装包安装的可以和之前的版本共存,如果通过`.msix`安装包安装则可能出现`0x80073CF3`,备份旧版本数据文件夹后卸载旧版本即可继续安装,将旧版本数据文件夹里面的文件复制到该版本的数据文件夹中即可恢复数据
|
||||
|
||||
---
|
||||
|
||||
## 🌍 本地化翻译 / Localization
|
||||
## 开发
|
||||
项目启动位置已升级为 VS2026 的 slnx 格式 Snap.Hutao\src\Snap.Hutao\Snap.Hutao.slnx
|
||||
> [!WARNING]
|
||||
> 要使该项目可以长期运行,我们需要以下资源
|
||||
> 1. 元数据的编写
|
||||
> 2. 图片资源
|
||||
|
||||
Snap Hutao 使用 [Crowdin](https://translate.hut.ao/) 作为客户端文本翻译平台,在该平台上你可以为你熟悉的语言提交翻译文本。我们感谢每一个为 Snap Hutao 做出贡献的社区成员,并且欢迎更多的朋友能参与到这个项目中。
|
||||
已同步原作者的元数据
|
||||
|
||||
Snap Hutao uses [Crowdin](https://translate.hut.ao/) as a client text translation platform where you can submit translated text for languages you are familiar with. We are grateful to every community member who has contributed to Snap Hutao and welcome more friends to participate in this project.
|
||||
**目前元数据的编写进度:**
|
||||
|
||||
| Language | Status |
|
||||
|----------|--------|
|
||||
| zh-TW | [](https://crowdin.com/project/snap-hutao) |
|
||||
| en | [](https://crowdin.com/project/snap-hutao) |
|
||||
| fr | [](https://crowdin.com/project/snap-hutao) |
|
||||
| id | [](https://crowdin.com/project/snap-hutao) |
|
||||
| ja | [](https://crowdin.com/project/snap-hutao) |
|
||||
| ko | [](https://crowdin.com/project/snap-hutao) |
|
||||
| pt-PT | [](https://crowdin.com/project/snap-hutao) |
|
||||
| ru | [](https://crowdin.com/project/snap-hutao) |
|
||||
| vi | [](https://crowdin.com/project/snap-hutao) |
|
||||
| 项目(V6.2) | 是否完成 |
|
||||
| ----------- | ----------- |
|
||||
| 总体数据 | ✔️ |
|
||||
|
||||
✔️:已完成
|
||||
❌:未编写
|
||||
❇️:编写中
|
||||
❔:数据暂时无法得到
|
||||
/ :似乎不需要变动
|
||||
💠:低优先级,以后编写
|
||||
|
||||
**若需编译项目,请使用[Visual Studio 2026](https://visualstudio.microsoft.com/zh-hans/)**
|
||||
调试选项请选择unpackaged(不打包)
|
||||
**原开发文档现在还可使用(其中的AI功能很好用),以下是开发文档链接:**
|
||||
|
||||
https://deepwiki.com/DGP-Studio/Snap.Hutao
|
||||
|
||||
https://deepwiki.com/DGP-Studio/Snap.Hutao.Server
|
||||
## 打包测试
|
||||
|
||||
由于采用了 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)
|
||||
|
||||
**元数据仓库:**
|
||||
https://github.com/wangdage12/Snap.Metadata
|
||||
|
||||
镜像:
|
||||

|
||||
|
||||
http://htgit.wdg.cloudns.ch/wdg1122/Snap.Metadata
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ 贡献 / Contribute
|
||||
**临时API:**
|
||||
|
||||

|
||||
|
||||
https://htserver.wdg.cloudns.ch/api/
|
||||
|
||||
- [向我们提交 PR / Make Pull Requests](https://hut.ao/development/contribute.html)
|
||||
- [为我们更新文档 / Enhance our Document](https://github.com/DGP-Studio/Snap.Hutao.Docs)
|
||||
- [通过 DeepWiKi 了解项目结构 / Understand Project Structure with DeepWiKi](https://deepwiki.com/DGP-Studio/Snap.Hutao)
|
||||
- [](https://deepwiki.com/DGP-Studio/Snap.Hutao)
|
||||
|
||||
---
|
||||
|
||||
## 🙏 特别感谢 / Special Thanks
|
||||
**临时资源站:**
|
||||
|
||||
- [HolographicHat](https://github.com/HolographicHat)
|
||||
- [UIGF organization](https://uigf.org)
|
||||
|
||||
**特定的原神项目 / Specific Genshin-related Projects**
|
||||
- [Scighost/Starward](https://github.com/Scighost/Starward)
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ 使用的技术栈 / Tech Stack
|
||||
|
||||
- [CommunityToolkit/dotnet](https://github.com/CommunityToolkit/dotnet)
|
||||
- [CommunityToolkit/Labs-Windows](https://github.com/CommunityToolkit/Labs-Windows)
|
||||
- [CommunityToolkit/Windows](https://github.com/CommunityToolkit/Windows)
|
||||
- [dotnet/efcore](https://github.com/dotnet/efcore)
|
||||
- [dotnet/runtime](https://github.com/dotnet/runtime)
|
||||
- [microsoft/vs-validation](https://github.com/microsoft/vs-validation)
|
||||
- [microsoft/WindowsAppSDK](https://github.com/microsoft/WindowsAppSDK)
|
||||
- [microsoft/microsoft-ui-xaml](https://github.com/microsoft/microsoft-ui-xaml)
|
||||
- [quartznet/quartznet](https://github.com/quartznet/quartznet)
|
||||
|
||||
---
|
||||
|
||||
## ❤️ 赞助商 / Sponsorship
|
||||
|
||||
Snap Hutao is currently using sponsored software from the following service providers.
|
||||
|
||||
<img src="./res/assets/readmeSponsors.svg" alt="Readme Sponsors" />
|
||||
|
||||
- 🏠 [Netlify](https://www.netlify.com/) provides document and home page hosting service for Snap Hutao
|
||||
- 🌍 [Crowdin](https://crowdin.com/) provides its SaaS platform to help Snap Hutao's localization
|
||||
- 🗄️ [Navicat](https://navicat.com/) provides Snap Hutao with advanced database management tools
|
||||
- 🔒 Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
|
||||
- 🔑 [1Password](https://1password.com/) provides Snap Hutao development team with their amazing password management software
|
||||
- 🐳 [DigitalOcean](https://www.digitalocean.com) provides reliable cloud database and container service for Snap Hutao database backup
|
||||
- 📊 [Ducalis.io](https://hi.ducalis.io/) provides Snap Hutao project with a complete decision-making toolkit for project management
|
||||
- ☁️ [Cloudflare](https://www.cloudflare.com/) sponsors Snap Hutao with their Business Plan, ensuring secure, fast, and reliable worldwide connection to our infrastructure
|
||||
- 🔐 [Termius](https://termius.com) provides a secure, reliable, and collaborative SSH client
|
||||
|
||||
---
|
||||
|
||||
## 📈 开发 / Development
|
||||
|
||||

|
||||
|
||||
[](https://star-history.com/#DGP-Studio/Snap.Hutao&Date)
|
||||
|
||||
[](https://github.com/DGP-Studio/Snap.Hutao)
|
||||
https://htserver.wdg.cloudns.ch/
|
||||
|
||||
BIN
bin/unlockfps.exe
Normal file
BIN
bin/unlockfps.exe
Normal file
Binary file not shown.
3
src/Snap.Hutao/Snap.Hutao.Installer/Folders.wxs
Normal file
3
src/Snap.Hutao/Snap.Hutao.Installer/Folders.wxs
Normal file
@@ -0,0 +1,3 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
|
||||
</Wix>
|
||||
8
src/Snap.Hutao/Snap.Hutao.Installer/Package.en-us.wxl
Normal file
8
src/Snap.Hutao/Snap.Hutao.Installer/Package.en-us.wxl
Normal file
@@ -0,0 +1,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." />
|
||||
|
||||
</WixLocalization>
|
||||
79
src/Snap.Hutao/Snap.Hutao.Installer/Package.wxs
Normal file
79
src/Snap.Hutao/Snap.Hutao.Installer/Package.wxs
Normal file
@@ -0,0 +1,79 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<Package
|
||||
Name="Snap.Hutao"
|
||||
Manufacturer="Millennium Science Technology R-D Inst"
|
||||
Version="1.17.4.0"
|
||||
UpgradeCode="121203be-60cb-408f-92cc-7080f6598e68"
|
||||
Scope="perMachine">
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
|
||||
<Feature Id="ProductFeature" Title="Snap.Hutao" Level="1">
|
||||
<ComponentGroupRef Id="MainAppComponents" />
|
||||
|
||||
<!-- 快捷方式组件 -->
|
||||
<ComponentRef Id="ApplicationShortcut" />
|
||||
<ComponentRef Id="DesktopShortcut" />
|
||||
</Feature>
|
||||
</Package>
|
||||
|
||||
<!-- 安装目录 -->
|
||||
<Fragment>
|
||||
<StandardDirectory Id="ProgramFiles64Folder">
|
||||
<Directory Id="INSTALLFOLDER" Name="Snap.Hutao" />
|
||||
</StandardDirectory>
|
||||
|
||||
<StandardDirectory Id="ProgramMenuFolder">
|
||||
<Directory Id="ApplicationProgramsFolder" Name="Snap Hutao" />
|
||||
</StandardDirectory>
|
||||
|
||||
<StandardDirectory Id="DesktopFolder" />
|
||||
</Fragment>
|
||||
|
||||
<!-- 桌面快捷方式 -->
|
||||
<Fragment>
|
||||
<Component Id="DesktopShortcut" Directory="DesktopFolder" Guid="*">
|
||||
|
||||
<Shortcut
|
||||
Id="DesktopShortcut_Normal"
|
||||
Name="Snap Hutao"
|
||||
Description="Snap Hutao Client"
|
||||
Target="[INSTALLFOLDER]Snap.Hutao.exe"
|
||||
WorkingDirectory="INSTALLFOLDER" />
|
||||
|
||||
<!-- KeyPath 必须是 HKCU,因为快捷方式安装到用户目录 -->
|
||||
<RegistryValue
|
||||
Root="HKCU"
|
||||
Key="Software\Snap.Hutao"
|
||||
Name="DesktopShortcutInstalled"
|
||||
Type="integer"
|
||||
Value="1"
|
||||
KeyPath="yes" />
|
||||
</Component>
|
||||
</Fragment>
|
||||
|
||||
<!-- 开始菜单快捷方式 -->
|
||||
<Fragment>
|
||||
<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Guid="*">
|
||||
|
||||
<Shortcut
|
||||
Id="ApplicationStartMenuShortcut"
|
||||
Name="Snap Hutao"
|
||||
Description="Snap Hutao Client"
|
||||
Target="[INSTALLFOLDER]Snap.Hutao.exe"
|
||||
WorkingDirectory="INSTALLFOLDER" />
|
||||
|
||||
<RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall" />
|
||||
|
||||
<!-- KeyPath 依然必须改为 HKCU -->
|
||||
<RegistryValue
|
||||
Root="HKCU"
|
||||
Key="Software\Snap.Hutao"
|
||||
Name="StartMenuShortcutInstalled"
|
||||
Type="integer"
|
||||
Value="1"
|
||||
KeyPath="yes" />
|
||||
</Component>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
@@ -0,0 +1,24 @@
|
||||
<Project Sdk="WixToolset.Sdk/6.0.2">
|
||||
<PropertyGroup>
|
||||
<SuppressIces>ICE03;ICE60</SuppressIces>
|
||||
<Platform>x64</Platform>
|
||||
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
|
||||
<Configuration>Release</Configuration>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Snap.Hutao\Snap.Hutao.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<HarvestDirectory Include="..\Snap.Hutao\bin\Release\net10.0-windows10.0.26100.0\win-x64">
|
||||
<ComponentGroupName>MainAppComponents</ComponentGroupName>
|
||||
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
|
||||
<SuppressCom>true</SuppressCom>
|
||||
<SuppressRegistry>true</SuppressRegistry>
|
||||
<SuppressRootDirectory>true</SuppressRootDirectory>
|
||||
</HarvestDirectory>
|
||||
|
||||
<PackageReference Include="WixToolset.Heat" Version="4.0.1" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,4 +1,8 @@
|
||||
# Snap.Hutao.SourceGeneration
|
||||
|
||||
> 生成器包的备份,目前还可以从nuget上获取,所以暂时不需要使用该目录
|
||||
> https://www.nuget.org/packages/Snap.Hutao.SourceGeneration/1.3.14
|
||||
|
||||
Source Code Generator for Snap.Hutao
|
||||
|
||||
# Development Guideline
|
||||
@@ -7,4 +11,4 @@ Use https://roslynquoter.azurewebsites.net/ to get SyntaxTree
|
||||
|
||||
1. Every `IncrementalValue(s)Provider<T>`'s step result should be an `IEquatable<T>` to make it really becomes incremental.
|
||||
2. So the intermediate models should be a `record (class/struct)` if possible
|
||||
3. Intermediate array/enumerable should be a `ImmutableArray<T>` if possible, the pipeline use IA internally and has special check for it.
|
||||
3. Intermediate array/enumerable should be a `ImmutableArray<T>` if possible, the pipeline use IA internally and has special check for it.
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
<Solution>
|
||||
<Configurations>
|
||||
<Platform Name="Any CPU" />
|
||||
<Platform Name="ARM64" />
|
||||
<Platform Name="x64" />
|
||||
<Platform Name="x86" />
|
||||
</Configurations>
|
||||
<Folder Name="/Solution Items/">
|
||||
<File Path=".editorconfig" />
|
||||
<File Path=".vsconfig" />
|
||||
</Folder>
|
||||
<Project Path="Snap.Hutao.Test\Snap.Hutao.Test.csproj" />
|
||||
<Project Path="Snap.Hutao\Snap.Hutao.csproj">
|
||||
<!-- For Rider -->
|
||||
<Configuration Solution="Debug|Any CPU" Project="Debug|x64|Deploy" />
|
||||
<Configuration Solution="Debug|x64" Project="Debug|x64|Deploy" />
|
||||
<Configuration Solution="Release|Any CPU" Project="Release|x64|Deploy" />
|
||||
<Configuration Solution="Release|x64" Project="Release|x64|Deploy" />
|
||||
<!-- For Visual Studio -->
|
||||
<Project Path="Snap.Hutao.Installer/Snap.Hutao.Installer.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" Id="91a04cd0-28cc-4562-92e1-202bc163edd7">
|
||||
<Platform Solution="*|Any CPU" Project="x64" />
|
||||
<Platform Solution="*|arm64" Project="arm64" />
|
||||
<Platform Solution="*|x64" Project="x64" />
|
||||
<Platform Solution="*|x86" Project="x86" />
|
||||
<Deploy />
|
||||
</Project>
|
||||
<Project Path="Snap.Hutao.Test\Snap.Hutao.Test.csproj">
|
||||
<Build Solution="*|ARM64" Project="false" />
|
||||
<Build Solution="*|x86" Project="false" />
|
||||
</Project>
|
||||
<Project Path="Snap.Hutao\Snap.Hutao.csproj">
|
||||
<Platform Project="x64" />
|
||||
<Deploy Solution="*|Any CPU" />
|
||||
<Deploy Solution="*|x64" />
|
||||
</Project>
|
||||
</Solution>
|
||||
@@ -13,6 +13,7 @@ using Snap.Hutao.Service;
|
||||
using Snap.Hutao.UI.Xaml;
|
||||
using Snap.Hutao.UI.Xaml.Control.Theme;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
|
||||
namespace Snap.Hutao;
|
||||
|
||||
@@ -64,6 +65,11 @@ public sealed partial class App : Application
|
||||
|
||||
protected override void OnLaunched(LaunchActivatedEventArgs args)
|
||||
{
|
||||
// ⚠️ 添加启动诊断
|
||||
#if DEBUG
|
||||
Core.ApplicationModel.PackageIdentityDiagnostics.LogDiagnostics();
|
||||
#endif
|
||||
|
||||
DebugPatchXamlDiagnosticsRemoveRootObjectFromLVT();
|
||||
|
||||
try
|
||||
@@ -71,17 +77,40 @@ public sealed partial class App : Application
|
||||
// Important: You must call AppNotificationManager::Default().Register
|
||||
// before calling AppInstance.GetCurrent.GetActivatedEventArgs.
|
||||
AppNotificationManager.Default.NotificationInvoked += activation.NotificationInvoked;
|
||||
AppNotificationManager.Default.Register();
|
||||
|
||||
try
|
||||
{
|
||||
AppNotificationManager.Default.Register();
|
||||
}
|
||||
catch
|
||||
{
|
||||
// In unpackaged mode, this might fail - continue anyway
|
||||
}
|
||||
|
||||
// E_INVALIDARG E_OUTOFMEMORY
|
||||
AppActivationArguments activatedEventArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
|
||||
AppActivationArguments? activatedEventArgs = null;
|
||||
PrivateNamedPipeClient? namedPipeClient = null;
|
||||
|
||||
if (serviceProvider.GetRequiredService<PrivateNamedPipeClient>().TryRedirectActivationTo(activatedEventArgs))
|
||||
try
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateInfo("Application exiting on RedirectActivationTo", "Hutao"));
|
||||
XamlApplicationLifetime.ActivationAndInitializationCompleted = true;
|
||||
Exit();
|
||||
return;
|
||||
activatedEventArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
|
||||
namedPipeClient = serviceProvider.GetRequiredService<PrivateNamedPipeClient>();
|
||||
}
|
||||
catch
|
||||
{
|
||||
// In unpackaged mode, AppInstance might not work
|
||||
// Create a default activation argument for launch
|
||||
}
|
||||
|
||||
if (activatedEventArgs is not null && namedPipeClient is not null)
|
||||
{
|
||||
if (namedPipeClient.TryRedirectActivationTo(activatedEventArgs))
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateInfo("Application exiting on RedirectActivationTo", "Hutao"));
|
||||
XamlApplicationLifetime.ActivationAndInitializationCompleted = true;
|
||||
Exit();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
logger.LogInformation($"{ConsoleBanner}");
|
||||
@@ -90,10 +119,30 @@ public sealed partial class App : Application
|
||||
|
||||
// Manually invoke
|
||||
SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateInfo("Activate and Initialize", "Application"));
|
||||
activation.ActivateAndInitialize(HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs));
|
||||
|
||||
HutaoActivationArguments hutaoArgs = activatedEventArgs is not null
|
||||
? HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs)
|
||||
: HutaoActivationArguments.CreateDefaultLaunchArguments();
|
||||
|
||||
activation.ActivateAndInitialize(hutaoArgs);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// ⚠️ 添加更详细的异常日志
|
||||
try
|
||||
{
|
||||
string errorPath = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"Hutao",
|
||||
"startup_error.txt");
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(errorPath)!);
|
||||
File.WriteAllText(errorPath, $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] Startup Error:\n{ex}");
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Ignore
|
||||
}
|
||||
|
||||
SentrySdk.CaptureException(ex);
|
||||
SentrySdk.Flush();
|
||||
|
||||
|
||||
@@ -31,8 +31,15 @@ public static partial class Bootstrap
|
||||
[STAThread]
|
||||
private static void Main(string[] args)
|
||||
{
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Starting...");
|
||||
#endif
|
||||
|
||||
if (Mutex.TryOpenExisting(LockName, out _))
|
||||
{
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Another instance is running");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -42,9 +49,16 @@ public static partial class Bootstrap
|
||||
mutexSecurity.AddAccessRule(new(SecurityIdentifiers.Everyone, MutexRights.FullControl, AccessControlType.Allow));
|
||||
mutex = MutexAcl.Create(true, LockName, out bool created, mutexSecurity);
|
||||
Debug.Assert(created);
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Mutex created");
|
||||
#endif
|
||||
}
|
||||
catch (WaitHandleCannotBeOpenedException)
|
||||
{
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] WaitHandleCannotBeOpenedException");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -54,34 +68,70 @@ public static partial class Bootstrap
|
||||
{
|
||||
if (!OSPlatformSupported())
|
||||
{
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] OS not supported");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Setting environment variables");
|
||||
#endif
|
||||
|
||||
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00000000");
|
||||
Environment.SetEnvironmentVariable("DOTNET_SYSTEM_BUFFERS_SHAREDARRAYPOOL_MAXARRAYSPERPARTITION", "128");
|
||||
AppContext.SetData("MVVMTOOLKIT_ENABLE_INOTIFYPROPERTYCHANGING_SUPPORT", false);
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Initializing COM wrappers");
|
||||
#endif
|
||||
|
||||
ComWrappersSupport.InitializeComWrappers();
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Initializing DI container");
|
||||
#endif
|
||||
|
||||
// By adding the using statement, we can dispose the injected services when closing
|
||||
using (ServiceProvider serviceProvider = DependencyInjection.Initialize())
|
||||
{
|
||||
Thread.CurrentThread.Name = "Snap Hutao Application Main Thread";
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Calling Application.Start()");
|
||||
#endif
|
||||
|
||||
// If you hit a COMException REGDB_E_CLASSNOTREG (0x80040154) during debugging
|
||||
// You can delete bin and obj folder and then rebuild.
|
||||
// In a Desktop app this runs a message pump internally,
|
||||
// and does not return until the application shuts down.
|
||||
Application.Start(AppInitializationCallback);
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Application.Start() returned");
|
||||
#endif
|
||||
|
||||
XamlApplicationLifetime.Exited = true;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Flushing Sentry");
|
||||
#endif
|
||||
|
||||
SentrySdk.Flush();
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.Main] Exiting");
|
||||
#endif
|
||||
}
|
||||
|
||||
private static void InitializeApp(ApplicationInitializationCallbackParams param)
|
||||
{
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.InitializeApp] Callback invoked");
|
||||
#endif
|
||||
|
||||
Gen2GcCallback.Register(() =>
|
||||
{
|
||||
SentrySdk.AddBreadcrumb(BreadcrumbFactory.CreateDebug("Gen2 GC triggered.", "Runtime"));
|
||||
@@ -90,8 +140,17 @@ public static partial class Bootstrap
|
||||
|
||||
IServiceProvider serviceProvider = Ioc.Default;
|
||||
|
||||
_ = serviceProvider.GetRequiredService<ITaskContext>();
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.InitializeApp] Creating App instance");
|
||||
#endif
|
||||
|
||||
// ⚠️ 只创建 App
|
||||
// TaskContext 将在第一次被需要时自动创建(延迟初始化)
|
||||
_ = serviceProvider.GetRequiredService<App>();
|
||||
|
||||
#if DEBUG
|
||||
System.Diagnostics.Debug.WriteLine("[Bootstrap.InitializeApp] Initialization complete (TaskContext will be lazily created)");
|
||||
#endif
|
||||
}
|
||||
|
||||
private static bool OSPlatformSupported()
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
using System.Collections.Frozen;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using Windows.ApplicationModel;
|
||||
|
||||
namespace Snap.Hutao.Core.ApplicationModel;
|
||||
|
||||
internal static class LimitedAccessFeatures
|
||||
{
|
||||
private static readonly string PackagePublisherId = Package.Current.Id.PublisherId;
|
||||
private static readonly string PackageFamilyName = Package.Current.Id.FamilyName;
|
||||
private static readonly string PackagePublisherId = PackageIdentityAdapter.PublisherId;
|
||||
private static readonly string PackageFamilyName = PackageIdentityAdapter.FamilyName;
|
||||
|
||||
private static readonly FrozenDictionary<string, string> Features = WinRTAdaptive.ToFrozenDictionary(
|
||||
[
|
||||
@@ -67,8 +66,15 @@ internal static class LimitedAccessFeatures
|
||||
KeyValuePair.Create("com.microsoft.windows.windowdecorations", "425261a8-7f73-4319-8a53-fc13f87e1717")
|
||||
]);
|
||||
|
||||
public static LimitedAccessFeatureRequestResult TryUnlockFeature(string featureId)
|
||||
public static Windows.ApplicationModel.LimitedAccessFeatureRequestResult TryUnlockFeature(string featureId)
|
||||
{
|
||||
if (!PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
// In unpackaged mode, we can't unlock limited access features
|
||||
// Create a dummy result - actual implementation will handle the failure
|
||||
return default;
|
||||
}
|
||||
|
||||
return Windows.ApplicationModel.LimitedAccessFeatures.TryUnlockFeature(featureId, GetToken(featureId), GetAttestation(featureId));
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
// Copyright (c) Millennium-Science-Technology-R-D-Inst. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Snap.Hutao.Core.ApplicationModel;
|
||||
|
||||
/// <summary>
|
||||
/// Adapter to handle both packaged and unpackaged app scenarios
|
||||
/// </summary>
|
||||
internal static class PackageIdentityAdapter
|
||||
{
|
||||
private static readonly Lazy<bool> LazyHasPackageIdentity = new(CheckPackageIdentity);
|
||||
private static readonly Lazy<string> LazyAppDirectory = new(GetAppDirectoryPath);
|
||||
private static readonly Lazy<Version> LazyAppVersion = new(GetAppVersionInternal);
|
||||
private static readonly Lazy<string> LazyFamilyName = new(GetFamilyNameInternal);
|
||||
private static readonly Lazy<string> LazyPublisherId = new(GetPublisherIdInternal);
|
||||
|
||||
/// <summary>
|
||||
/// Check if the app has package identity
|
||||
/// </summary>
|
||||
public static bool HasPackageIdentity => LazyHasPackageIdentity.Value;
|
||||
|
||||
/// <summary>
|
||||
/// Get application installation directory
|
||||
/// </summary>
|
||||
public static string AppDirectory => LazyAppDirectory.Value;
|
||||
|
||||
/// <summary>
|
||||
/// Get application version
|
||||
/// </summary>
|
||||
public static Version AppVersion => LazyAppVersion.Value;
|
||||
|
||||
/// <summary>
|
||||
/// Get package family name (or fallback for unpackaged)
|
||||
/// </summary>
|
||||
public static string FamilyName => LazyFamilyName.Value;
|
||||
|
||||
/// <summary>
|
||||
/// Get publisher ID (or fallback for unpackaged)
|
||||
/// </summary>
|
||||
public static string PublisherId => LazyPublisherId.Value;
|
||||
|
||||
private static bool CheckPackageIdentity()
|
||||
{
|
||||
try
|
||||
{
|
||||
// Try to access Package.Current - if it throws, we don't have package identity
|
||||
_ = Windows.ApplicationModel.Package.Current.Id;
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static string GetAppDirectoryPath()
|
||||
{
|
||||
if (HasPackageIdentity)
|
||||
{
|
||||
return Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
|
||||
}
|
||||
|
||||
// Unpackaged: use the exe directory
|
||||
string? exePath = Process.GetCurrentProcess().MainModule?.FileName;
|
||||
ArgumentException.ThrowIfNullOrEmpty(exePath);
|
||||
string? directory = Path.GetDirectoryName(exePath);
|
||||
ArgumentException.ThrowIfNullOrEmpty(directory);
|
||||
return directory;
|
||||
}
|
||||
|
||||
private static Version GetAppVersionInternal()
|
||||
{
|
||||
if (HasPackageIdentity)
|
||||
{
|
||||
return Windows.ApplicationModel.Package.Current.Id.Version.ToVersion();
|
||||
}
|
||||
|
||||
// Unpackaged: use assembly version
|
||||
Assembly assembly = Assembly.GetExecutingAssembly();
|
||||
Version? version = assembly.GetName().Version;
|
||||
return version ?? new Version(1, 0, 0, 0);
|
||||
}
|
||||
|
||||
private static string GetFamilyNameInternal()
|
||||
{
|
||||
if (HasPackageIdentity)
|
||||
{
|
||||
return Windows.ApplicationModel.Package.Current.Id.FamilyName;
|
||||
}
|
||||
|
||||
// Unpackaged: use a deterministic fallback
|
||||
return "Snap.Hutao.Unpackaged";
|
||||
}
|
||||
|
||||
private static string GetPublisherIdInternal()
|
||||
{
|
||||
if (HasPackageIdentity)
|
||||
{
|
||||
return Windows.ApplicationModel.Package.Current.Id.PublisherId;
|
||||
}
|
||||
|
||||
// Unpackaged: use a fallback
|
||||
return "CN=Millennium-Science-Technology-R-D-Inst";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
// Copyright (c) Millennium-Science-Technology-R-D-Inst. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
|
||||
namespace Snap.Hutao.Core.ApplicationModel;
|
||||
|
||||
/// <summary>
|
||||
/// Diagnostic helper for PackageIdentityAdapter
|
||||
/// </summary>
|
||||
internal static class PackageIdentityDiagnostics
|
||||
{
|
||||
public static void LogDiagnostics()
|
||||
{
|
||||
try
|
||||
{
|
||||
string logPath = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"Hutao",
|
||||
"startup_diagnostics.txt");
|
||||
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(logPath)!);
|
||||
|
||||
using (StreamWriter writer = File.CreateText(logPath))
|
||||
{
|
||||
writer.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] Startup Diagnostics");
|
||||
writer.WriteLine($"HasPackageIdentity: {PackageIdentityAdapter.HasPackageIdentity}");
|
||||
writer.WriteLine($"AppVersion: {PackageIdentityAdapter.AppVersion}");
|
||||
writer.WriteLine($"AppDirectory: {PackageIdentityAdapter.AppDirectory}");
|
||||
writer.WriteLine($"FamilyName: {PackageIdentityAdapter.FamilyName}");
|
||||
writer.WriteLine($"PublisherId: {PackageIdentityAdapter.PublisherId}");
|
||||
writer.WriteLine("---");
|
||||
}
|
||||
|
||||
Debug.WriteLine($"Diagnostics written to: {logPath}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.WriteLine($"Failed to write diagnostics: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Snap.Hutao.Core.ApplicationModel;
|
||||
using Snap.Hutao.Model.Entity.Database;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
@@ -17,7 +18,20 @@ internal sealed partial class HutaoDiagnostics : IHutaoDiagnostics
|
||||
[GeneratedConstructor]
|
||||
public partial HutaoDiagnostics(IServiceProvider serviceProvider);
|
||||
|
||||
public ApplicationDataContainer LocalSettings { get => ApplicationData.Current.LocalSettings; }
|
||||
public ApplicationDataContainer? LocalSettings
|
||||
{
|
||||
get
|
||||
{
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
return ApplicationData.Current.LocalSettings;
|
||||
}
|
||||
|
||||
// In unpackaged mode, ApplicationDataContainer is not available
|
||||
// Return null - scripting/diagnostics code should handle this gracefully
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public async ValueTask<int> ExecuteSqlAsync(string sql)
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace Snap.Hutao.Core.Diagnostics;
|
||||
[SuppressMessage("", "SH001", Justification = "IHutaoDiagnostics must be public in order to be exposed to the scripting environment")]
|
||||
public interface IHutaoDiagnostics
|
||||
{
|
||||
ApplicationDataContainer LocalSettings { get; }
|
||||
ApplicationDataContainer? LocalSettings { get; }
|
||||
|
||||
ValueTask<int> ExecuteSqlAsync(string sql);
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using Microsoft.Win32;
|
||||
using Microsoft.Windows.AppNotifications;
|
||||
using Snap.Hutao.Core.ApplicationModel;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Core.IO;
|
||||
using Snap.Hutao.Core.IO.Hashing;
|
||||
@@ -13,31 +14,32 @@ using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using Windows.ApplicationModel;
|
||||
using Windows.Storage;
|
||||
|
||||
namespace Snap.Hutao.Core;
|
||||
|
||||
internal static class HutaoRuntime
|
||||
{
|
||||
public static Version Version { get; } = Package.Current.Id.Version.ToVersion();
|
||||
public static Version Version { get; } = PackageIdentityAdapter.AppVersion;
|
||||
|
||||
public static string UserAgent { get; } = $"Snap Hutao/{Version}";
|
||||
|
||||
public static string DataDirectory { get; } = InitializeDataDirectory();
|
||||
|
||||
public static string LocalCacheDirectory { get; } = ApplicationData.Current.LocalCacheFolder.Path;
|
||||
public static string LocalCacheDirectory { get; } = InitializeLocalCacheDirectory();
|
||||
|
||||
public static string FamilyName { get; } = Package.Current.Id.FamilyName;
|
||||
public static string FamilyName { get; } = PackageIdentityAdapter.FamilyName;
|
||||
|
||||
public static string DeviceId { get; } = InitializeDeviceId();
|
||||
|
||||
public static WebView2Version WebView2Version { get; } = InitializeWebView2();
|
||||
|
||||
public static bool IsProcessElevated { get; } = LocalSetting.Get(SettingKeys.OverrideElevationRequirement, false) || Environment.IsPrivilegedProcess;
|
||||
// ⚠️ 延迟初始化以避免循环依赖
|
||||
private static readonly Lazy<bool> LazyIsProcessElevated = new(GetIsProcessElevated);
|
||||
|
||||
public static bool IsProcessElevated => LazyIsProcessElevated.Value;
|
||||
|
||||
// Requires main thread
|
||||
public static bool IsAppNotificationEnabled { get; } = AppNotificationManager.Default.Setting is AppNotificationSetting.Enabled;
|
||||
public static bool IsAppNotificationEnabled { get; } = CheckAppNotificationEnabled();
|
||||
|
||||
public static string? GetDisplayName()
|
||||
{
|
||||
@@ -106,32 +108,57 @@ internal static class HutaoRuntime
|
||||
return string.Intern(directory);
|
||||
}
|
||||
|
||||
private static string InitializeDataDirectory()
|
||||
private static bool GetIsProcessElevated()
|
||||
{
|
||||
// Delete the previous data folder if it exists
|
||||
// ⚠️ 这里调用 LocalSetting 时,确保 DataDirectory 已经初始化完成
|
||||
try
|
||||
{
|
||||
string previousDirectory = LocalSetting.Get(SettingKeys.PreviousDataDirectoryToDelete, string.Empty);
|
||||
if (!string.IsNullOrEmpty(previousDirectory) && Directory.Exists(previousDirectory))
|
||||
{
|
||||
Directory.SetReadOnly(previousDirectory, false);
|
||||
Directory.Delete(previousDirectory, true);
|
||||
}
|
||||
return LocalSetting.Get(SettingKeys.OverrideElevationRequirement, false) || Environment.IsPrivilegedProcess;
|
||||
}
|
||||
finally
|
||||
catch
|
||||
{
|
||||
LocalSetting.Set(SettingKeys.PreviousDataDirectoryToDelete, string.Empty);
|
||||
// 如果读取失败,使用默认值
|
||||
return Environment.IsPrivilegedProcess;
|
||||
}
|
||||
}
|
||||
|
||||
// Check if the preferred path is set
|
||||
string currentDirectory = LocalSetting.Get(SettingKeys.DataDirectory, string.Empty);
|
||||
|
||||
if (!string.IsNullOrEmpty(currentDirectory))
|
||||
private static string InitializeLocalCacheDirectory()
|
||||
{
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
Directory.CreateDirectory(currentDirectory);
|
||||
return currentDirectory;
|
||||
return Windows.Storage.ApplicationData.Current.LocalCacheFolder.Path;
|
||||
}
|
||||
|
||||
// Unpackaged: use %LOCALAPPDATA%\Snap.Hutao\Cache
|
||||
string localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
|
||||
const string FolderName
|
||||
#if IS_ALPHA_BUILD
|
||||
= "HutaoAlpha";
|
||||
#elif IS_CANARY_BUILD
|
||||
= "HutaoCanary";
|
||||
#else
|
||||
= "Hutao";
|
||||
#endif
|
||||
string cacheDir = Path.Combine(localAppData, FolderName, "Cache");
|
||||
Directory.CreateDirectory(cacheDir);
|
||||
return cacheDir;
|
||||
}
|
||||
|
||||
private static bool CheckAppNotificationEnabled()
|
||||
{
|
||||
try
|
||||
{
|
||||
return AppNotificationManager.Default.Setting is AppNotificationSetting.Enabled;
|
||||
}
|
||||
catch
|
||||
{
|
||||
// In unpackaged mode, this might fail - return false
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static string InitializeDataDirectory()
|
||||
{
|
||||
const string FolderName
|
||||
#if IS_ALPHA_BUILD
|
||||
= "HutaoAlpha";
|
||||
@@ -141,30 +168,43 @@ internal static class HutaoRuntime
|
||||
= "Hutao";
|
||||
#endif
|
||||
|
||||
// ⚠️ 不要在这里调用 LocalSetting - 会导致循环依赖
|
||||
// 先确定默认的数据目录位置
|
||||
|
||||
// Check if the old documents path exists
|
||||
string myDocumentsHutaoDirectory = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), FolderName));
|
||||
if (Directory.Exists(myDocumentsHutaoDirectory))
|
||||
{
|
||||
LocalSetting.Set(SettingKeys.DataDirectory, myDocumentsHutaoDirectory);
|
||||
return myDocumentsHutaoDirectory;
|
||||
}
|
||||
|
||||
// Prefer LocalApplicationData
|
||||
string localApplicationData = ApplicationData.Current.LocalFolder.Path;
|
||||
string path = Path.GetFullPath(Path.Combine(localApplicationData, FolderName));
|
||||
// Use LocalApplicationData
|
||||
string localApplicationData;
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
localApplicationData = Windows.Storage.ApplicationData.Current.LocalFolder.Path;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Unpackaged: use %LOCALAPPDATA%
|
||||
localApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
|
||||
}
|
||||
|
||||
string defaultPath = Path.GetFullPath(Path.Combine(localApplicationData, FolderName));
|
||||
|
||||
// ⚠️ 延迟处理:在第一次使用 LocalSetting 后再检查是否有自定义路径
|
||||
// 这里返回默认路径,后续通过 LocalSetting 可能会更新
|
||||
try
|
||||
{
|
||||
Directory.CreateDirectory(path);
|
||||
Directory.CreateDirectory(defaultPath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// FileNotFoundException | UnauthorizedAccessException
|
||||
// We don't have enough permission
|
||||
HutaoException.InvalidOperation($"Failed to create data folder: {path}", ex);
|
||||
HutaoException.InvalidOperation($"Failed to create data folder: {defaultPath}", ex);
|
||||
}
|
||||
|
||||
LocalSetting.Set(SettingKeys.DataDirectory, path);
|
||||
return path;
|
||||
return defaultPath;
|
||||
}
|
||||
|
||||
private static string InitializeDeviceId()
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.ApplicationModel;
|
||||
using System.IO;
|
||||
using System.Security.AccessControl;
|
||||
using System.Security.Principal;
|
||||
using Windows.ApplicationModel;
|
||||
using Windows.Storage;
|
||||
|
||||
namespace Snap.Hutao.Core;
|
||||
|
||||
@@ -13,7 +12,7 @@ internal static class InstalledLocation
|
||||
{
|
||||
public static string GetAbsolutePath(string relativePath)
|
||||
{
|
||||
return Path.Combine(Package.Current.InstalledLocation.Path, relativePath);
|
||||
return Path.Combine(PackageIdentityAdapter.AppDirectory, relativePath);
|
||||
}
|
||||
|
||||
public static void CopyFileFromApplicationUri(string url, string path)
|
||||
@@ -23,8 +22,26 @@ internal static class InstalledLocation
|
||||
static async Task CopyApplicationUriFileCoreAsync(string url, string path)
|
||||
{
|
||||
await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
|
||||
StorageFile file = await StorageFile.GetFileFromApplicationUriAsync(url.ToUri());
|
||||
using (Stream outputStream = (await file.OpenReadAsync()).AsStreamForRead())
|
||||
|
||||
Uri uri = url.ToUri();
|
||||
Stream outputStream;
|
||||
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
// Packaged: use StorageFile
|
||||
Windows.Storage.StorageFile file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri);
|
||||
outputStream = (await file.OpenReadAsync()).AsStreamForRead();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Unpackaged: read from file system directly
|
||||
// Assume ms-appx:/// points to the app directory
|
||||
string localPath = uri.LocalPath.TrimStart('/');
|
||||
string fullPath = Path.Combine(PackageIdentityAdapter.AppDirectory, localPath);
|
||||
outputStream = File.OpenRead(fullPath);
|
||||
}
|
||||
|
||||
using (outputStream)
|
||||
{
|
||||
if (File.Exists(path))
|
||||
{
|
||||
|
||||
@@ -74,8 +74,15 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi
|
||||
|
||||
public void ActivateAndInitialize(HutaoActivationArguments args)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] ActivateAndInitialize called");
|
||||
#endif
|
||||
|
||||
if (Volatile.Read(ref isActivating) is 1)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] Already activating, returning");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -85,21 +92,52 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi
|
||||
{
|
||||
try
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] Starting activation process");
|
||||
#endif
|
||||
|
||||
using (await activateLock.LockAsync().ConfigureAwait(false))
|
||||
{
|
||||
if (Interlocked.CompareExchange(ref isActivating, 1, 0) is not 0)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] Race condition detected, returning");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] Calling UnsynchronizedHandleActivationAsync");
|
||||
#endif
|
||||
|
||||
await UnsynchronizedHandleActivationAsync(args).ConfigureAwait(false);
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] Calling UnsynchronizedHandleInitializationAsync");
|
||||
#endif
|
||||
|
||||
await UnsynchronizedHandleInitializationAsync().ConfigureAwait(false);
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] Initialization completed successfully");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine($"[AppActivation] Exception during activation: {ex}");
|
||||
#endif
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
XamlApplicationLifetime.ActivationAndInitializationCompleted = true;
|
||||
Interlocked.Exchange(ref isActivating, 0);
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation] ActivationAndInitializationCompleted set to true");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -313,16 +351,36 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi
|
||||
private async ValueTask<Window?> WaitWindowAsync<TWindow>()
|
||||
where TWindow : Window
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine($"[AppActivation.WaitWindowAsync] Waiting for window type: {typeof(TWindow).Name}");
|
||||
#endif
|
||||
|
||||
await taskContext.SwitchToMainThreadAsync();
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation.WaitWindowAsync] Switched to main thread");
|
||||
#endif
|
||||
|
||||
if (currentXamlWindowReference.Window is not { } window)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation.WaitWindowAsync] Creating new window instance");
|
||||
#endif
|
||||
|
||||
try
|
||||
{
|
||||
window = serviceProvider.GetRequiredService<TWindow>();
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine($"[AppActivation.WaitWindowAsync] Window created successfully: {window.GetType().Name}");
|
||||
#endif
|
||||
}
|
||||
catch (COMException)
|
||||
catch (COMException ex)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine($"[AppActivation.WaitWindowAsync] COMException: {ex}");
|
||||
#endif
|
||||
|
||||
if (XamlApplicationLifetime.Exiting)
|
||||
{
|
||||
return default;
|
||||
@@ -330,11 +388,33 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi
|
||||
|
||||
throw;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine($"[AppActivation.WaitWindowAsync] Exception creating window: {ex}");
|
||||
#endif
|
||||
throw;
|
||||
}
|
||||
|
||||
currentXamlWindowReference.Window = window;
|
||||
}
|
||||
else
|
||||
{
|
||||
#if DEBUG
|
||||
Debug.WriteLine($"[AppActivation.WaitWindowAsync] Using existing window: {window.GetType().Name}");
|
||||
#endif
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation.WaitWindowAsync] Calling window.SwitchTo()");
|
||||
#endif
|
||||
|
||||
window.SwitchTo();
|
||||
|
||||
#if DEBUG
|
||||
Debug.WriteLine("[AppActivation.WaitWindowAsync] Window activated");
|
||||
#endif
|
||||
|
||||
window.AppWindow?.MoveInZOrderAtTop();
|
||||
return window;
|
||||
}
|
||||
|
||||
@@ -66,4 +66,14 @@ internal sealed class HutaoActivationArguments
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public static HutaoActivationArguments CreateDefaultLaunchArguments()
|
||||
{
|
||||
return new HutaoActivationArguments
|
||||
{
|
||||
IsRedirectTo = false,
|
||||
Kind = HutaoActivationKind.Launch,
|
||||
LaunchActivatedArguments = string.Empty
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.ApplicationModel;
|
||||
using Snap.Hutao.Core.ExceptionService;
|
||||
using Snap.Hutao.Factory.Process;
|
||||
using Snap.Hutao.Win32;
|
||||
using Snap.Hutao.Win32.Foundation;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Frozen;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Text.Json;
|
||||
using Windows.Storage;
|
||||
|
||||
namespace Snap.Hutao.Core.Setting;
|
||||
@@ -36,40 +40,20 @@ internal static class LocalSetting
|
||||
typeof(ApplicationDataCompositeValue)
|
||||
];
|
||||
|
||||
private static readonly ApplicationDataContainer Container = ApplicationData.Current.LocalSettings;
|
||||
private static readonly Lazy<ISettingStorage> LazyStorage = new(CreateStorage);
|
||||
|
||||
private static ISettingStorage Storage => LazyStorage.Value;
|
||||
|
||||
public static T Get<T>(string key, T defaultValue = default!)
|
||||
{
|
||||
Debug.Assert(SupportedTypes.Contains(typeof(T)));
|
||||
if (Container.Values.TryGetValue(key, out object? value))
|
||||
{
|
||||
// unbox the value
|
||||
return value is null ? defaultValue : (T)value;
|
||||
}
|
||||
|
||||
Set(key, defaultValue);
|
||||
return defaultValue;
|
||||
return Storage.Get(key, defaultValue);
|
||||
}
|
||||
|
||||
public static void Set<T>(string key, T value)
|
||||
{
|
||||
Debug.Assert(SupportedTypes.Contains(typeof(T)));
|
||||
|
||||
try
|
||||
{
|
||||
Container.Values[key] = value;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 状态管理器无法写入设置
|
||||
if (HutaoNative.IsWin32(ex.HResult, WIN32_ERROR.ERROR_STATE_WRITE_SETTING_FAILED))
|
||||
{
|
||||
HutaoNative.Instance.ShowErrorMessage(ex.Message, ExceptionFormat.Format(ex));
|
||||
ProcessFactory.KillCurrent();
|
||||
}
|
||||
|
||||
throw;
|
||||
}
|
||||
Storage.Set(key, value);
|
||||
}
|
||||
|
||||
public static void SetIf<T>(bool condition, string key, T value)
|
||||
@@ -103,4 +87,299 @@ internal static class LocalSetting
|
||||
Set(key, newValue);
|
||||
return oldValue;
|
||||
}
|
||||
|
||||
private static ISettingStorage CreateStorage()
|
||||
{
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
return new PackagedSettingStorage();
|
||||
}
|
||||
|
||||
return new UnpackagedSettingStorage();
|
||||
}
|
||||
|
||||
private interface ISettingStorage
|
||||
{
|
||||
T Get<T>(string key, T defaultValue);
|
||||
void Set<T>(string key, T value);
|
||||
}
|
||||
|
||||
private sealed class PackagedSettingStorage : ISettingStorage
|
||||
{
|
||||
private readonly ApplicationDataContainer container = ApplicationData.Current.LocalSettings;
|
||||
|
||||
public T Get<T>(string key, T defaultValue)
|
||||
{
|
||||
if (container.Values.TryGetValue(key, out object? value))
|
||||
{
|
||||
// unbox the value
|
||||
return value is null ? defaultValue : (T)value;
|
||||
}
|
||||
|
||||
Set(key, defaultValue);
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
public void Set<T>(string key, T value)
|
||||
{
|
||||
try
|
||||
{
|
||||
container.Values[key] = value;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 状态管理器无法写入设置
|
||||
if (HutaoNative.IsWin32(ex.HResult, WIN32_ERROR.ERROR_STATE_WRITE_SETTING_FAILED))
|
||||
{
|
||||
HutaoNative.Instance.ShowErrorMessage(ex.Message, ExceptionFormat.Format(ex));
|
||||
ProcessFactory.KillCurrent();
|
||||
}
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class UnpackagedSettingStorage : ISettingStorage
|
||||
{
|
||||
private readonly string settingsFilePath;
|
||||
private readonly ConcurrentDictionary<string, object?> cache = new();
|
||||
private readonly object fileLock = new();
|
||||
private readonly JsonSerializerOptions jsonOptions = new()
|
||||
{
|
||||
WriteIndented = true,
|
||||
Converters =
|
||||
{
|
||||
new ApplicationDataCompositeValueJsonConverter(),
|
||||
}
|
||||
};
|
||||
|
||||
public UnpackagedSettingStorage()
|
||||
{
|
||||
string localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
|
||||
const string FolderName
|
||||
#if IS_ALPHA_BUILD
|
||||
= "HutaoAlpha";
|
||||
#elif IS_CANARY_BUILD
|
||||
= "HutaoCanary";
|
||||
#else
|
||||
= "Hutao";
|
||||
#endif
|
||||
string settingsDir = Path.Combine(localAppData, FolderName, "Settings");
|
||||
Directory.CreateDirectory(settingsDir);
|
||||
settingsFilePath = Path.Combine(settingsDir, "LocalSettings.json");
|
||||
|
||||
LoadFromFile();
|
||||
}
|
||||
|
||||
public T Get<T>(string key, T defaultValue)
|
||||
{
|
||||
if (cache.TryGetValue(key, out object? value))
|
||||
{
|
||||
if (value is null)
|
||||
{
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
// Handle JSON deserialization for complex types
|
||||
if (value is JsonElement jsonElement)
|
||||
{
|
||||
try
|
||||
{
|
||||
// ⚠️ 特殊处理:JSON 数字类型转换
|
||||
Type targetType = typeof(T);
|
||||
|
||||
if (jsonElement.ValueKind == JsonValueKind.Number)
|
||||
{
|
||||
if (targetType == typeof(int))
|
||||
{
|
||||
return (T)(object)jsonElement.GetInt32();
|
||||
}
|
||||
if (targetType == typeof(long))
|
||||
{
|
||||
return (T)(object)jsonElement.GetInt64();
|
||||
}
|
||||
if (targetType == typeof(short))
|
||||
{
|
||||
return (T)(object)jsonElement.GetInt16();
|
||||
}
|
||||
if (targetType == typeof(byte))
|
||||
{
|
||||
return (T)(object)jsonElement.GetByte();
|
||||
}
|
||||
if (targetType == typeof(uint))
|
||||
{
|
||||
return (T)(object)jsonElement.GetUInt32();
|
||||
}
|
||||
if (targetType == typeof(ulong))
|
||||
{
|
||||
return (T)(object)jsonElement.GetUInt64();
|
||||
}
|
||||
if (targetType == typeof(ushort))
|
||||
{
|
||||
return (T)(object)jsonElement.GetUInt16();
|
||||
}
|
||||
if (targetType == typeof(float))
|
||||
{
|
||||
return (T)(object)jsonElement.GetSingle();
|
||||
}
|
||||
if (targetType == typeof(double))
|
||||
{
|
||||
return (T)(object)jsonElement.GetDouble();
|
||||
}
|
||||
}
|
||||
|
||||
// 其他类型使用标准反序列化
|
||||
return jsonElement.Deserialize<T>(jsonOptions) ?? defaultValue;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return defaultValue;
|
||||
}
|
||||
}
|
||||
|
||||
// ⚠️ 如果是直接从 cache 读取的值,也可能需要类型转换
|
||||
// 例如:double -> int
|
||||
if (value is double doubleValue)
|
||||
{
|
||||
Type targetType = typeof(T);
|
||||
if (targetType == typeof(int))
|
||||
{
|
||||
return (T)(object)(int)doubleValue;
|
||||
}
|
||||
if (targetType == typeof(long))
|
||||
{
|
||||
return (T)(object)(long)doubleValue;
|
||||
}
|
||||
if (targetType == typeof(short))
|
||||
{
|
||||
return (T)(object)(short)doubleValue;
|
||||
}
|
||||
if (targetType == typeof(byte))
|
||||
{
|
||||
return (T)(object)(byte)doubleValue;
|
||||
}
|
||||
}
|
||||
|
||||
return (T)value;
|
||||
}
|
||||
|
||||
Set(key, defaultValue);
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
public void Set<T>(string key, T value)
|
||||
{
|
||||
cache[key] = value;
|
||||
SaveToFile();
|
||||
}
|
||||
|
||||
private void LoadFromFile()
|
||||
{
|
||||
lock (fileLock)
|
||||
{
|
||||
if (!File.Exists(settingsFilePath))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
string json = File.ReadAllText(settingsFilePath);
|
||||
Dictionary<string, JsonElement>? data = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(json, jsonOptions);
|
||||
if (data is not null)
|
||||
{
|
||||
foreach ((string key, JsonElement value) in data)
|
||||
{
|
||||
cache[key] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// If file is corrupted, start fresh
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void SaveToFile()
|
||||
{
|
||||
lock (fileLock)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Convert cache to serializable dictionary
|
||||
Dictionary<string, object?> serializableData = new(cache);
|
||||
string json = JsonSerializer.Serialize(serializableData, jsonOptions);
|
||||
File.WriteAllText(settingsFilePath, json);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.WriteLine($"Failed to save settings: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Converter for ApplicationDataCompositeValue
|
||||
private sealed class ApplicationDataCompositeValueJsonConverter : System.Text.Json.Serialization.JsonConverter<ApplicationDataCompositeValue>
|
||||
{
|
||||
public override ApplicationDataCompositeValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||
{
|
||||
if (reader.TokenType != JsonTokenType.StartObject)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
ApplicationDataCompositeValue composite = new();
|
||||
while (reader.Read())
|
||||
{
|
||||
if (reader.TokenType == JsonTokenType.EndObject)
|
||||
{
|
||||
return composite;
|
||||
}
|
||||
|
||||
if (reader.TokenType != JsonTokenType.PropertyName)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
string? key = reader.GetString();
|
||||
reader.Read();
|
||||
|
||||
if (key is not null)
|
||||
{
|
||||
composite[key] = reader.TokenType switch
|
||||
{
|
||||
JsonTokenType.String => reader.GetString(),
|
||||
JsonTokenType.Number => reader.TryGetInt64(out long l) ? l : reader.GetDouble(),
|
||||
JsonTokenType.True => true,
|
||||
JsonTokenType.False => false,
|
||||
_ => null
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return composite;
|
||||
}
|
||||
|
||||
public override void Write(Utf8JsonWriter writer, ApplicationDataCompositeValue value, JsonSerializerOptions options)
|
||||
{
|
||||
writer.WriteStartObject();
|
||||
foreach ((string key, object? val) in value)
|
||||
{
|
||||
writer.WritePropertyName(key);
|
||||
if (val is null)
|
||||
{
|
||||
writer.WriteNullValue();
|
||||
}
|
||||
else
|
||||
{
|
||||
JsonSerializer.Serialize(writer, val, val.GetType(), options);
|
||||
}
|
||||
}
|
||||
|
||||
writer.WriteEndObject();
|
||||
}
|
||||
}
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -147,6 +147,27 @@ internal sealed class ProcessFactory
|
||||
{
|
||||
string repoDirectory = HutaoRuntime.GetDataRepositoryDirectory();
|
||||
string fullTrustFilePath = Path.Combine(repoDirectory, "Snap.ContentDelivery", "Snap.Hutao.FullTrust.exe");
|
||||
|
||||
// Check if FullTrust executable exists - if not, fallback to normal admin mode
|
||||
if (!File.Exists(fullTrustFilePath))
|
||||
{
|
||||
string errorMessage = $"""
|
||||
Island 功能需要的 FullTrust 进程文件不存在,将使用普通管理员模式启动游戏。
|
||||
预期路径:{fullTrustFilePath}
|
||||
|
||||
原因:ContentDelivery 仓库尚未下载或初始化失败(常见于非打包模式首次运行)
|
||||
|
||||
Island 功能将不可用,但游戏可以正常启动。
|
||||
等待仓库下载完成后可重新尝试使用 Island 功能。
|
||||
""";
|
||||
|
||||
// Capture as breadcrumb instead of exception
|
||||
SentrySdk.AddBreadcrumb(errorMessage, category: "process.fulltrust", level: Sentry.BreadcrumbLevel.Warning);
|
||||
|
||||
// Fallback to normal admin mode - Island features will not work but game can launch
|
||||
return CreateUsingShellExecuteRunAs(arguments, fileName, workingDirectory);
|
||||
}
|
||||
|
||||
StartUsingShellExecuteRunAs(fullTrustFilePath);
|
||||
|
||||
FullTrustProcessStartInfoRequest request = new()
|
||||
@@ -172,11 +193,39 @@ internal sealed class ProcessFactory
|
||||
|
||||
public static void StartUsingShellExecuteRunAs(string fileName)
|
||||
{
|
||||
global::System.Diagnostics.Process.Start(new global::System.Diagnostics.ProcessStartInfo
|
||||
// 尝试从app包中启动
|
||||
try
|
||||
{
|
||||
FileName = fileName,
|
||||
UseShellExecute = true,
|
||||
Verb = "runas",
|
||||
});
|
||||
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,
|
||||
UseShellExecute = true,
|
||||
Verb = "runas",
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,268 +1,270 @@
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Model.Primitive;
|
||||
using System.Collections.Frozen;
|
||||
using System.Collections.Immutable;
|
||||
|
||||
namespace Snap.Hutao.Model.Metadata.Avatar;
|
||||
|
||||
internal static class AvatarIds
|
||||
{
|
||||
// 此处的变量名称以 UI_AvatarIcon 为准
|
||||
public static readonly AvatarId Ayaka = 10000002;
|
||||
public static readonly AvatarId Qin = 10000003;
|
||||
|
||||
public static readonly AvatarId PlayerBoy = 10000005;
|
||||
public static readonly AvatarId Lisa = 10000006;
|
||||
public static readonly AvatarId PlayerGirl = 10000007;
|
||||
|
||||
public static readonly AvatarId Barbara = 10000014;
|
||||
public static readonly AvatarId Kaeya = 10000015;
|
||||
public static readonly AvatarId Diluc = 10000016;
|
||||
|
||||
public static readonly AvatarId Razor = 10000020;
|
||||
public static readonly AvatarId Ambor = 10000021;
|
||||
public static readonly AvatarId Venti = 10000022;
|
||||
public static readonly AvatarId Xiangling = 10000023;
|
||||
public static readonly AvatarId Beidou = 10000024;
|
||||
public static readonly AvatarId Xingqiu = 10000025;
|
||||
public static readonly AvatarId Xiao = 10000026;
|
||||
public static readonly AvatarId Ningguang = 10000027;
|
||||
|
||||
public static readonly AvatarId Klee = 10000029;
|
||||
public static readonly AvatarId Zhongli = 10000030;
|
||||
public static readonly AvatarId Fischl = 10000031;
|
||||
public static readonly AvatarId Bennett = 10000032;
|
||||
public static readonly AvatarId Tartaglia = 10000033;
|
||||
public static readonly AvatarId Noel = 10000034;
|
||||
public static readonly AvatarId Qiqi = 10000035;
|
||||
public static readonly AvatarId Chongyun = 10000036;
|
||||
public static readonly AvatarId Ganyu = 10000037;
|
||||
public static readonly AvatarId Albedo = 10000038;
|
||||
public static readonly AvatarId Diona = 10000039;
|
||||
|
||||
public static readonly AvatarId Mona = 10000041;
|
||||
public static readonly AvatarId Keqing = 10000042;
|
||||
public static readonly AvatarId Sucrose = 10000043;
|
||||
public static readonly AvatarId Xinyan = 10000044;
|
||||
public static readonly AvatarId Rosaria = 10000045;
|
||||
public static readonly AvatarId Hutao = 10000046;
|
||||
public static readonly AvatarId Kazuha = 10000047;
|
||||
public static readonly AvatarId Feiyan = 10000048;
|
||||
public static readonly AvatarId Yoimiya = 10000049;
|
||||
public static readonly AvatarId Tohma = 10000050;
|
||||
public static readonly AvatarId Eula = 10000051;
|
||||
public static readonly AvatarId Shougun = 10000052;
|
||||
public static readonly AvatarId Sayu = 10000053;
|
||||
public static readonly AvatarId Kokomi = 10000054;
|
||||
public static readonly AvatarId Gorou = 10000055;
|
||||
public static readonly AvatarId Sara = 10000056;
|
||||
public static readonly AvatarId Itto = 10000057;
|
||||
public static readonly AvatarId Yae = 10000058;
|
||||
public static readonly AvatarId Heizo = 10000059;
|
||||
public static readonly AvatarId Yelan = 10000060;
|
||||
public static readonly AvatarId Kirara = 10000061;
|
||||
public static readonly AvatarId Aloy = 10000062;
|
||||
public static readonly AvatarId Shenhe = 10000063;
|
||||
public static readonly AvatarId Yunjin = 10000064;
|
||||
public static readonly AvatarId Shinobu = 10000065;
|
||||
public static readonly AvatarId Ayato = 10000066;
|
||||
public static readonly AvatarId Collei = 10000067;
|
||||
public static readonly AvatarId Dori = 10000068;
|
||||
public static readonly AvatarId Tighnari = 10000069;
|
||||
public static readonly AvatarId Nilou = 10000070;
|
||||
public static readonly AvatarId Cyno = 10000071;
|
||||
public static readonly AvatarId Candace = 10000072;
|
||||
public static readonly AvatarId Nahida = 10000073;
|
||||
public static readonly AvatarId Layla = 10000074;
|
||||
public static readonly AvatarId Wanderer = 10000075;
|
||||
public static readonly AvatarId Faruzan = 10000076;
|
||||
public static readonly AvatarId Yaoyao = 10000077;
|
||||
public static readonly AvatarId Alhaitham = 10000078;
|
||||
public static readonly AvatarId Dehya = 10000079;
|
||||
public static readonly AvatarId Mika = 10000080;
|
||||
public static readonly AvatarId Kaveh = 10000081;
|
||||
public static readonly AvatarId Baizhuer = 10000082;
|
||||
public static readonly AvatarId Lynette = 10000083;
|
||||
public static readonly AvatarId Lyney = 10000084;
|
||||
public static readonly AvatarId Freminet = 10000085;
|
||||
public static readonly AvatarId Wriothesley = 10000086;
|
||||
public static readonly AvatarId Neuvillette = 10000087;
|
||||
public static readonly AvatarId Charlotte = 10000088;
|
||||
public static readonly AvatarId Furina = 10000089;
|
||||
public static readonly AvatarId Chevreuse = 10000090;
|
||||
public static readonly AvatarId Navia = 10000091;
|
||||
public static readonly AvatarId Gaming = 10000092;
|
||||
public static readonly AvatarId Xianyun = 10000093;
|
||||
public static readonly AvatarId Chiori = 10000094;
|
||||
public static readonly AvatarId Sigewinne = 10000095;
|
||||
public static readonly AvatarId Arlecchino = 10000096;
|
||||
public static readonly AvatarId Sethos = 10000097;
|
||||
public static readonly AvatarId Clorinde = 10000098;
|
||||
public static readonly AvatarId Emilie = 10000099;
|
||||
public static readonly AvatarId Kachina = 10000100;
|
||||
public static readonly AvatarId Kinich = 10000101;
|
||||
public static readonly AvatarId Mualani = 10000102;
|
||||
public static readonly AvatarId Xilonen = 10000103;
|
||||
public static readonly AvatarId Chasca = 10000104;
|
||||
public static readonly AvatarId Olorun = 10000105;
|
||||
public static readonly AvatarId Mavuika = 10000106;
|
||||
public static readonly AvatarId Citlali = 10000107;
|
||||
public static readonly AvatarId Lanyan = 10000108;
|
||||
public static readonly AvatarId Mizuki = 10000109;
|
||||
public static readonly AvatarId Iansan = 10000110;
|
||||
public static readonly AvatarId Varesa = 10000111;
|
||||
public static readonly AvatarId Escoffier = 10000112;
|
||||
public static readonly AvatarId Ifa = 10000113;
|
||||
public static readonly AvatarId Skirk = 10000114;
|
||||
public static readonly AvatarId Dahlia = 10000115;
|
||||
public static readonly AvatarId Ineffa = 10000116;
|
||||
public static readonly AvatarId MannequinBoy = 10000117;
|
||||
public static readonly AvatarId MannequinGirl = 10000118;
|
||||
public static readonly AvatarId Lauma = 10000119;
|
||||
public static readonly AvatarId Flins = 10000120;
|
||||
public static readonly AvatarId Aino = 10000121;
|
||||
public static readonly AvatarId Nefer = 10000122;
|
||||
|
||||
private static readonly FrozenSet<AvatarId> StandardWishIds =
|
||||
[
|
||||
Qin,
|
||||
Diluc,
|
||||
Mona,
|
||||
Keqing,
|
||||
Qiqi,
|
||||
Tighnari,
|
||||
Dehya,
|
||||
Mizuki,
|
||||
Lisa,
|
||||
Ambor,
|
||||
Kaeya,
|
||||
Aloy,
|
||||
];
|
||||
|
||||
private static readonly FrozenSet<AvatarId> GnosisAvatars =
|
||||
[
|
||||
Venti,
|
||||
Zhongli,
|
||||
Shougun,
|
||||
Nahida,
|
||||
Mavuika,
|
||||
];
|
||||
|
||||
private static readonly FrozenSet<AvatarId> MasterAvatars =
|
||||
[
|
||||
PlayerBoy,
|
||||
PlayerGirl,
|
||||
MannequinBoy,
|
||||
MannequinGirl,
|
||||
];
|
||||
|
||||
public static bool IsStandardWish(AvatarId avatarId)
|
||||
{
|
||||
return StandardWishIds.Contains(avatarId);
|
||||
}
|
||||
|
||||
public static bool UsesGnosis(AvatarId avatarId)
|
||||
{
|
||||
return GnosisAvatars.Contains(avatarId);
|
||||
}
|
||||
|
||||
public static bool IsPlayer(AvatarId avatarId)
|
||||
{
|
||||
return MasterAvatars.Contains(avatarId);
|
||||
}
|
||||
|
||||
public static ImmutableDictionary<AvatarId, Avatar> WithPlayers(ImmutableDictionary<AvatarId, Avatar> idAvatarMap)
|
||||
{
|
||||
ImmutableDictionary<AvatarId, Avatar>.Builder builder = ImmutableDictionary.CreateBuilder<AvatarId, Avatar>();
|
||||
|
||||
builder.AddRange(idAvatarMap);
|
||||
builder.Add(PlayerBoy, new()
|
||||
{
|
||||
Name = SH.ModelMetadataAvatarPlayerName,
|
||||
Icon = "UI_AvatarIcon_PlayerBoy",
|
||||
SideIcon = "UI_AvatarIcon_Side_PlayerBoy",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE,
|
||||
Id = PlayerBoy,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
builder.Add(PlayerGirl, new()
|
||||
{
|
||||
Name = SH.ModelMetadataAvatarPlayerName,
|
||||
Icon = "UI_AvatarIcon_PlayerGirl",
|
||||
SideIcon = "UI_AvatarIcon_Side_PlayerGirl",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE,
|
||||
Id = PlayerGirl,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
builder.Add(MannequinBoy, new()
|
||||
{
|
||||
Name = "奇偶·男性",
|
||||
Icon = "UI_AvatarIcon_MannequinBoy",
|
||||
SideIcon = "UI_AvatarIcon_Side_MannequinBoy",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE_SP,
|
||||
Id = MannequinBoy,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
builder.Add(MannequinGirl, new()
|
||||
{
|
||||
Name = "奇偶·女性",
|
||||
Icon = "UI_AvatarIcon_MannequinGirl",
|
||||
SideIcon = "UI_AvatarIcon_Side_MannequinGirl",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE_SP,
|
||||
Id = MannequinGirl,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
|
||||
return builder.ToImmutable();
|
||||
}
|
||||
// Copyright (c) DGP Studio. All rights reserved.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Model.Primitive;
|
||||
using System.Collections.Frozen;
|
||||
using System.Collections.Immutable;
|
||||
|
||||
namespace Snap.Hutao.Model.Metadata.Avatar;
|
||||
|
||||
internal static class AvatarIds
|
||||
{
|
||||
// 此处的变量名称以 UI_AvatarIcon 为准
|
||||
public static readonly AvatarId Ayaka = 10000002;
|
||||
public static readonly AvatarId Qin = 10000003;
|
||||
|
||||
public static readonly AvatarId PlayerBoy = 10000005;
|
||||
public static readonly AvatarId Lisa = 10000006;
|
||||
public static readonly AvatarId PlayerGirl = 10000007;
|
||||
|
||||
public static readonly AvatarId Barbara = 10000014;
|
||||
public static readonly AvatarId Kaeya = 10000015;
|
||||
public static readonly AvatarId Diluc = 10000016;
|
||||
|
||||
public static readonly AvatarId Razor = 10000020;
|
||||
public static readonly AvatarId Ambor = 10000021;
|
||||
public static readonly AvatarId Venti = 10000022;
|
||||
public static readonly AvatarId Xiangling = 10000023;
|
||||
public static readonly AvatarId Beidou = 10000024;
|
||||
public static readonly AvatarId Xingqiu = 10000025;
|
||||
public static readonly AvatarId Xiao = 10000026;
|
||||
public static readonly AvatarId Ningguang = 10000027;
|
||||
|
||||
public static readonly AvatarId Klee = 10000029;
|
||||
public static readonly AvatarId Zhongli = 10000030;
|
||||
public static readonly AvatarId Fischl = 10000031;
|
||||
public static readonly AvatarId Bennett = 10000032;
|
||||
public static readonly AvatarId Tartaglia = 10000033;
|
||||
public static readonly AvatarId Noel = 10000034;
|
||||
public static readonly AvatarId Qiqi = 10000035;
|
||||
public static readonly AvatarId Chongyun = 10000036;
|
||||
public static readonly AvatarId Ganyu = 10000037;
|
||||
public static readonly AvatarId Albedo = 10000038;
|
||||
public static readonly AvatarId Diona = 10000039;
|
||||
|
||||
public static readonly AvatarId Mona = 10000041;
|
||||
public static readonly AvatarId Keqing = 10000042;
|
||||
public static readonly AvatarId Sucrose = 10000043;
|
||||
public static readonly AvatarId Xinyan = 10000044;
|
||||
public static readonly AvatarId Rosaria = 10000045;
|
||||
public static readonly AvatarId Hutao = 10000046;
|
||||
public static readonly AvatarId Kazuha = 10000047;
|
||||
public static readonly AvatarId Feiyan = 10000048;
|
||||
public static readonly AvatarId Yoimiya = 10000049;
|
||||
public static readonly AvatarId Tohma = 10000050;
|
||||
public static readonly AvatarId Eula = 10000051;
|
||||
public static readonly AvatarId Shougun = 10000052;
|
||||
public static readonly AvatarId Sayu = 10000053;
|
||||
public static readonly AvatarId Kokomi = 10000054;
|
||||
public static readonly AvatarId Gorou = 10000055;
|
||||
public static readonly AvatarId Sara = 10000056;
|
||||
public static readonly AvatarId Itto = 10000057;
|
||||
public static readonly AvatarId Yae = 10000058;
|
||||
public static readonly AvatarId Heizo = 10000059;
|
||||
public static readonly AvatarId Yelan = 10000060;
|
||||
public static readonly AvatarId Kirara = 10000061;
|
||||
public static readonly AvatarId Aloy = 10000062;
|
||||
public static readonly AvatarId Shenhe = 10000063;
|
||||
public static readonly AvatarId Yunjin = 10000064;
|
||||
public static readonly AvatarId Shinobu = 10000065;
|
||||
public static readonly AvatarId Ayato = 10000066;
|
||||
public static readonly AvatarId Collei = 10000067;
|
||||
public static readonly AvatarId Dori = 10000068;
|
||||
public static readonly AvatarId Tighnari = 10000069;
|
||||
public static readonly AvatarId Nilou = 10000070;
|
||||
public static readonly AvatarId Cyno = 10000071;
|
||||
public static readonly AvatarId Candace = 10000072;
|
||||
public static readonly AvatarId Nahida = 10000073;
|
||||
public static readonly AvatarId Layla = 10000074;
|
||||
public static readonly AvatarId Wanderer = 10000075;
|
||||
public static readonly AvatarId Faruzan = 10000076;
|
||||
public static readonly AvatarId Yaoyao = 10000077;
|
||||
public static readonly AvatarId Alhaitham = 10000078;
|
||||
public static readonly AvatarId Dehya = 10000079;
|
||||
public static readonly AvatarId Mika = 10000080;
|
||||
public static readonly AvatarId Kaveh = 10000081;
|
||||
public static readonly AvatarId Baizhuer = 10000082;
|
||||
public static readonly AvatarId Lynette = 10000083;
|
||||
public static readonly AvatarId Lyney = 10000084;
|
||||
public static readonly AvatarId Freminet = 10000085;
|
||||
public static readonly AvatarId Wriothesley = 10000086;
|
||||
public static readonly AvatarId Neuvillette = 10000087;
|
||||
public static readonly AvatarId Charlotte = 10000088;
|
||||
public static readonly AvatarId Furina = 10000089;
|
||||
public static readonly AvatarId Chevreuse = 10000090;
|
||||
public static readonly AvatarId Navia = 10000091;
|
||||
public static readonly AvatarId Gaming = 10000092;
|
||||
public static readonly AvatarId Xianyun = 10000093;
|
||||
public static readonly AvatarId Chiori = 10000094;
|
||||
public static readonly AvatarId Sigewinne = 10000095;
|
||||
public static readonly AvatarId Arlecchino = 10000096;
|
||||
public static readonly AvatarId Sethos = 10000097;
|
||||
public static readonly AvatarId Clorinde = 10000098;
|
||||
public static readonly AvatarId Emilie = 10000099;
|
||||
public static readonly AvatarId Kachina = 10000100;
|
||||
public static readonly AvatarId Kinich = 10000101;
|
||||
public static readonly AvatarId Mualani = 10000102;
|
||||
public static readonly AvatarId Xilonen = 10000103;
|
||||
public static readonly AvatarId Chasca = 10000104;
|
||||
public static readonly AvatarId Olorun = 10000105;
|
||||
public static readonly AvatarId Mavuika = 10000106;
|
||||
public static readonly AvatarId Citlali = 10000107;
|
||||
public static readonly AvatarId Lanyan = 10000108;
|
||||
public static readonly AvatarId Mizuki = 10000109;
|
||||
public static readonly AvatarId Iansan = 10000110;
|
||||
public static readonly AvatarId Varesa = 10000111;
|
||||
public static readonly AvatarId Escoffier = 10000112;
|
||||
public static readonly AvatarId Ifa = 10000113;
|
||||
public static readonly AvatarId Skirk = 10000114;
|
||||
public static readonly AvatarId Dahlia = 10000115;
|
||||
public static readonly AvatarId Ineffa = 10000116;
|
||||
public static readonly AvatarId MannequinBoy = 10000117;
|
||||
public static readonly AvatarId MannequinGirl = 10000118;
|
||||
public static readonly AvatarId Lauma = 10000119;
|
||||
public static readonly AvatarId Flins = 10000120;
|
||||
public static readonly AvatarId Aino = 10000121;
|
||||
public static readonly AvatarId Nefer = 10000122;
|
||||
public static readonly AvatarId Durin = 10000123;
|
||||
public static readonly AvatarId Jahoda = 10000124;
|
||||
|
||||
private static readonly FrozenSet<AvatarId> StandardWishIds =
|
||||
[
|
||||
Qin,
|
||||
Diluc,
|
||||
Mona,
|
||||
Keqing,
|
||||
Qiqi,
|
||||
Tighnari,
|
||||
Dehya,
|
||||
Mizuki,
|
||||
Lisa,
|
||||
Ambor,
|
||||
Kaeya,
|
||||
Aloy,
|
||||
];
|
||||
|
||||
private static readonly FrozenSet<AvatarId> GnosisAvatars =
|
||||
[
|
||||
Venti,
|
||||
Zhongli,
|
||||
Shougun,
|
||||
Nahida,
|
||||
Mavuika,
|
||||
];
|
||||
|
||||
private static readonly FrozenSet<AvatarId> MasterAvatars =
|
||||
[
|
||||
PlayerBoy,
|
||||
PlayerGirl,
|
||||
MannequinBoy,
|
||||
MannequinGirl,
|
||||
];
|
||||
|
||||
public static bool IsStandardWish(AvatarId avatarId)
|
||||
{
|
||||
return StandardWishIds.Contains(avatarId);
|
||||
}
|
||||
|
||||
public static bool UsesGnosis(AvatarId avatarId)
|
||||
{
|
||||
return GnosisAvatars.Contains(avatarId);
|
||||
}
|
||||
|
||||
public static bool IsPlayer(AvatarId avatarId)
|
||||
{
|
||||
return MasterAvatars.Contains(avatarId);
|
||||
}
|
||||
|
||||
public static ImmutableDictionary<AvatarId, Avatar> WithPlayers(ImmutableDictionary<AvatarId, Avatar> idAvatarMap)
|
||||
{
|
||||
ImmutableDictionary<AvatarId, Avatar>.Builder builder = ImmutableDictionary.CreateBuilder<AvatarId, Avatar>();
|
||||
|
||||
builder.AddRange(idAvatarMap);
|
||||
builder.Add(PlayerBoy, new()
|
||||
{
|
||||
Name = SH.ModelMetadataAvatarPlayerName,
|
||||
Icon = "UI_AvatarIcon_PlayerBoy",
|
||||
SideIcon = "UI_AvatarIcon_Side_PlayerBoy",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE,
|
||||
Id = PlayerBoy,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
builder.Add(PlayerGirl, new()
|
||||
{
|
||||
Name = SH.ModelMetadataAvatarPlayerName,
|
||||
Icon = "UI_AvatarIcon_PlayerGirl",
|
||||
SideIcon = "UI_AvatarIcon_Side_PlayerGirl",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE,
|
||||
Id = PlayerGirl,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
builder.Add(MannequinBoy, new()
|
||||
{
|
||||
Name = "奇偶·男性",
|
||||
Icon = "UI_AvatarIcon_MannequinBoy",
|
||||
SideIcon = "UI_AvatarIcon_Side_MannequinBoy",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE_SP,
|
||||
Id = MannequinBoy,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
builder.Add(MannequinGirl, new()
|
||||
{
|
||||
Name = "奇偶·女性",
|
||||
Icon = "UI_AvatarIcon_MannequinGirl",
|
||||
SideIcon = "UI_AvatarIcon_Side_MannequinGirl",
|
||||
Quality = Intrinsic.QualityType.QUALITY_ORANGE_SP,
|
||||
Id = MannequinGirl,
|
||||
PromoteId = default,
|
||||
Sort = default,
|
||||
Body = default,
|
||||
Description = default!,
|
||||
BeginTime = default,
|
||||
Weapon = default,
|
||||
BaseValue = default!,
|
||||
GrowCurves = default!,
|
||||
SkillDepot = default!,
|
||||
FetterInfo = default!,
|
||||
Costumes = default,
|
||||
CultivationItems = default,
|
||||
NameCard = default!,
|
||||
});
|
||||
|
||||
return builder.ToImmutable();
|
||||
}
|
||||
}
|
||||
@@ -23,7 +23,8 @@ internal static class WeaponIds
|
||||
12401U, 12402U, 12403U, 12405U,
|
||||
13401U, 13407U,
|
||||
14401U, 14402U, 14403U, 14409U,
|
||||
15401U, 15402U, 15403U, 15405U
|
||||
15401U, 15402U, 15403U, 15405U,
|
||||
15434U
|
||||
];
|
||||
|
||||
public static readonly FrozenSet<WeaponId> OrangeStandardWishIds =
|
||||
@@ -33,10 +34,11 @@ internal static class WeaponIds
|
||||
13502U, 13505U,
|
||||
14501U, 14502U,
|
||||
15501U, 15502U,
|
||||
15515U, 11518U
|
||||
];
|
||||
|
||||
public static bool IsOrangeStandardWish(in WeaponId weaponId)
|
||||
{
|
||||
return OrangeStandardWishIds.Contains(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.0.0" />
|
||||
|
||||
<Properties>
|
||||
<DisplayName>Snap Hutao</DisplayName>
|
||||
|
||||
@@ -1181,6 +1181,9 @@ Space Available: {2}</value>
|
||||
<data name="ServiceYaeWaitForGameResponseMessage" xml:space="preserve">
|
||||
<value>Waiting for game data</value>
|
||||
</data>
|
||||
<data name="UIViewMainTitleBarBackgroundActivityAction" xml:space="preserve">
|
||||
<value>Background task</value>
|
||||
</data>
|
||||
<data name="UIViewPageAvatarPropertyRecommendedAppendProperties" xml:space="preserve">
|
||||
<value>Additional Property Recommendation</value>
|
||||
</data>
|
||||
@@ -3989,4 +3992,7 @@ Space Available: {2}</value>
|
||||
<data name="WindowIdentifyMonitorHeader" xml:space="preserve">
|
||||
<value>Monitor ID</value>
|
||||
</data>
|
||||
<data name="UIViewMainTitleBarInvertTheme" xml:space="preserve">
|
||||
<value>Invert Theme</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -4020,4 +4020,7 @@
|
||||
<data name="WindowIdentifyMonitorHeader" xml:space="preserve">
|
||||
<value>显示器编号</value>
|
||||
</data>
|
||||
<data name="UIViewMainTitleBarInvertTheme" xml:space="preserve">
|
||||
<value>主题切换</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -24,14 +24,23 @@ 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);
|
||||
|
||||
ArgumentNullException.ThrowIfNull(costume.FrontIcon);
|
||||
ArgumentNullException.ThrowIfNull(costume.SideIcon);
|
||||
|
||||
// Set to costume icon
|
||||
builder.View.Icon = AvatarIconConverter.IconNameToUri(costume.FrontIcon);
|
||||
builder.View.SideIcon = AvatarIconConverter.IconNameToUri(costume.SideIcon);
|
||||
// Set to costume icon
|
||||
builder.View.Icon = AvatarIconConverter.IconNameToUri(costume.FrontIcon);
|
||||
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
|
||||
{
|
||||
|
||||
@@ -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,350 @@
|
||||
// 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路径,放在Snap.Hutao同一目录下
|
||||
string hutaoDirectory = AppContext.BaseDirectory;
|
||||
unlockerPath = Path.Combine(hutaoDirectory, UnlockerExecutableName);
|
||||
|
||||
if (!File.Exists(unlockerPath))
|
||||
{
|
||||
throw HutaoException.InvalidOperation("未找到unlockfps.exe文件,请将genshin-fps-unlock-master编译后的unlockfps.exe放置在Snap.Hutao同目录下");
|
||||
}
|
||||
|
||||
// 获取游戏路径
|
||||
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 CreateUnlockerConfigAsync(BeforeLaunchExecutionContext context)
|
||||
{
|
||||
if (string.IsNullOrEmpty(gamePath))
|
||||
{
|
||||
throw HutaoException.NotSupported("游戏路径未初始化");
|
||||
}
|
||||
|
||||
// 直接在unlocker同目录创建配置文件
|
||||
string unlockerConfigPath = Path.Combine(Path.GetDirectoryName(unlockerPath)!, 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(Path.GetDirectoryName(unlockerPath)!, 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);
|
||||
|
||||
ProcessStartInfo startInfo = new()
|
||||
{
|
||||
FileName = unlockerPath,
|
||||
WorkingDirectory = Path.GetDirectoryName(unlockerPath),
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
RedirectStandardOutput = true,
|
||||
RedirectStandardError = true,
|
||||
WindowStyle = ProcessWindowStyle.Normal,
|
||||
};
|
||||
|
||||
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 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(Path.GetDirectoryName(unlockerPath)!, 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();
|
||||
}
|
||||
}
|
||||
@@ -77,21 +77,48 @@ internal sealed class GameIslandInterop : IGameIslandInterop
|
||||
{
|
||||
nint handle = accessor.SafeMemoryMappedViewHandle.DangerousGetHandle();
|
||||
InitializeIslandEnvironment(handle, context.LaunchOptions, context.IsOversea);
|
||||
|
||||
if (!resume)
|
||||
{
|
||||
if (context.Process is not FullTrustProcess fullTrustProcess)
|
||||
{
|
||||
throw HutaoException.InvalidOperation("Process is not full trust");
|
||||
}
|
||||
|
||||
ArgumentException.ThrowIfNullOrEmpty(islandPath);
|
||||
if (!File.Exists(islandPath))
|
||||
{
|
||||
throw HutaoException.InvalidOperation(SH.ServiceGameIslandTargetVersionFileNotExists);
|
||||
}
|
||||
|
||||
fullTrustProcess.LoadLibrary(FullTrustLoadLibraryRequest.Create("Island", islandPath));
|
||||
fullTrustProcess.ResumeMainThread();
|
||||
// Support both FullTrust and normal admin mode
|
||||
if (context.Process is FullTrustProcess fullTrustProcess)
|
||||
{
|
||||
// Use FullTrust process for injection (suspended process)
|
||||
fullTrustProcess.LoadLibrary(FullTrustLoadLibraryRequest.Create("Island", islandPath));
|
||||
fullTrustProcess.ResumeMainThread();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use native injection for normal admin mode
|
||||
// The process was already started by CreateUsingShellExecuteRunAs
|
||||
// Just inject the DLL into the running process
|
||||
try
|
||||
{
|
||||
// Wait a bit for process to initialize
|
||||
// await Task.Delay(500, token).ConfigureAwait(false);
|
||||
// ⚠️此处需要更多调查
|
||||
|
||||
// Inject using RemoteThread
|
||||
DllInjectionUtilities.InjectUsingRemoteThread(islandPath, context.Process.Id);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Log the injection failure but don't crash - game can still run
|
||||
SentrySdk.AddBreadcrumb(
|
||||
$"Island DLL injection failed: {ex.Message}",
|
||||
category: "island.injection",
|
||||
level: Sentry.BreadcrumbLevel.Error);
|
||||
|
||||
// Re-throw to let the caller handle it
|
||||
throw HutaoException.Throw($"Island DLL 注入失败: {ex.Message}", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await PeriodicUpdateIslandEnvironmentAsync(context, handle, token).ConfigureAwait(false);
|
||||
@@ -214,4 +241,4 @@ internal sealed class GameIslandInterop : IGameIslandInterop
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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>>();
|
||||
|
||||
@@ -45,6 +45,7 @@ internal sealed class GameProcessFactory
|
||||
string gameFilePath = context.FileSystem.GameFilePath;
|
||||
string gameDirectory = context.FileSystem.GameDirectory;
|
||||
|
||||
// ProcessFactory.CreateUsingFullTrustSuspended will automatically fallback to normal mode if FullTrust.exe is missing
|
||||
return launchOptions.IsIslandEnabled.Value
|
||||
? ProcessFactory.CreateUsingFullTrustSuspended(commandLine, gameFilePath, gameDirectory)
|
||||
: ProcessFactory.CreateUsingShellExecuteRunAs(commandLine, gameFilePath, gameDirectory);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -26,6 +26,14 @@ internal sealed class LaunchExecutionGameProcessStartHandler : AbstractLaunchExe
|
||||
|
||||
public override async ValueTask ExecuteAsync(LaunchExecutionContext context)
|
||||
{
|
||||
// 如果启用了Island(FPS解锁),则跳过启动游戏进程
|
||||
// 因为unlockfps.exe会负责启动游戏
|
||||
if (context.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
context.Progress.Report(new(SH.ServiceGameLaunchPhaseProcessStarted));
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
context.Process.Start();
|
||||
|
||||
@@ -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;
|
||||
@@ -100,9 +101,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 +122,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 +131,8 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
await handler.ExecuteAsync(executionContext).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
if (process.IsRunning)
|
||||
// 只有在没有启用Island且进程存在时才等待退出
|
||||
if (process is { IsRunning: true })
|
||||
{
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseWaitingProcessExit));
|
||||
try
|
||||
@@ -139,6 +148,12 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (beforeContext.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseWaitingProcessExit));
|
||||
await taskContext.SwitchToBackgroundAsync();
|
||||
await Task.Delay(30000).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseProcessExited));
|
||||
|
||||
@@ -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,17 +2,17 @@
|
||||
// Licensed under the MIT license.
|
||||
|
||||
using Snap.Hutao.Core.IO.Hashing;
|
||||
using Snap.Hutao.Core.Setting;
|
||||
using Snap.Hutao.Web.Hutao;
|
||||
using System.Collections.Immutable;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Cryptography;
|
||||
using Windows.Storage;
|
||||
|
||||
namespace Snap.Hutao.Service.Git;
|
||||
|
||||
internal static class RepositoryAffinity
|
||||
{
|
||||
private static readonly ApplicationDataContainer RepositoryContainer = ApplicationData.Current.LocalSettings.CreateContainer("RepositoryAffinity", ApplicationDataCreateDisposition.Always);
|
||||
private const string RepositoryAffinityPrefix = "RepositoryAffinity::";
|
||||
private static readonly Lock SyncRoot = new();
|
||||
|
||||
public static ImmutableArray<GitRepository> Sort(ImmutableArray<GitRepository> repositories)
|
||||
@@ -23,9 +23,11 @@ internal static class RepositoryAffinity
|
||||
for (int i = 0; i < repositories.Length; i++)
|
||||
{
|
||||
GitRepository repository = repositories[i];
|
||||
ApplicationDataContainer container = RepositoryContainer.CreateContainer(repository.Name, ApplicationDataCreateDisposition.Always);
|
||||
string key = Hash.ToHexString(HashAlgorithmName.SHA256, repository.HttpsUrl.OriginalString.ToUpperInvariant());
|
||||
counts[i] = container.Values[key] is int c ? c : 0;
|
||||
string key = GetSettingKey(repository.Name, repository.HttpsUrl.OriginalString);
|
||||
|
||||
// 对读取值做下限保护,确保排序使用的是非负失败计数
|
||||
int raw = LocalSetting.Get(key, 0);
|
||||
counts[i] = Math.Max(0, raw);
|
||||
}
|
||||
|
||||
Array.Sort(counts, ImmutableCollectionsMarshal.AsArray(repositories));
|
||||
@@ -42,10 +44,14 @@ internal static class RepositoryAffinity
|
||||
{
|
||||
lock (SyncRoot)
|
||||
{
|
||||
ApplicationDataContainer container = RepositoryContainer.CreateContainer(name, ApplicationDataCreateDisposition.Always);
|
||||
string key = Hash.ToHexString(HashAlgorithmName.SHA256, url.ToUpperInvariant());
|
||||
object box = container.Values[key];
|
||||
container.Values[key] = box is int count ? unchecked(count + 1) : 1;
|
||||
string key = GetSettingKey(name, url);
|
||||
int currentCount = LocalSetting.Get(key, 0);
|
||||
|
||||
// 防止整数上溢:当已到达 int.MaxValue 时不再自增
|
||||
if (currentCount < int.MaxValue)
|
||||
{
|
||||
LocalSetting.Set(key, currentCount + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,10 +64,20 @@ internal static class RepositoryAffinity
|
||||
{
|
||||
lock (SyncRoot)
|
||||
{
|
||||
ApplicationDataContainer container = RepositoryContainer.CreateContainer(name, ApplicationDataCreateDisposition.Always);
|
||||
string key = Hash.ToHexString(HashAlgorithmName.SHA256, url.ToUpperInvariant());
|
||||
object box = container.Values[key];
|
||||
container.Values[key] = box is int count ? unchecked(count - 1) : 0;
|
||||
string key = GetSettingKey(name, url);
|
||||
int currentCount = LocalSetting.Get(key, 0);
|
||||
|
||||
// 失败次数不允许小于 0,避免出现负数或整型下溢
|
||||
if (currentCount > 0)
|
||||
{
|
||||
LocalSetting.Set(key, currentCount - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static string GetSettingKey(string name, string url)
|
||||
{
|
||||
string urlHash = Hash.ToHexString(HashAlgorithmName.SHA256, url.ToUpperInvariant());
|
||||
return $"{RepositoryAffinityPrefix}{name}::{urlHash}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
|
||||
@@ -10,6 +10,9 @@
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<UseWinUI>true</UseWinUI>
|
||||
<UseWPF>False</UseWPF>
|
||||
<!-- 配置版本号 -->
|
||||
<Version>1.18.0.0</Version>
|
||||
|
||||
<UseWindowsForms>False</UseWindowsForms>
|
||||
<ImplicitUsings>False</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
@@ -47,12 +50,18 @@
|
||||
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
|
||||
<PackageCertificateKeyFile>Snap.Hutao_TemporaryKey.pfx</PackageCertificateKeyFile>
|
||||
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
|
||||
<!-- 关闭AppX打包 -->
|
||||
<AppxPackage>false</AppxPackage>
|
||||
<!-- 不设置打包类型 -->
|
||||
<WindowsPackageType>None</WindowsPackageType>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Remove="Package.appxmanifest" />
|
||||
<None Remove="Package.development.appxmanifest" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Manifest Include="$(ApplicationManifest)" />
|
||||
<AppxManifest Include="Package.appxmanifest" Condition="'$(ConfigurationName)'!='Debug'" />
|
||||
<AppxManifest Include="Package.development.appxmanifest" Condition="'$(ConfigurationName)'=='Debug'" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="DeleteLibsAfterBuild" AfterTargets="Build">
|
||||
@@ -62,6 +71,14 @@
|
||||
<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>
|
||||
|
||||
<!-- Analyzer Files -->
|
||||
<ItemGroup>
|
||||
<AdditionalFiles Include="ApiEndpoints.csv" />
|
||||
@@ -241,15 +258,15 @@
|
||||
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251105-build.1544" />
|
||||
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251105-build.1544" />
|
||||
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251105-build.1544" />
|
||||
<PackageReference Include="Google.Protobuf" Version="3.33.0" />
|
||||
<PackageReference Include="Google.Protobuf" Version="3.33.1" />
|
||||
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
@@ -265,7 +282,7 @@
|
||||
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.13.22" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3595.46" />
|
||||
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.3.0-prerelease.251015.2" />
|
||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
|
||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
|
||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
|
||||
<PackageReference Include="QRCoder" Version="1.7.0" />
|
||||
<PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
|
||||
@@ -274,10 +291,6 @@
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Snap.Hutao.Deployment.Runtime" Version="2.5.12">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Snap.Hutao.Elevated.Launcher.Runtime" Version="1.3.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
@@ -286,7 +299,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>
|
||||
|
||||
@@ -1,45 +1,44 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<!-- DocumentLink -->
|
||||
<x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
|
||||
<x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
|
||||
<x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
|
||||
<x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
|
||||
<x:String x:Key="DocumentLink_Loopback">https://hut.ao/advanced/loopback.html</x:String>
|
||||
<x:String x:Key="DocumentLink_Sponsor">https://hut.ao/support-us.html</x:String>
|
||||
|
||||
<!-- Other -->
|
||||
<x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
|
||||
<x:String x:Key="Sponsor_Afadian">https://hut.ao/zh/support-us.html</x:String>
|
||||
<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">https://api.snapgenshin.com/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
|
||||
|
||||
<!-- Bg -->
|
||||
<x:String x:Key="UI_ItemIcon_None">https://api.snapgenshin.com/static/raw/Bg/UI_ItemIcon_None.png</x:String>
|
||||
|
||||
<!-- Mark -->
|
||||
<x:String x:Key="UI_MarkQuest_Events_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Events_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Main_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
|
||||
<x:String x:Key="UI_MarkQuest_Main_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
|
||||
<x:String x:Key="UI_MarkTower">https://api.snapgenshin.com/static/raw/Mark/UI_MarkTower.png</x:String>
|
||||
|
||||
<!-- ItemIcon -->
|
||||
<x:String x:Key="UI_ItemIcon_106">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_106.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_204">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_204.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_210">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_210.png</x:String>
|
||||
<x:String x:Key="UI_ItemIcon_220021">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_220021.png</x:String>
|
||||
|
||||
<!-- EmotionIcon -->
|
||||
<x:String x:Key="UI_EmotionIcon52">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon52.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon71">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon71.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon89">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon89.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon250">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon271">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon271.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon272">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon293">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon433">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon433.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon445">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
|
||||
<x:String x:Key="UI_EmotionIcon585">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon585.png</x:String>
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<!-- DocumentLink -->
|
||||
<x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
|
||||
<x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
|
||||
<x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
|
||||
<x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
|
||||
<x:String x:Key="DocumentLink_Loopback">https://hut.ao/advanced/loopback.html</x:String>
|
||||
<x:String x:Key="DocumentLink_Sponsor">https://hut.ao/support-us.html</x:String>
|
||||
|
||||
<!-- Other -->
|
||||
<x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
|
||||
<x:String x:Key="Sponsor_Afadian">https://hut.ao/zh/support-us.html</x:String>
|
||||
<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">https://htserver.wdg.cloudns.ch/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
|
||||
|
||||
<!-- Bg -->
|
||||
<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">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">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">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>
|
||||
|
||||
@@ -79,9 +79,8 @@
|
||||
<Button
|
||||
Padding="6"
|
||||
Command="{Binding InvertAppThemeCommand}"
|
||||
Content="[Dev] Invert Theme"
|
||||
Style="{ThemeResource SettingButtonStyle}"
|
||||
Visibility="{Binding IsDebug}"/>
|
||||
Content="{shuxm:ResourceString Name=UIViewMainTitleBarInvertTheme}"
|
||||
Style="{ThemeResource SettingButtonStyle}"/>
|
||||
|
||||
<Button
|
||||
Padding="0"
|
||||
|
||||
@@ -553,7 +553,7 @@
|
||||
</ScrollViewer>
|
||||
</PivotItem>
|
||||
|
||||
<PivotItem Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandOptionsHeader}" IsEnabled="False">
|
||||
<PivotItem Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandOptionsHeader}">
|
||||
<Border
|
||||
Margin="16"
|
||||
Padding="0"
|
||||
@@ -641,30 +641,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,24 +704,30 @@
|
||||
Subtitle="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFpsTeachingTipSubtitle}"
|
||||
Target="{x:Bind TargetFpsToggleSwitch}"/>
|
||||
|
||||
<NumberBox
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Padding="10,8,6,6"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFpsHeader}"
|
||||
IsEnabled="{Binding LaunchOptions.IsSetTargetFrameRateEnabled.Value}"
|
||||
Maximum="120"
|
||||
Minimum="1"
|
||||
SpinButtonPlacementMode="Inline"
|
||||
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameUnlockFpsDescription}"
|
||||
Value="{Binding LaunchOptions.TargetFps.Value, Mode=TwoWay}"/>
|
||||
<Grid Grid.Row="1" Grid.Column="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<NumberBox
|
||||
Grid.Row="0"
|
||||
Padding="10,8,6,6"
|
||||
Header="{shuxm:ResourceString Name=ViewPageLaunchGameTargetFpsHeader}"
|
||||
IsEnabled="{Binding LaunchOptions.IsSetTargetFrameRateEnabled.Value}"
|
||||
Maximum="120"
|
||||
Minimum="1"
|
||||
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 +763,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 +806,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,35 +879,46 @@
|
||||
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>
|
||||
|
||||
@@ -105,7 +105,7 @@ internal static class StaticResource
|
||||
|
||||
foreach ((string key, object value) in map)
|
||||
{
|
||||
if ((int)value < (int)LatestResourceVersionMap[key])
|
||||
if (Convert.ToInt32(value) < Convert.ToInt32(LatestResourceVersionMap[key]))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -120,7 +120,7 @@ internal static class StaticResource
|
||||
ApplicationDataCompositeValue map = LocalSetting.Get(ContractMap, DefaultResourceVersionMap);
|
||||
foreach ((string key, object value) in LatestResourceVersionMap)
|
||||
{
|
||||
if (!map.TryGetValue(key, out object current) || (int)value > (int)current)
|
||||
if (!map.TryGetValue(key, out object current) || Convert.ToInt32(value) > Convert.ToInt32(current))
|
||||
{
|
||||
result.Add(key);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.ApplicationModel;
|
||||
using Snap.Hutao.Core.Setting;
|
||||
using Snap.Hutao.Factory.ContentDialog;
|
||||
using Snap.Hutao.Factory.Picker;
|
||||
@@ -71,8 +72,18 @@ internal sealed class SettingStorageSetDataFolderOperation
|
||||
try
|
||||
{
|
||||
Directory.SetReadOnly(oldFolderPath, false);
|
||||
StorageFolder oldFolder = await StorageFolder.GetFolderFromPathAsync(oldFolderPath);
|
||||
await oldFolder.CopyAsync(newFolderPath).ConfigureAwait(false);
|
||||
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
// Packaged: use StorageFolder API
|
||||
StorageFolder oldFolder = await StorageFolder.GetFolderFromPathAsync(oldFolderPath);
|
||||
await oldFolder.CopyAsync(newFolderPath).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Unpackaged: use standard file I/O
|
||||
await CopyDirectoryAsync(oldFolderPath, newFolderPath).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -84,4 +95,22 @@ internal sealed class SettingStorageSetDataFolderOperation
|
||||
LocalSetting.Set(SettingKeys.DataDirectory, newFolderPath);
|
||||
return true;
|
||||
}
|
||||
|
||||
private static async ValueTask CopyDirectoryAsync(string sourceDir, string destDir)
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
// Create all directories
|
||||
foreach (string dirPath in Directory.GetDirectories(sourceDir, "*", SearchOption.AllDirectories))
|
||||
{
|
||||
Directory.CreateDirectory(dirPath.Replace(sourceDir, destDir));
|
||||
}
|
||||
|
||||
// Copy all files
|
||||
foreach (string filePath in Directory.GetFiles(sourceDir, "*", SearchOption.AllDirectories))
|
||||
{
|
||||
File.Copy(filePath, filePath.Replace(sourceDir, destDir), true);
|
||||
}
|
||||
}).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Microsoft.Windows.AppLifecycle;
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.ApplicationModel;
|
||||
using Snap.Hutao.Core.Caching;
|
||||
using Snap.Hutao.Core.Logging;
|
||||
using Snap.Hutao.Core.Setting;
|
||||
@@ -135,7 +136,18 @@ internal sealed partial class SettingStorageViewModel : Abstraction.ViewModel
|
||||
// TODO: prompt user that restart will be non-elevated
|
||||
try
|
||||
{
|
||||
AppInstance.Restart(string.Empty);
|
||||
if (PackageIdentityAdapter.HasPackageIdentity)
|
||||
{
|
||||
AppInstance.Restart(string.Empty);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Unpackaged: manually restart the process
|
||||
string exePath = System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName
|
||||
?? throw new InvalidOperationException("Cannot get process path");
|
||||
System.Diagnostics.Process.Start(exePath);
|
||||
Snap.Hutao.Factory.Process.ProcessFactory.KillCurrent();
|
||||
}
|
||||
}
|
||||
catch (COMException ex)
|
||||
{
|
||||
|
||||
@@ -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,11 +0,0 @@
|
||||
namespace Snap.Hutao.Web.Hoyolab.DataSigning;
|
||||
|
||||
internal static class SaltConstants
|
||||
{
|
||||
public const string CNVersion = "2.95.1";
|
||||
public const string OSVersion = "2.54.0";
|
||||
public const string CNK2 = "sfYPEgpxkOe1I3XVMLdwp1Lyt9ORgZsq";
|
||||
public const string CNLK2 = "sidQFEglajEz7FA0Aj7HQPV88zpf17SO";
|
||||
public const string OSK2 = "599uqkwc0dlqu3h6epzjzfhgyyrd44ae";
|
||||
public const string OSLK2 = "rk4xg2hakoi26nljpr099fv9fck1ah10";
|
||||
}
|
||||
@@ -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-----
|
||||
""";
|
||||
|
||||
|
||||
68
tools/GetImages.py
Normal file
68
tools/GetImages.py
Normal file
@@ -0,0 +1,68 @@
|
||||
import hashlib
|
||||
import os
|
||||
import shutil
|
||||
import re
|
||||
|
||||
def sha1_name(filename):
|
||||
"""对输入文件名进行 SHA1 哈希,返回大写 40 位字符串"""
|
||||
sha = hashlib.sha1(filename.encode('utf-8')).hexdigest().upper()
|
||||
return sha
|
||||
|
||||
def search_and_copy(original_name, search_dir, output_dir):
|
||||
sha_name = sha1_name(original_name)
|
||||
print(f"SHA1 计算结果: {sha_name}")
|
||||
|
||||
# 查找匹配文件
|
||||
matched_path = None
|
||||
for root, dirs, files in os.walk(search_dir):
|
||||
for file in files:
|
||||
if file.upper() == sha_name:
|
||||
matched_path = os.path.join(root, file)
|
||||
break
|
||||
|
||||
if not matched_path:
|
||||
print("❌ 未找到匹配文件!")
|
||||
return
|
||||
|
||||
# 创建输出目录
|
||||
os.makedirs(output_dir, exist_ok=True)
|
||||
|
||||
# 复制并重命名
|
||||
# 文件名是url,取最后一部分作为原文件名
|
||||
original_filename = os.path.basename(original_name)
|
||||
# 创建url中最后一个文件夹作为输出目录
|
||||
last_folder = original_name.split('/')[-2]
|
||||
output_subdir = os.path.join(output_dir, last_folder)
|
||||
os.makedirs(output_subdir, exist_ok=True)
|
||||
new_path = os.path.join(output_subdir, original_filename)
|
||||
shutil.copy(matched_path, new_path)
|
||||
print(f"✔ 已复制并重命名文件: {new_path}")
|
||||
|
||||
def extract_urls_from_log(log_file):
|
||||
"""
|
||||
从日志中提取原始文件 URL,并打印到终端
|
||||
"""
|
||||
base_url = "https://api.snapgenshin.com/static/raw"
|
||||
url_pattern = re.compile(r'GET\s+/static/raw/([^/]+)/([^ ]+)\s+HTTP')
|
||||
|
||||
urls = []
|
||||
|
||||
with open(log_file, 'r', encoding='utf-8') as f:
|
||||
for line in f:
|
||||
match = url_pattern.search(line)
|
||||
if match:
|
||||
category, filename = match.groups()
|
||||
full_url = f"{base_url}/{category}/{filename}"
|
||||
urls.append(full_url)
|
||||
|
||||
return urls
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
logfile="1.txt" # 日志文件路径
|
||||
original_file = extract_urls_from_log(logfile)
|
||||
search_directory = "C:\\Users\\username\\AppData\\Local\\Packages\\60568DGPStudio.SnapHutao_wbnnev551gwxy1\\LocalCache\\ImageCache" # 搜索目录
|
||||
output_directory = "C:\\Users\\username\\AppData\\Local\\Packages\\60568DGPStudio.SnapHutao_wbnnev551gwxy1\\LocalCache\\ImageCache\\output" # 输出目录
|
||||
|
||||
for url in original_file:
|
||||
search_and_copy(url, search_directory, output_directory)
|
||||
19
tools/README.md
Normal file
19
tools/README.md
Normal file
@@ -0,0 +1,19 @@
|
||||
# 对开发有用的工具
|
||||
|
||||
对开发有用的工具,不参与编译
|
||||
|
||||
## GetImage.py
|
||||
|
||||
由于没有备份的图片资源,并且缓存目录中的图片名全部经过SHA1处理过,该工具用于通过请求日志在旧的资源文件夹中还原图片资源结构
|
||||
|
||||
### 用法
|
||||
|
||||
**先获取资源服务器上的404日志,如下所示**
|
||||
<img width="1161" height="57" alt="image" src="https://github.com/user-attachments/assets/54270165-f077-4c79-ae87-da16592e77fe" />
|
||||
复制404日志,粘贴到文本中
|
||||
|
||||
**然后修改脚本,确保路径正确**
|
||||
|
||||
从`GetImage.py:62`开始修改,确保路径正确,搜索路径一定要为旧资源文件夹,`username`是你的用户名,`60568DGPStudio.SnapHutao_wbnnev551gwxy1`改为你实际的旧数据文件夹
|
||||
|
||||
运行后将自动搜索缺失的文件,然后会在输出路径中生成原始文件,可以直接上传至服务器来补全图片资源
|
||||
Reference in New Issue
Block a user