From e82f31864c5607a8441b95a6262a2d6156c3e52d Mon Sep 17 00:00:00 2001
From: "firedcto@gmail.com" <firedcto@gmail.com>
Date: Tue, 30 Jul 2024 11:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E5=B0=8F=E6=9C=88?=
 =?UTF-8?q?=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/zh_CN/LC_MESSAGES/ok.mo  | Bin 4540 -> 4676 bytes
 i18n/zh_CN/LC_MESSAGES/ok.po  |   3 +++
 src/task/BaseWWTask.py        |  12 ++++++------
 src/task/FarmWorldBossTask.py |   4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/i18n/zh_CN/LC_MESSAGES/ok.mo b/i18n/zh_CN/LC_MESSAGES/ok.mo
index 6a1ce1cf56f0f8b0fe28d52f5fc3ed210f4c8330..aea21c27580b00397f7e7e45e1efbf49096b2e02 100644
GIT binary patch
delta 1244
zcmYMyZ%ETY7{Kvc&8)S|e^FuBsUwM0YH6vIFBGCbic~}eiI{EquPwF}3BfACG?D@h
zrHB+V#6%@Yi=?80>YWi-R20!RmoKCj`NqKdK6sG)_WRsDcfY&m9&bG3l_U5y(RxGi
zSHf={zuZOAQ>xVZ-vczu=r6}^T!sU<9!GI0PU0&3hA}v6{A08bJWV_nlkglSDiu^$
z7aHmg<}vU9b1;gVaP<<U)?x|Tu>vK5I!wTT={Msx`qwcIU!x5tQ4;)a`qL=u&SE0_
ztF+jKjB_!WfkNDl<rt5bkw<m$B4gE!D{%x@;7b#KhmvT>#OF~Gw6i;BQK=~FJ5UlV
zz<BmoyJ;-OqY}UhloEMR7Py3R@(z@FJt*^f&G;zF{5L2GeL+cZ8YQ7Qlns+9o2-|C
z{8v;S2Di{Cq*06wsBs8MUQOUW{D?*9pq`~zjT1PGNAMySLlXRCoI<$^zmX~{8-rp3
z5>ji74m<Uiz-9tBaR>6K54_k@g-}X9gPCaIcp5jNT)w@Sf^{h0HKTmjZu+;4{pcY+
zX8Ic_hpf9bj`~Zcy9h`k$Iyv2C=1>~DS01Ci3e~eK1VsxyfKD)%Q|+H(x)4pDD#Rj
z9rvIl*nqPB*`S%wWCB+(m4Qx_ghtKy3zQGvB9D5{OBVQH;=fQfnlo_=7evP6P)?eH
zvThE_9Vj#L{gpI$l+W0Na^enjV;5%QUrfVnzRtpO%*XS_hj@to%t(Rtb4*cnl_xWx
z-L;+*`lPR_vGTarThGhy&(f!=>RsA@#^=&*r>^zuK#fb+cmwsWM(y_cw9FhyvK@@g
zkF-7wJ!%WL49j=nmd<ETUzUyzjZO6oMhEYPpWTnNjs5HxbUVY>hC)wzBdzV>@e85H
K_u5?vhyMXZ)u15&

delta 1108
zcmYMyPe@cz6vy#Hj!tP~Gvl-n%QO|qG{`K45-|!K(iVb|{Sl%tSJ59Rh+tZ{5L{%`
zKtv!Jx^YoBP=ZPpAq7H4MKOUP<;GBu7D7h!{ow(JH}7-rdH0=n?s@M`>3B(EHX2A8
zzr*~u@vq#Vnc1Phx~&ZBnde|1Zo)^n1BY-UPT^L3kC`~{{&JV`GVvA6!!8y@%@THN
zZD4nBKNkjY4}Qhn7|b%u$9=dNTTlg@!U$gQ`E@+N{5Iy|3(UqTRDmCSo<`-J$0*OY
zNN}y<QjBq-0&B4W!*~NZtcMd7TOV%0Cm6z%$6uie{p9f_RDpkyy;v?)D1Qu9;4TdF
ze5+%SfpG<}1=XSsRD!Fhop+<w-9@cS`t>2y`cYIt)2IT|sDc(y4-C*Y<;z3ff|X%n
zFM|pOdjDsz2>X$uZ4!^+TWrP{{hYybcoM7mAXHed`vCO~3?kjNG50lc*gN;LJC{TM
zA97)lfD-j^;#rnNwYne6aRiGnjr!<Tu>cF$E<>wD-FL+2$KBI-iFlXKzo7E|L>0Oc
zqW`KaM1QI=AC<5f)#`RsYtLdmUP0~bsrww2Xad#pkM0k@{u_4^|AQ)UJByUR9F?ag
z;emr#NT3N-&_!Qx4Rzy9<gji|N^sxfk5P$+JwD>TMD27MmG?X9-T(7=m=8$bP-BS?
pYEU~qik%q8Dtv~;IE$62EOk(YZP=NL2fk&d&S$p<?=3}6{0DF3Wj6o-

diff --git a/i18n/zh_CN/LC_MESSAGES/ok.po b/i18n/zh_CN/LC_MESSAGES/ok.po
index 83076dd..f4de382 100644
--- a/i18n/zh_CN/LC_MESSAGES/ok.po
+++ b/i18n/zh_CN/LC_MESSAGES/ok.po
@@ -206,3 +206,6 @@ msgstr "开启避免挂任务的时候被月卡中断"
 
 msgid "Turn on to enable auto pick echo"
 msgstr "打开以启用自动拾取声骸"
+
+msgid "can't find gray_book_boss, make sure f2 is the hotkey for book"
+msgstr "找不到boss列表, 请确认快捷键f2可以打开书"
\ No newline at end of file
diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py
index ef555c3..a0b7eef 100644
--- a/src/task/BaseWWTask.py
+++ b/src/task/BaseWWTask.py
@@ -126,17 +126,17 @@ def in_team_and_world(self):
 
     def handle_monthly_card(self):
         monthly_card = self.find_one('monthly_card', threshold=0.8)
+        self.screenshot('monthly_card1')
         if monthly_card is not None:
             self.screenshot('monthly_card1')
-            self.click(monthly_card)
-            self.sleep(3)
+            self.click_relative(0.50, 0.89)
+            self.sleep(2)
             self.screenshot('monthly_card2')
-            self.click(monthly_card)
+            self.click_relative(0.50, 0.89)
             self.sleep(2)
+            self.wait_until(self.in_team_and_world, time_out=10, post_action=lambda: self.click_relative(0.50, 0.89),
+                            wait_until_before_delay=1)
             self.screenshot('monthly_card3')
-            self.click(monthly_card)
-            self.sleep(2)
-            self.screenshot('monthly_card4')
             self.set_check_monthly_card(next_day=True)
         logger.debug(f'check_monthly_card {monthly_card}')
         return monthly_card is not None
diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py
index c06f867..d6106cf 100644
--- a/src/task/FarmWorldBossTask.py
+++ b/src/task/FarmWorldBossTask.py
@@ -47,8 +47,8 @@ def teleport_to_boss(self, boss_name):
         self.send_key('f2')
         gray_book_boss = self.wait_book()
         if not gray_book_boss:
-            self.log_error("can't find the gray_book_boss", notify=True)
-            raise Exception("can't find gray_book_boss")
+            self.log_error("can't find gray_book_boss, make sure f2 is the hotkey for book", notify=True)
+            raise Exception("can't find gray_book_boss, make sure f2 is the hotkey for book")
 
         self.log_info(f'click {gray_book_boss}')
         self.click_box(gray_book_boss)