Skip to content

Commit 9d2c3ef

Browse files
authored
fix: 国服素材更新 (#164)
* fix(install.ps1,-README.md,-requirements.txt): 更新依赖版本和安装方法 * fix(module/umamusume/asset/point.py,-module/umamusume/script/cultivate_task/info.py,-resource/umamusume/): (@maboroshi0651)同步了一部分国服更新导致的素材变动 * fix(web/src/components,-resource/umamusume/race): 同步其余国服更新素材,更新前端比赛名称 * feat(run.ps1,-check_update.ps1): 添加了自动检测更新的脚本
1 parent 5e8a098 commit 9d2c3ef

35 files changed

+830
-38
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ git clone https://github.com/shiokaze/UmamusumeAutoTrainer
2020
##### 安装依赖
2121

2222
1. 安装python3.10.9,[下载地址](https://www.python.org/downloads/release/python-3109/)
23-
2. 双击运行install.ps1, 如果打开是记事本,右键文件打开方式选择powershell运行, 启动时需要保证当前目录下没有venv文件夹
23+
2. 双击运行install.ps1, 如果打开是记事本,右键文件打开方式选择powershell运行, 启动时需要保证当前目录下没有venv文件夹 (如果不在中国大陆地区或者不需要使用国内镜像,可以将第32行修改为`pip install --upgrade -r requirements.txt`)
2424

2525

2626
### 2. 配置

check_update.ps1

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
if (-not (Test-Path -Path ".git" -PathType Container)) {
2+
# 不是从 git clone 下来的仓库,直接退出
3+
exit 1
4+
}
5+
6+
$currentBranch = (git rev-parse --abbrev-ref HEAD).Trim()
7+
if ($currentBranch -ne "dev") {
8+
Write-Host "[WARN] Your current branch is $currentBranch, which might not be the latest release. Please run 'git checkout dev' to switch to release branch" -ForegroundColor Yellow
9+
exit 1
10+
}
11+
12+
try {
13+
git fetch origin | Out-Null
14+
} catch {
15+
Write-Host "[WARN] Error pulling from origin:$_, upgrade terminated" -ForegroundColor Yellow
16+
exit 1
17+
}
18+
19+
$localHash = (git rev-parse HEAD).Trim()
20+
$remoteHash = (git rev-parse origin/dev).Trim()
21+
22+
if ($localHash -ne $remoteHash) {
23+
Write-Host "`n[INFO] Update detected, please run 'git pull' to get latest release." -ForegroundColor Green
24+
}

install.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ if (!(Test-Path -Path "venv")) {
2929
.\venv\Scripts\activate
3030
Check "activate venv failed"
3131

32-
pip install pyelftools==0.29 -i https://pypi.tuna.tsinghua.edu.cn/simple
33-
pip install pdf2docx==0.5.6 -i https://pypi.tuna.tsinghua.edu.cn/simple
34-
pip install --upgrade -r requirements.txt -i https://mirror.baidu.com/pypi/simple
32+
pip install --upgrade -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/
3533

3634
Write-Output "install complete"
3735
Read-Host | Out-Null ;

module/umamusume/asset/point.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979

8080
GET_TITLE_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE,None, Coordinate(350,1195), "获取称号-确认", None)
8181
CULTIVATE_RESULT_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE,None, Coordinate(360,1185), "育成结果-确认", None)
82+
CULTIVATE_RESULT_DIVISOR_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE,None, Coordinate(525,1185), "确定因子确认", None)
8283
CULTIVATE_FINISH_RETURN_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(190, 835), "育成结束-返回", None)
8384
CULTIVATE_LEARN_SKILL_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE,None, Coordinate(360,1082), "技能学习-确认", None)
8485
CULTIVATE_LEARN_SKILL_CONFIRM_AGAIN = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE,None, Coordinate(530,1190), "技能学习-再次确认", None)
@@ -103,4 +104,4 @@
103104
USE_TP_DRINK = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(610, 320), "使用tp饮料", None)
104105
USE_TP_DRINK_CONFIRM = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(525, 920), "使用tp饮料-确认", None)
105106
USE_TP_DRINK_RESULT_CLOSE = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(360, 835), "回复完成-关闭", None)
106-
SELECT_DIFFICULTY = ClickPoint(ClickPointType.CLICK_POINT_TYPE_COORDINATE, None, Coordinate(517, 1176), "确认选择难度", None)
107+

module/umamusume/script/cultivate_task/info.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"活动剧情解锁",
4343
"确认",
4444
"回复训练值",
45-
"选择养成难度"
45+
"选择养成难度",
46+
"确定因子确认",
4647
]
4748

4849

@@ -142,7 +143,7 @@ def script_info(ctx: UmamusumeContext):
142143
ctx.ctrl.click_by_point(USE_TP_DRINK_CONFIRM)
143144
elif image_match(ctx.ctrl.get_screen(to_gray=True), REF_RECOVER_TP_3).find_match:
144145
ctx.ctrl.click_by_point(USE_TP_DRINK_RESULT_CLOSE)
145-
if title_text == TITLE[28]:
146-
ctx.ctrl.click_by_point(SELECT_DIFFICULTY)
146+
if title_text == TITLE[29]:
147+
ctx.ctrl.click_by_point(CULTIVATE_RESULT_DIVISOR_CONFIRM)
147148
time.sleep(1)
148149

public/assets/index.dddbed6f.js

Lines changed: 766 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/assets/index.dec52c8e.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<link href="https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
1313
<script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
1414
<script src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js"></script>
15-
<script type="module" crossorigin src="./assets/index.2f898a16.js"></script>
16-
<link rel="stylesheet" href="./assets/index.7a4bcb75.css">
15+
<script type="module" crossorigin src="./assets/index.dddbed6f.js"></script>
16+
<link rel="stylesheet" href="./assets/index.dec52c8e.css">
1717
</head>
1818
<body>
1919
<div id="app"></div>

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ opt-einsum==3.3.0
6969
packaging==20.3
7070
paddle-bfloat==0.1.7
7171
paddleocr==2.7.0.2
72-
paddlepaddle==2.3.2
72+
paddlepaddle==2.4.2
7373
pandas==1.3.5
7474
pdf2docx==0.5.6
7575
Pillow==10.0.0
1.13 KB
Loading

0 commit comments

Comments
 (0)