From 66301a68f584ca129d947b48df3c8945f43f7319 Mon Sep 17 00:00:00 2001 From: 0O0o0oOoO00 <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Sun, 14 Sep 2025 20:03:48 +0800 Subject: [PATCH] fix: log oil resources when battle --- assets/cn/campaign/my_OCR_OIL_LIMIT.png | Bin 0 -> 6748 bytes module/campaign/campaign_status.py | 35 ++++++++++++++++++++++++ module/campaign/my_assets.py | 1 + 3 files changed, 36 insertions(+) create mode 100644 assets/cn/campaign/my_OCR_OIL_LIMIT.png diff --git a/assets/cn/campaign/my_OCR_OIL_LIMIT.png b/assets/cn/campaign/my_OCR_OIL_LIMIT.png new file mode 100644 index 0000000000000000000000000000000000000000..9392769fbb36015b2ca00d111a2ab38d59344717 GIT binary patch literal 6748 zcmeHL`%_bA8vdZ5fGxDdl_FP1kr~SpHA0L8V%JobqTsf5S1b~?*07a<02xRyAwh+0 z(`wMRn@EGu+G(j$U?q|Sa^a>}HzBcd2{GhCxUPYmgg_Duggy9A>@WF#dC$x_-+c2u z@AEwKK8JNGEB%e2ok0MAH!}W={{R4g_|f-iz!tcus&sz^VCU`({JS4f8y0mbzkW2M z@13k={Pd+%c=q~(ot=k5TcsoKKRA6y5IgeA@}+A({W5}YJ^kQN-bKmC@%!(|*5VTm z(#V+T$@wRBa~TyxheH0maD4kT*V$2!!?AAzfXTDZtvk)f1qG_ci1l^=Ts+-0G7>%= zbbD0L4p7}=;u07+?C8{P?DErNa=t1}JQY-+Y{+59;AB{jYf6sD#@?TjBI2_WVi>N; zviYY!TrkM0!U!7+d=*Eizf_1RG4`@?@LKd@dyOv$qoOSywI}+2uBE@GnPP_%;1-H|xF0ER`P;#H;W_q*+ z-`6!JnqsF^)ClF3%fF{{W0-5U4yaWvgJkZ+h>gK-veUZOmWQ+DeOI?4BUZ-DCnk7q ztq04EpqN{QiS4qN_n7&h7x$mgd;r=sHUAz}^z)uNpcDDL`YSE0i|0Rie#CD1u`ca7 z*3wu`i9zgaccEi?9p$ zf|4PkX5j^lzRVP=4WzZOE{h9-($<%Ud5>BDfKjo`uHr>WuloXP69V`E5fQOId+Nqa ze;$L2%Dk#R(4sr9j_X9css6%c9SDKO-?8G7+z4gf6}vwu*SJ2`o`hR%fiP1eEaIYNwn1& zE;4$|_AC=wbjK)QRhcixA`C>Rr+ytx+-tNTYGUZtz9D_Jyf&X|ddM<6GLJCUT(iAj ztMh0>$Y>zi74V9hId^F8MIkBCu0W}B%gUe{X?ccq!N)ZiLCT$If;b-+Yp}|@QpDUK z%y=})$=PNraa-Aioix?Ep!!H=HB6(#vF|CWRA&OsY0;HFDaTk7#Hkev<3wCfPKCRF z8*bvz(dT5Vv%Hy+yC3p~nRDxbU$`BM;%R}yiLL$?;=6n6UH$p^V13H3JdvFQdn78Ox2q1e|@Ux(uVUiJwvGFbrb zV0r2EZ#U(6v#=|LO+8n5crM|08me9Yu#@$fyjH_B>*;nn(LZaC#BCA7a{HNA+&yi) zG1~ntwGAV`CTw;47B|I8Qi8L-&rPh6j*bRzt#`X%zk&(+axs{R2=f7+&uE+r7)S_! z)rn!sY=-tg8sagr3$kdaW*XT9DFU$MSq0HCVHu{W)ddb?_Xx$|(Xwm!hp7FAOC45x zXG_$UgD8Jwfs~6&AqMZ!H2y(Ug#S+v?p?_7#6;@)j%s#9zWTYB N@m?0b?N9kv{s%1+CpZ8A literal 0 HcmV?d00001 diff --git a/module/campaign/campaign_status.py b/module/campaign/campaign_status.py index 28f27391b..0d25b5590 100644 --- a/module/campaign/campaign_status.py +++ b/module/campaign/campaign_status.py @@ -180,6 +180,41 @@ class CampaignStatus(CampaignStatus): return ocr.ocr(self.device.image) + def _get_oil(self): + return self.get_oil() + + def get_oil(self, skip_first_screenshot=True, update=False): + amount = 0 + limit = 0 + timeout = Timer(1, count=2).start() + while 1: + if skip_first_screenshot: + skip_first_screenshot = False + else: + self.device.screenshot() + + if not self.appear(OCR_OIL_CHECK, offset=(10, 2)): + logger.info('No oil icon') + self.device.sleep(1) + + if timeout.reached(): + logger.warning('Get oil timeout') + break + + amount = self._get_num(OCR_OIL, 'OCR_OIL') + limit = self._get_num(my_OCR_OIL_LIMIT, 'OCR_OIL_LIMIT') + + if amount >= 100: + break + self.config.log_res.Oil = { + 'Value': amount, + 'Limit': limit + } + if update: + self.config.update() + + return amount + def get_coin(self, skip_first_screenshot=True, update=False): """ Returns: diff --git a/module/campaign/my_assets.py b/module/campaign/my_assets.py index 0706259bf..21ae6308f 100644 --- a/module/campaign/my_assets.py +++ b/module/campaign/my_assets.py @@ -15,3 +15,4 @@ my_FLEET_ENTER_HARD_2 = Button(area={'cn': (705, 291, 788, 374), 'en': (705, 291 my_FLEET_ENTER_HARD_2_3 = Button(area={'cn': (910, 288, 996, 374), 'en': (910, 288, 996, 374), 'jp': (910, 288, 996, 374), 'tw': (910, 288, 996, 374)}, color={'cn': (52, 56, 64), 'en': (52, 56, 64), 'jp': (52, 56, 64), 'tw': (52, 56, 64)}, button={'cn': (910, 288, 996, 374), 'en': (910, 288, 996, 374), 'jp': (910, 288, 996, 374), 'tw': (910, 288, 996, 374)}, file={'cn': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png', 'en': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png', 'jp': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png', 'tw': './assets/cn/campaign/my_FLEET_ENTER_HARD_2_3.png'}) my_OCR_COIN = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, color={'cn': (61, 61, 73), 'en': (61, 61, 73), 'jp': (61, 61, 73), 'tw': (61, 61, 73)}, button={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, file={'cn': './assets/cn/campaign/my_OCR_COIN.png', 'en': './assets/cn/campaign/my_OCR_COIN.png', 'jp': './assets/cn/campaign/my_OCR_COIN.png', 'tw': './assets/cn/campaign/my_OCR_COIN.png'}) my_OCR_COIN_LIMIT = Button(area={'cn': (807, 0, 944, 19), 'en': (807, 0, 944, 19), 'jp': (807, 0, 944, 19), 'tw': (807, 0, 944, 19)}, color={'cn': (206, 206, 206), 'en': (206, 206, 206), 'jp': (206, 206, 206), 'tw': (206, 206, 206)}, button={'cn': (807, 0, 944, 19), 'en': (807, 0, 944, 19), 'jp': (807, 0, 944, 19), 'tw': (807, 0, 944, 19)}, file={'cn': './assets/cn/campaign/my_OCR_COIN_LIMIT.png', 'en': './assets/cn/campaign/my_OCR_COIN_LIMIT.png', 'jp': './assets/cn/campaign/my_OCR_COIN_LIMIT.png', 'tw': './assets/cn/campaign/my_OCR_COIN_LIMIT.png'}) +my_OCR_OIL_LIMIT = Button(area={'cn': (608, 0, 736, 19), 'en': (608, 0, 736, 19), 'jp': (608, 0, 736, 19), 'tw': (608, 0, 736, 19)}, color={'cn': (202, 202, 202), 'en': (202, 202, 202), 'jp': (202, 202, 202), 'tw': (202, 202, 202)}, button={'cn': (608, 0, 736, 19), 'en': (608, 0, 736, 19), 'jp': (608, 0, 736, 19), 'tw': (608, 0, 736, 19)}, file={'cn': './assets/cn/campaign/my_OCR_OIL_LIMIT.png', 'en': './assets/cn/campaign/my_OCR_OIL_LIMIT.png', 'jp': './assets/cn/campaign/my_OCR_OIL_LIMIT.png', 'tw': './assets/cn/campaign/my_OCR_OIL_LIMIT.png'})