From c9111273b8acd93662913608a9d039ea209906d2 Mon Sep 17 00:00:00 2001 From: Zebartin <16185081+Zebartin@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:42:33 +0800 Subject: [PATCH] Fix: Change of assignment ui in ver 1.3 --- .../claim/OCR_ASSIGNMENT_REPORT_TIME.png | Bin 7730 -> 8092 bytes .../assets/assets_assignment_claim.py | 8 ++++---- tasks/assignment/claim.py | 12 +++++------- tasks/assignment/ui.py | 1 + tasks/combat/state.py | 1 - tasks/forgotten_hall/ui.py | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/assets/share/assignment/claim/OCR_ASSIGNMENT_REPORT_TIME.png b/assets/share/assignment/claim/OCR_ASSIGNMENT_REPORT_TIME.png index 287dd7e54e0e0c14a7762b240064180477a4ee2a..0a9461297d65b7f8e07a86c6fb23487de9aa9bac 100644 GIT binary patch delta 2954 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 IJLT;E08=Dc+W-In delta 2587 zcmX9shJl94e?7eMMXhD;g#+A>-n7LJkNQ~_k7RylptRE-1pdG zj{Ww;IV&qG!Bo)X?+4rf=av)4j-E@4PzdpNQ8R>|snQ;A{(%M$N3vt?XI9pEn+{rR za4fg~`jgZz>~B7VoUc0eHhO&HsoiEau6L{sUP4=YRKF!5p0-rSMs2zhPwR}(Hro9Q88?~ zd*nCkQaKBZobI_t72?EgFma}uv!$c5#}hEU)s^@I7c!AR>z8qZd>S3i|~`b+c* zCR5T+3^QJxxd*=45h*XBe~VrH&7pwWrkSAS*gzwMCmG;aOljSd&`1;)!8UMvnal6< z;+fVCvZ`|S_!DHa>tS1Gc;ng_Z}9m^uuUrhSsCKUOfbwVMfOlv%QmC}zJ}##;+PFB zcHn)Hu?tJYL7X_7{MVDc8u<74XWdn2cY~IQmihv?Y%g8-`nIB`HL-cD(lv+_?g?Bw zpU7T&5km65+&c-^%Rer?h%}}vTBZx=Gld?CZ`yCz7KJ~KOpVhsR5;*WY=}Lk;mvlm zZA-jm;BFxNnXFl))zqRpib~@o48~}QxWnvS=_l)-fWYp!2N5qY6%2Hn zUdi;DUR8sOaYHil$02m*b&JFbZ)MALh{)C_ZmD&xXR2Lfme)eVd{#z)=fnW6^vHxHAMv~kd4`LKhj7Rz-`@6<`X z_n$2-4h8WNn}s2`iR766VsC2JN+g>+MoUWK?qn;LcQvfs(oDF^^*2+MJa$$YhBe=v zzBmv78uThEl4f{L6kp19mf1D&%LqbVrzJG}knoo%MXQuVeB$>gG=HZr;{bDU5P)k- zur+9ZZt3gV+^*=wGG&$w0s<2#23AkpEEM33389n** zC|zvO^W2(?>laE!xQPHoW0=Z?QjCTXYRFD^_UbimiaXU!+E<+m#aD>Z!8(p51m?Wq zi}m`g{hXNhQCHylux&+BOphHXBjNTQJ(@2_2h*iQoJ{A0iNy&L7nNO1owkXMURl`YlteDP5LZgj#36VS z2Ud@A6==+Nm=F~qRZ0Yd{ERCcc}=Pyv03-GC#P!Yv@bo!4l3dh;@`h!%$DViOYJsf zmRM!4s|!`45In+VS5v&v$$S66Ql0!t~^~=9bDPCSA)@wab=`} zWkJ_&2MxPq$j?&S7k~5tcvD*rK7JA{5!YEn( zA<<8GR;xwYyQfD}UT+N`U&~U>8+Jj~PM9?FVtL$kQI=j2`l2)|-Da0hi?T({VMvP5 zAtIfi7H0v7Wgg^OgEp0R(X+DNbE<1h%3s+ zKCifaUFa)4*gOYIrhYf}m5)06hC2@5=;x`!=1qlaOFgkVz-pa@GNiD%HHPTpNnjKa&? z*ly5)3Q#i9-d*4Q(8+T{~CVTO2(s3o)++noF$x_b~S2*e)|hk1+A z&&qb4am!K{)7LZtEsLr-k{(0CN2AjJ+OxL@>8lFJ-!g#^dn2s0xFrZ z0AIHL&R$B@^OH<(_4x;G(4Tk_>L4$*Tj)sD@4E%9bR^;C`y8+hmTeeXO|mdvS!bY? z<_QrYz>h@w=}LbOyj7fRSV`;+d)$fzq)lh%jNA9cauFXZ9>{6~phC(5I>Z8o?U%77 zO~SaCl65ZX;-wF2<5QKyUpmZufqC25X`v`Xg;E3RVz`DMdeyx4ks-*8pu(Tv2Vt)jy1v{F9+zKgGu*~^a zO{(hO68I$qb4#+49hioOS;l>JNoCs!4w47aBxnAy9*JjQAv$EUCg+XaP$s2;A|6VB z5BgB+kBEG7=bk@~h^N-Ft+M@rf5zRZE`pEwdfiI1UMCgA>8yihG=|(i z&e7MKWt(``aeSEkUQlQbF{vj6a{ZrPfY_6fc8X`F8xZ@qn`p_OeriLzzaietF=WJO ZF1I@UQ$|eJL(}Pr?@u42e0%Zw{{b6GhD`tf diff --git a/tasks/assignment/assets/assets_assignment_claim.py b/tasks/assignment/assets/assets_assignment_claim.py index 947c4704d..02bafb0aa 100644 --- a/tasks/assignment/assets/assets_assignment_claim.py +++ b/tasks/assignment/assets/assets_assignment_claim.py @@ -27,10 +27,10 @@ OCR_ASSIGNMENT_REPORT_TIME = ButtonWrapper( name='OCR_ASSIGNMENT_REPORT_TIME', share=Button( file='./assets/share/assignment/claim/OCR_ASSIGNMENT_REPORT_TIME.png', - area=(894, 191, 1003, 216), - search=(874, 171, 1023, 236), - color=(62, 63, 63), - button=(894, 191, 1003, 216), + area=(870, 222, 1002, 247), + search=(850, 202, 1022, 267), + color=(57, 57, 60), + button=(870, 222, 1002, 247), ), ) REDISPATCH = ButtonWrapper( diff --git a/tasks/assignment/claim.py b/tasks/assignment/claim.py index 969670386..314c5a439 100644 --- a/tasks/assignment/claim.py +++ b/tasks/assignment/claim.py @@ -3,10 +3,9 @@ from datetime import datetime, timedelta from module.logger import logger from module.ocr.ocr import Duration from tasks.assignment.assets.assets_assignment_claim import * -from tasks.assignment.assets.assets_assignment_dispatch import EMPTY_SLOT -from tasks.assignment.assets.assets_assignment_ui import DISPATCHED from tasks.assignment.dispatch import AssignmentDispatch from tasks.assignment.keywords import AssignmentEntry +from tasks.base.page import page_assignment class AssignmentClaim(AssignmentDispatch): @@ -32,6 +31,7 @@ class AssignmentClaim(AssignmentDispatch): ) + timedelta(hours=duration_expected) elif should_redispatch: # Re-select duration and dispatch + self.goto_entry(assignment) self.dispatch(assignment, duration_expected) def _wait_for_report(self): @@ -61,11 +61,9 @@ class AssignmentClaim(AssignmentDispatch): Pages: in: CLOSE_REPORT and REDISPATCH - out: EMPTY_SLOT or DISPATCHED + out: page_assignment """ - click_button, check_button = CLOSE_REPORT, EMPTY_SLOT - if should_redispatch: - click_button, check_button = REDISPATCH, DISPATCHED + click_button = REDISPATCH if should_redispatch else CLOSE_REPORT skip_first_screenshot = True while 1: if skip_first_screenshot: @@ -73,7 +71,7 @@ class AssignmentClaim(AssignmentDispatch): else: self.device.screenshot() # End - if self.appear(check_button): + if self.appear(page_assignment.check_button): logger.info('Assignment report is closed') break # Close report diff --git a/tasks/assignment/ui.py b/tasks/assignment/ui.py index cadd5d19a..3e36dcb1c 100644 --- a/tasks/assignment/ui.py +++ b/tasks/assignment/ui.py @@ -43,6 +43,7 @@ class AssignmentOcr(Ocr): (KEYWORDS_ASSIGNMENT_ENTRY.Root_Out_the_Turpitude.name, '根除恶[擎薯尊掌鞋]?'), (KEYWORDS_ASSIGNMENT_ENTRY.Akashic_Records.name, '阿[未][夏复]记录'), + (KEYWORDS_ASSIGNMENT_ENTRY.The_Wages_of_Humanity.name, '[赠]养人类'), ] } diff --git a/tasks/combat/state.py b/tasks/combat/state.py index b396f8c74..25cb85d9d 100644 --- a/tasks/combat/state.py +++ b/tasks/combat/state.py @@ -94,7 +94,6 @@ class CombatState(UI): self._combat_auto_checked = True else: if self._combat_click_interval.reached(): - self.device.image_save() self.device.click(COMBAT_AUTO) self._combat_click_interval.reset() return True diff --git a/tasks/forgotten_hall/ui.py b/tasks/forgotten_hall/ui.py index 9e3d2ee3b..1d2e72ec2 100644 --- a/tasks/forgotten_hall/ui.py +++ b/tasks/forgotten_hall/ui.py @@ -185,7 +185,6 @@ class ForgottenHallUI(DungeonUI): timeout.reset() if interval.reached() and self._forgotten_hall_enter_appear(): - self.device.image_save() self.device.click(ENTER_FORGOTTEN_HALL_DUNGEON) interval.reset()