Эх сурвалжийг харах

Merge remote-tracking branch 'origin/dev' into dev

ryland 10 сар өмнө
parent
commit
6ec4766a34

+ 12 - 1
tasks/ActivityShikigami/script_task.py

@@ -341,9 +341,20 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             # 战斗成功
             if self.appear_then_click(self.I_WIN, interval=2):
                 continue
+            #  出现 “魂” 和 紫蛇皮
             if self.appear(self.I_REWARD):
                 logger.info('Win battle')
-                self.ui_click_until_disappear(self.I_REWARD, interval=1.5)
+                while 1:
+                    self.screenshot()
+                    appear_reward = self.appear_then_click(self.I_REWARD)
+                    appear_reward_purple_snake_skin = self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN)
+                    if not appear_reward and not appear_reward_purple_snake_skin:
+                        break
+                    if appear_reward or appear_reward_purple_snake_skin:
+                        reward_click = random.choice(
+                            [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP])
+                        self.click(reward_click, interval=1.8)
+                        continue
                 return True
             # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
             # if ok_cnt > 0 and not self.is_in_battle(False):

+ 3 - 3
tasks/Exploration/base.py

@@ -327,9 +327,9 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         # 设置下次执行行时间
         logger.info("RealmRaid and Exploration  set_next_run !")
         next_run = datetime.now() + con_scrolls.scrolls_cd
-        self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
-        self.set_next_run(task='RealmRaid', success=False, finish=False, target=datetime.now())
-        self.set_next_run(task='MemoryScrolls', success=False, finish=False, target=datetime.now())
+        self.set_next_run(task='Exploration', success=None, finish=False, target=next_run)
+        self.set_next_run(task='RealmRaid', success=None, finish=False, target=datetime.now())
+        self.set_next_run(task='MemoryScrolls', success=None, finish=False, target=datetime.now())
         raise TaskEnd
 
     #

+ 1 - 1
tasks/WantedQuests/script_task.py

@@ -724,7 +724,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
                     total = total % 10
                 if cu > total:
                     logger.warning('Current number of wanted quests is greater than total number')
-                    cu = cu % 10
+                    cu = cu // 10
                 if cu == total:
                     # 该任务已完成,一般是悬赏任务,邀请人没有做导致的
                     continue