From eeb41afcb530b56cd15b60ecf300314f003163b0 Mon Sep 17 00:00:00 2001 From: 0O0o0oOoO00 <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Sun, 14 Sep 2025 19:34:31 +0800 Subject: [PATCH] fix: use my OCR_COIN to get coin --- assets/cn/campaign/my_OCR_COIN.png | Bin 0 -> 4756 bytes module/campaign/campaign_status.py | 2 +- module/campaign/my_assets.py | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 assets/cn/campaign/my_OCR_COIN.png diff --git a/assets/cn/campaign/my_OCR_COIN.png b/assets/cn/campaign/my_OCR_COIN.png new file mode 100644 index 0000000000000000000000000000000000000000..54ecb23915b67ab220037373c31cde095677d389 GIT binary patch literal 4756 zcmeH|`#aP98^Ay4iO8W7lF;FqeC?Z1_8^3wL`WIKoX?d*a+qux3FTPVoWerF6E-2I z(AFcCoXVPG8`;CM#hj*@&A!v$@O*#szOMImzpwXoU-x}qulw}K!QM(%T16TF09otH z7q0`rZ=$F8Cn<4}xS(z$CK7vYUv`ZI0GR{ZR}3gDRu+9qMp@haDLK1aR!rl_JTxsA z0QT!!Uo?ltPApIdZk-H@ms|?6R98zBr+i90U681?M11`r0q(DHvmj}+SqAw5>^cVC z)o?s9GgVbp_}japBv&tk2)R9PYWE?f)-4qKB$MX6A1i|XlJIliefXxgq}v$@4@q;g z$438XWODT4ZUqE(&^A!^&!HZ5ncRDv8pcZnQB?o_nXcH#x&i=8vP`NAPhd)HvoyP^ zvy!;Bmdd@JRmZlfAIimCT^dvD$Ll}m>yK~Ws!pV=C+Ui#G?vi$F$xkwXs%_{N>^Ip;ZW)7kKR; zTR3Uco*>Mr2bNEp<{K(%xr%G+^3%Kia&}z7w=vd|H?=uw`u|3>dEI? znSC&(QiS~A1#(1i7QcCvEudeW0;l;dKD`s&P~?nm<9)6h_4mF2>;|R_R#RttoKN9r zyC5la?D7cXNNPRsJQ}8p|XXP?ix>^Oz#ok z;#y3d-4sXDLbmvC!$x{n__aWB;p4(iApYZJFY2!}d4tALr#!Xe>NwS@vvcU|JTy0n zeNQ;Z3u3W_zQ3QF*SKl=-y?q7V48b|ZeB?~hD7!&i&||d5@l~3^m_W)VVKgyOp2(P>s%Ph)6)&rmW3A{|E6MV7Itq-R z>qEDr7@Jcy2r@5xuUM4)m<(O!o$Z8nsCMQ9$;L?uwNb+gn$pia3>a)IIY$80SN zj1?37TsoSR{Z6Up%#Q)nN+($Uh^?8yl__u)=pL6P4~wsFa2!SIBAHua`YS3Yfdm+= zW%4LZZ3MY6mA(dr*CQI0+#*=3IJ!iF*JBWLlF~DGDcIuL!7jF3JJ$AqWUDIrJOFsw zY4tTE7s+(zqSnl2m5}m>hDsa_6=AC#m{gEcfD<7{?zZ5C=cYdnn zdf!;05jtR@*><~RrHBCVpZ0QlsWhzzg8C*-*aSDE6R*h_NzqN|-tx_;=T}dRQ}5o` z(64aF`WWF9N}Y<^#I<)#b}eI;k?gnXG1NQT-ODw|^BZ`Y>lPXOt*y7wu;pX=CfSRs z@`V$thn1UBegJyEQGi(eB<)&d?5+ZpCsATJoSeb>L%h15zS?0XV}-Vr$KJ~nd+zUoP^Tu&bULkMJ^lGZ-IHR<+vvA0^ndXU9dMora0TNPwJ5rS zodS6TVX#IwWlTB=o|H`cn<=TyhEd-6ydPt6eg+Za-s#L71d^&Xbrv zcLhLH2-EUq_iqhqe;@2iy8#K!XwK?<1nK!CY^-=U?7cSooi60H@*9l4-d*(2nZU+) zj8b3}8TQ*|iwxuq{%v`~Hyhh+wp1NB-RB&smHau-Z~`o^^CQMLFF+JYgcD8>h{I?5 z(?vK#l0P%NzO?K7CD5MQo~M&Qade*)+{WI;)Pcmx6w{fV3MNsjwxyY5&&xR ztbR(5Ahn_dE!00(#-qm4w=QvRqx|D)MG0(;K-ci93vGwT8P_vO@NyjUTJE#rra7*) zM_xeiaBNllx-`_wNn2PyOrVt9I-1SIkmwY7=PvxZ&Y4Dbt7tGzmCiJ6C5taTL5O=9 zY@V~SQfaYw^$AbGiI!I7)%^Z$1&e}8h4p8prcwQoLvyQ^@UcklBUami!S6Z6=$=0q zRidqviAqn985R>29jLqZ4>N%pSJ-5tvp+$8eZQrY?hAp&g!Hj)Wk;!FuYE&?Z6h7K z8L^5a11&&en|O<5bxGHy!NUs1lNqr2;3jT#jNJfvF7kly0fMLDV5?oEk;K2h@^>um u5ZEEGLtux%4uKs4I|OzJ{C@}xbqmGjw8e#M-$4W09<2YgzlgW+zW+b(5MUet literal 0 HcmV?d00001 diff --git a/module/campaign/campaign_status.py b/module/campaign/campaign_status.py index 1e6c5207e..28f27391b 100644 --- a/module/campaign/campaign_status.py +++ b/module/campaign/campaign_status.py @@ -198,7 +198,7 @@ class CampaignStatus(CampaignStatus): logger.warning('Get coin timeout') break - amount = self._get_num(OCR_COIN, 'OCR_COIN') + amount = self._get_num(my_OCR_COIN, 'OCR_COIN') limit = self._get_num(my_OCR_COIN_LIMIT, 'OCR_COIN_LIMIT') if amount >= 100: diff --git a/module/campaign/my_assets.py b/module/campaign/my_assets.py index 55831f1b3..0706259bf 100644 --- a/module/campaign/my_assets.py +++ b/module/campaign/my_assets.py @@ -13,4 +13,5 @@ my_FLEET_ENTER_HARD_1 = Button(area={'cn': (705, 158, 788, 241), 'en': (705, 158 my_FLEET_ENTER_HARD_1_3 = Button(area={'cn': (910, 176, 994, 260), 'en': (910, 176, 994, 260), 'jp': (910, 176, 994, 260), 'tw': (910, 176, 994, 260)}, color={'cn': (47, 59, 73), 'en': (47, 59, 73), 'jp': (47, 59, 73), 'tw': (47, 59, 73)}, button={'cn': (910, 176, 994, 260), 'en': (910, 176, 994, 260), 'jp': (910, 176, 994, 260), 'tw': (910, 176, 994, 260)}, file={'cn': './assets/cn/campaign/my_FLEET_ENTER_HARD_1_3.png', 'en': './assets/cn/campaign/my_FLEET_ENTER_HARD_1_3.png', 'jp': './assets/cn/campaign/my_FLEET_ENTER_HARD_1_3.png', 'tw': './assets/cn/campaign/my_FLEET_ENTER_HARD_1_3.png'}) my_FLEET_ENTER_HARD_2 = Button(area={'cn': (705, 291, 788, 374), 'en': (705, 291, 788, 374), 'jp': (705, 291, 788, 374), 'tw': (705, 291, 788, 374)}, color={'cn': (169, 182, 200), 'en': (169, 182, 200), 'jp': (169, 182, 200), 'tw': (169, 182, 200)}, button={'cn': (705, 291, 788, 374), 'en': (705, 291, 788, 374), 'jp': (705, 291, 788, 374), 'tw': (705, 291, 788, 374)}, file={'cn': './assets/cn/campaign/my_FLEET_ENTER_HARD_2.png', 'en': './assets/cn/campaign/my_FLEET_ENTER_HARD_2.png', 'jp': './assets/cn/campaign/my_FLEET_ENTER_HARD_2.png', 'tw': './assets/cn/campaign/my_FLEET_ENTER_HARD_2.png'}) 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'})