!2 add union treasure

app_dongri.py

@@ -290,8 +290,8 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             if isSuccess:
                 set_fight_big_monster_times(config, fight_big_monster_times + 1)
                 write_Dailycfg(config)
-        
-        if is_within_n_minutes(get_todo_time("巨熊行动"), 10, 40):
+        '''
+        if is_within_n_minutes(get_todo_time("巨熊行动"), 15, 30):
             if len(task_queue) < 5:
                 task_queue.appendleft(task_returnAllLine())
                 task_queue.appendleft(task_paticipateInTeam())
@@ -307,7 +307,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
             update_rungame_type(0)
             send_status(f'巨熊行动:在60min内,切换到无尽模式')
             g_times = 2
-        
+        '''
         task_queue.appendleft(task_cure(True, g_cureNum))
         # special activity
         if activity == 'lianmeng':
@@ -389,12 +389,12 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         if g_switch:
             restart_times = 4
         if g_times == restart_times:
-            handle_end_game()
             if always:
                 myTimeSleep(random.randint(350, 400), send_status)
             else:
+                handle_end_game()
                 myTimeSleep(random.randint(1000, 2000), send_status)
-            handle_restart_game()
+                handle_restart_game()
         else:
             if isAddStrengh:
                 myTimeSleep(random.randint(350, 400), send_status)

dongri_pic.py

@@ -198,6 +198,15 @@ class check_img:
     pannel_research = R'dongri_img\check\pannel_research.png'
     research_speedup = R'dongri_img\check\research_speedup.png'
 
+    # 获取联盟宝藏
+    union_treasure = R'dongri_img\check\union_treasure.png'
+    union_get = R'dongri_img\check\union_get.png'
+    union_bigget = R'dongri_img\check\union_bigget.png'
+    union_gift = R'dongri_img\check\union_gift.png'
+    union_gain = R'dongri_img\check\union_gain.png'
+    union_bigtreasure = R'dongri_img\check\union_bigtreasure.png'
+
+
 
 
 

dongri_task.py

@@ -791,6 +791,25 @@ class task_checkDonata(dongri_task):
             while waitClickImg_withBool([check_img.donate, check_img.donate2], 1, 0) and maxTryTimes > 0:
                 maxTryTimes -= 1
         return True
+    
+class task_checkUnionTreasure(dongri_task):
+    def __init__(self):
+        super().__init__(f"检查联盟宝藏")
+    def run(self):
+        basic_operate.go_town()
+        if waitClickImg_noWait_withBool(check_img.union, 2, 1) == False:
+            return False
+        if waitClickImg_noWait_withBool(check_img.union_treasure, 2, 1) == False:
+            return False
+        waitClickImg_noWait_withBool(check_img.union_gift, 2, 1)
+        while waitClickImg_noWait_withBool((check_img.union_get), 2, 0) == True:
+            continue
+        waitClickImg_noWait_withBool(check_img.union_gain, 2, 1)
+        while waitClickImg_noWait_withBool((check_img.union_get), 2, 0) == True:
+            continue
+
+        waitClickImg_noWait_withBool(check_img.union_bigtreasure, 2, 1)
+        return True
 
 class task_checkAdventure(dongri_task):
     def __init__(self):
@@ -990,6 +1009,7 @@ class task_returnAllLine(dongri_task):
     def __init__(self):
         super().__init__(f"返回所有路线")
     def run(self):
+        basic_operate.go_town()
         basic_operate.go_outside()
         maxTryTimes = 6
         while maxTryTimes > 0:
@@ -1453,7 +1473,7 @@ class check_safe_collect(dongri_task):
 
 if __name__ == '__main__':
     print(get_todo_time("巨熊行动"))
-    task_check_Research().run()
+    task_checkUnionTreasure().run()
     #save_game_screen()
     #basic_operate.get_line_num()
     #task_cure(True, 85).run()