From 9228b200a59f46eb0a2b0cab8fc66b62ec9716d0 Mon Sep 17 00:00:00 2001 From: Hengyu Date: Sun, 20 Aug 2023 23:53:25 +0800 Subject: [PATCH] Upd: assets and Ocr to fit in English ui --- .../share/rogue/blessing/OCR_RESET_COUNT.png | Bin 10252 -> 11367 bytes .../rogue/bonus/BONUS_BOTTOM_WHITE_BAR.png | Bin 12866 -> 5943 bytes .../ui/{CONFIRM.png => BLESSING_CONFIRM.png} | Bin assets/share/rogue/ui/PAGE_CHOOSE_BUFF.png | Bin 6336 -> 8597 bytes tasks/rogue/assets/assets_rogue_blessing.py | 8 ++--- tasks/rogue/assets/assets_rogue_bonus.py | 8 ++--- tasks/rogue/assets/assets_rogue_ui.py | 28 +++++++++--------- tasks/rogue/blessing.py | 11 +++---- tasks/rogue/curio.py | 6 ++-- 9 files changed, 32 insertions(+), 29 deletions(-) rename assets/share/rogue/ui/{CONFIRM.png => BLESSING_CONFIRM.png} (100%) diff --git a/assets/share/rogue/blessing/OCR_RESET_COUNT.png b/assets/share/rogue/blessing/OCR_RESET_COUNT.png index 55de9d3ed8b46c5477907ad24a1ab1bd7b5b91d4..4a7884e81e2bc165fd3600426c65d7c3c95bd35e 100644 GIT binary patch delta 6117 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 iJb2Tgk-cL1R#=$FgEts!qbo4*aj-lF~ny1 zl{?HZ^_Qc>qYMIi3?JXK`=$DN58+1t)#LB~)!mj#J%2^GF1dp+!j2+`O7?y+V&-8vCa zkATUvBHr4cAvkKp-yk?vX-3i0=j_%Se%(zq%b8HWp~Q}o+m^&G52dq-(69Do4DYHO zFXuG1)^H4~6pQ<^+IX|{2qK-AIa4%q+#yYuS}Da-Lt>8(N;Dg5tp5yy?d8=BFAXX- z%H!a2J+Fzz5%S&MRdB3+3FpOJ(o~%X(Z^ZuLV#rAlz}zfgjNhcgT3eL`-NiAOtSh> z7Pc{_9%=o#<|fiYtiT3Rr&g&UM{oBh3$$}m#%`PLS}l|Y=O0l{jeZ$%x%+Q8_Conn zDcs3a+?!|ScG9ZK4d0yFw9Lf{Owcth$<;2?mU(UF%G^n(lH+y#CO+$FL)? z#<_a|^|2e!hmzWxrQnIY08kBT>5#Z{Ro9~iP|XFz5)#spJ>^xwRv@+AwP^q zl9FkI&vmpyyQ>~$!%=|Jl{;)}O7I}=%}P?_h2A7q1q0R8)a35&j#SzLA5lU7VyL(a z?Emh-#+$NYi{YKCjV^?+(9nx=$-36
B{BXuGY26uKgR>H?(1Y2v1R4iv6Uu1^i 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 z zJc~U^@Lme@Z7WX1fhYW{Yri~Bplr5b%vI&BJ_ox6!juBV9cHH|yK_~ug83JzX^FM$ zMQ1IYSi15I#-nhWD{ASpk<+-6f;O>bk_x5QOK(i-7dgUjGAuohywKb&he?odnMK zdzJWQT91^RSqC`|e#90bS5FWu$zN(8ay+mF4JnS10bvt2J1 waf#uY143Jo9Yl;smEGac19A}wyF~|JAC1mb|G&avJPdr0mNu6w%3lx_^ZS>70ig4;5&!^wR@e1lFi;18KF|RM0RD><`jx|#&Czm- zluU{Mx^Jii06^cg({5eIvZ~btKmY~+=&YveTuKZE+P?t3U=J_=0006o00008zyJUM zAOHgZe2-E}`(UwHM8tGDJw1OtJvlkKxVU(IeN7Q5BDX#O2*3aUKg`R^%VaWndU|S3 zN2Ag6^Yhu++1=e;L|k26U0+|T5`X{<0Py48+}w=EG}Ej?d|R1;ok5h1_0=gjrGs1&|Av;1EK-5K?~#o9{2=*0RRC1{{sL%6RWVzzwOQd0000> delta 7606 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 delta 1006 zcmV#P`sHK7ho7*%m#3b24hwEF+>an;7WYLnkAF8FpBPn2_%~!E|*`(slY% z)jc7zu^3?if56B^w*UYDIKrC0PyP7uBj+4r%sIDOts6IP6h(3F+_@0K$B!SEmX;no zc<}V;(->n8TR&qd{&z0roOdSHuCr1~y*hrO0{{Sw*vawns;WW=r<=`3 zj~>m<&FyZ~ob#JEZ|>Z=^YvS|Z`=-y;aK$@Q=eN^f7R;h>ihTadq-1FA%yQ6U(JgE z1^@s!lmNbP;lf|fpZAZV7<;Yz=cUV?PN%nAe2@UHuP{D7J~J~DLU{4wMF^o08Uk1V z0{{RViW8?!HJiwOaLK!`mymuRW@}cQnSBQVJoIWmy!(!Rs0U3;+Po$Mx&i zhaX(m>CKxrhj|6`jxZi(e2nq<@#7{%00RI3e~eyH6fwpjgSOrdy|A!wz%Py4Z2x>^ zW#!_cRHPYH1K|mjg5Wz^2MYG ze_#LrfYE#P>eY@PI@-H_LkKTlzTDS}ao_9o-5NbVKmYFCJCh=S0RR9-@BaP!RaFfc zz$vAi^Syib4j90LR8_UPxoJ`aFaQ9+=q)ZTE-x?Fi@^26z&ql$cc}jN_3PJ*i;D-} z0^R$%`pP-yqA1F;JfzLl3?sS)006)de>QgFM6=m!x7){33L#WgmD0e4z^y9I&(DAQ z^l4Npz`X#zdi82qmNDlLLieBV=0yMl004|WfI|pp&YWqltkgT4_Za-g?4`A}wf(*| zdJhv56Eib2Ip?x0V~llq3t#~Z001z0znwf;2kq%*^U0GZ)6>(t$K;&fzI}W9T=wn1 zSJzTXjYcC3{wbrOLMz6cb5&KJKY!l-)~lFvjB%s;&AbR;004jyo0vSkxw%>AXiDkY zwQIL--C9^!n3|djA#^&OrKP32cke!X_UwSsJEW9ScjK#h0kg3f$_SHC3kV+I|N9pJ c0RR630HsC44%N#o)c^nh07*qoM6N<$g6RzPw*UYD diff --git a/tasks/rogue/assets/assets_rogue_blessing.py b/tasks/rogue/assets/assets_rogue_blessing.py index ab91cda7a..211e00fdb 100644 --- a/tasks/rogue/assets/assets_rogue_blessing.py +++ b/tasks/rogue/assets/assets_rogue_blessing.py @@ -57,10 +57,10 @@ OCR_RESET_COUNT = ButtonWrapper( name='OCR_RESET_COUNT', share=Button( file='./assets/share/rogue/blessing/OCR_RESET_COUNT.png', - area=(714, 595, 824, 620), - search=(694, 575, 844, 640), - color=(37, 37, 41), - button=(714, 595, 824, 620), + area=(655, 593, 873, 623), + search=(635, 573, 893, 643), + color=(23, 24, 26), + button=(655, 593, 873, 623), ), ) OCR_ROGUE_BUFF = ButtonWrapper( diff --git a/tasks/rogue/assets/assets_rogue_bonus.py b/tasks/rogue/assets/assets_rogue_bonus.py index 42bcd9fb8..ab2f1f15e 100644 --- a/tasks/rogue/assets/assets_rogue_bonus.py +++ b/tasks/rogue/assets/assets_rogue_bonus.py @@ -7,10 +7,10 @@ BONUS_BOTTOM_WHITE_BAR = ButtonWrapper( name='BONUS_BOTTOM_WHITE_BAR', share=Button( file='./assets/share/rogue/bonus/BONUS_BOTTOM_WHITE_BAR.png', - area=(182, 568, 1098, 590), - search=(162, 548, 1118, 610), - color=(221, 221, 222), - button=(182, 568, 1098, 590), + area=(731, 568, 774, 590), + search=(711, 548, 794, 610), + color=(250, 250, 250), + button=(731, 568, 774, 590), ), ) BONUS_CONFIRM = ButtonWrapper( diff --git a/tasks/rogue/assets/assets_rogue_ui.py b/tasks/rogue/assets/assets_rogue_ui.py index 93aaa0bb7..6eccc8144 100644 --- a/tasks/rogue/assets/assets_rogue_ui.py +++ b/tasks/rogue/assets/assets_rogue_ui.py @@ -3,6 +3,16 @@ from module.base.button import Button, ButtonWrapper # This file was auto-generated, do not modify it manually. To generate: # ``` python -m dev_tools.button_extract ``` +BLESSING_CONFIRM = ButtonWrapper( + name='BLESSING_CONFIRM', + share=Button( + file='./assets/share/rogue/ui/BLESSING_CONFIRM.png', + area=(960, 629, 1233, 677), + search=(940, 609, 1253, 697), + color=(217, 218, 218), + button=(960, 629, 1233, 677), + ), +) CHECK_BLESSING = ButtonWrapper( name='CHECK_BLESSING', share=Button( @@ -13,16 +23,6 @@ CHECK_BLESSING = ButtonWrapper( button=(946, 17, 986, 57), ), ) -CONFIRM = ButtonWrapper( - name='CONFIRM', - share=Button( - file='./assets/share/rogue/ui/CONFIRM.png', - area=(960, 629, 1233, 677), - search=(940, 609, 1253, 697), - color=(217, 218, 218), - button=(960, 629, 1233, 677), - ), -) COSMIC_FRAGMENT = ButtonWrapper( name='COSMIC_FRAGMENT', share=Button( @@ -57,10 +57,10 @@ PAGE_CHOOSE_BUFF = ButtonWrapper( name='PAGE_CHOOSE_BUFF', share=Button( file='./assets/share/rogue/ui/PAGE_CHOOSE_BUFF.png', - area=(1105, 95, 1154, 113), - search=(1085, 75, 1174, 133), - color=(81, 82, 83), - button=(1105, 95, 1154, 113), + area=(1016, 94, 1135, 113), + search=(996, 74, 1155, 133), + color=(71, 71, 73), + button=(1016, 94, 1135, 113), ), ) PAGE_CHOOSE_CURIO = ButtonWrapper( diff --git a/tasks/rogue/blessing.py b/tasks/rogue/blessing.py index c35678374..5aac8fa26 100644 --- a/tasks/rogue/blessing.py +++ b/tasks/rogue/blessing.py @@ -9,7 +9,7 @@ from module.logger import logger from module.ocr.ocr import Ocr, OcrResultButton, DigitCounter, Digit from module.ocr.utils import split_and_pair_buttons from tasks.rogue.assets.assets_rogue_blessing import * -from tasks.rogue.assets.assets_rogue_ui import CONFIRM +from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM from tasks.rogue.keywords import * from tasks.rogue.preset import * from tasks.rogue.selector import RogueSelector @@ -56,7 +56,7 @@ RESONANCE_FILTER = MultiLangFilter(FILETER_REGEX, (RESONANCE_ATTR_NAME,), RESONA class RogueBuffOcr(Ocr): - merge_thres_x = 40 + merge_thres_y = 40 def after_process(self, result): result = super().after_process(result) @@ -147,7 +147,8 @@ class RogueBlessingSelector(RogueSelector): Case 4: event ui """ return (self.main.is_in_main() or self.main.is_page_choose_curio() - or (self.main.is_page_choose_blessing() and not is_card_selected(self.main, target, CONFIRM)) + or (self.main.is_page_choose_blessing() and not is_card_selected(self.main, target, + BLESSING_CONFIRM)) or self.main.is_page_event()) interval = Timer(1) @@ -163,7 +164,7 @@ class RogueBlessingSelector(RogueSelector): else: self.main.device.screenshot() - if is_card_selected(self.main, target, confirm_button=CONFIRM): + if is_card_selected(self.main, target, confirm_button=BLESSING_CONFIRM): if enforce: logger.info("Buff selected (enforce)") else: @@ -187,7 +188,7 @@ class RogueBlessingSelector(RogueSelector): if is_select_blessing_complete(): break if interval.reached(): - self.main.device.click(CONFIRM) + self.main.device.click(BLESSING_CONFIRM) interval.reset() def _get_reset_count(self): diff --git a/tasks/rogue/curio.py b/tasks/rogue/curio.py index 40c874123..ad4ef61f0 100644 --- a/tasks/rogue/curio.py +++ b/tasks/rogue/curio.py @@ -8,7 +8,7 @@ from module.base.utils import get_color from module.logger import logger from module.ocr.ocr import Ocr, OcrResultButton from tasks.rogue.assets.assets_rogue_curio import * -from tasks.rogue.assets.assets_rogue_ui import CONFIRM +from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM from tasks.rogue.keywords import RogueCurio from tasks.rogue.preset import CURIO_PRESET_1 from tasks.rogue.selector import RogueSelector @@ -24,6 +24,8 @@ CURIO_FILTER = MultiLangFilter(FILTER_REGEX, CURIO_FILTER_ATTR, CURIO_FILTER_PRE class RogueCurioOcr(Ocr): + merge_thres_y = 40 + def after_process(self, result): result = super().after_process(result) if self.lang == 'ch': @@ -94,7 +96,7 @@ class RogueCurioSelector(RogueSelector): if is_select_curio_complete(): break if interval.reached(): - self.main.device.click(CONFIRM) + self.main.device.click(BLESSING_CONFIRM) interval.reset() def try_select(self, option: OcrResultButton | str):