Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: ODR #275

Merged
merged 12 commits into from
Dec 12, 2024
Merged

perf: ODR #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ad438a2
perf: ODR
Windsland52 Dec 11, 2024
02e72e9
revert: ODR_MainLoop
Windsland52 Dec 11, 2024
c07954e
chore: delete main.png
Windsland52 Dec 11, 2024
b73d616
chore: 增加ODR_OptionSelectAll模板
Windsland52 Dec 11, 2024
d82bbcb
perf: 修改休憩点选项、节点优先级、开局分队
Windsland52 Dec 11, 2024
25e3c98
feat: 失声天平
Windsland52 Dec 11, 2024
3619cc0
feat: 奇巧置换
Windsland52 Dec 11, 2024
86e20e2
perf: 小细节
Windsland52 Dec 11, 2024
2a2eacf
chore: 增加左滑距离
Windsland52 Dec 12, 2024
0728af5
chore: 左滑定住动作前的postdelay变为0
Windsland52 Dec 12, 2024
df74bb4
revert: 奇巧置换
Windsland52 Dec 12, 2024
a7197e9
chore: 调整造物获取顺序、暂时删除奇巧置换
Windsland52 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/resource/base/image/OutsideDeduction/SODStart_Media_MagicLamp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...utsideDeduction/SODStart_MediaSelect1.png → ...DStart_Media_PomegranateHeartBleeding.png
View file
Open in desktop
File renamed without changes
0 ...utsideDeduction/SODStart_MediaSelect3.png → ...Deduction/SODStart_Media_RitualDagger.png
View file
Open in desktop
File renamed without changes
Binary file added assets/resource/base/image/OutsideDeductionRapid/OptionBorder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/OutsideDeductionRapid/OptionBorder1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/OutsideDeductionRapid/WindowsCompleted.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 37 additions & 2 deletions assets/resource/base/pipeline/activity/outside_deduction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@
"SODStart_MediaSelect",
"SOD_ArcanistAdd",
"SODStart_Confirm"
],
"interrupt": [
"SOD_SwipeLeft"
]
},
"SODStart_GoodsSelect": {
Expand All @@ -351,6 +354,9 @@
"SOD_ItemSelect_1",
"SODStart_MediaSelect",
"SOD_ArcanistAdd"
],
"interrupt": [
"SOD_SwipeLeft"
]
},
"Sub_SODStart_GoodsSelect": {
Expand Down Expand Up @@ -393,7 +399,7 @@
},
"SODStart_MediaSelect": {
"recognition": "TemplateMatch",
"template": "OutsideDeduction/SODStart_MediaSelect3.png",
"template": "OutsideDeduction/SODStart_Media_RitualDagger.png",
"roi": [
0,
81,
Expand All @@ -406,6 +412,34 @@
"SODStart_MediaSelect"
]
},
"SOD_SwipeLeft": {
"action": "Swipe",
"begin": [
1020,
630,
100,
55
],
"end": [
450,
630,
100,
55
],
"post_delay": 0,
"next": [
"SOD_Click"
]
},
"SOD_Click": {
"action": "Click",
"target": [
500,
630,
100,
55
]
},
"SOD_ArcanistAdd": {
"recognition": "TemplateMatch",
"template": "OutsideDeduction/SOD_ArcanistAdd.png",
Expand Down Expand Up @@ -2481,7 +2515,8 @@
642,
20,
20
]
],
"post_wait_freezes": 500
},
"SOD_Main": {
"recognition": "TemplateMatch",
Expand Down
Loading
Loading