!2 add get fire_crystal

app_dongri.py

@@ -409,6 +409,7 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
                 task_queue.appendleft(task_checkConfilits())
             task_queue.appendleft(task_checkDiamond())
             task_queue.appendleft(task_fight_campion())
+            task_queue.appendleft(task_get_fire_crystal())
             task_queue.appendleft(task_checkUnionTreasure())
             #task_queue.appendleft(task_checkBenifitStatus())
             task_queue.appendleft(task_gotoTree())

dongri_pic.py

@@ -228,6 +228,7 @@ class check_img:
 
 
 
+
 class information_img:
     # = R'dongri_img\information\.png'
     information = R'dongri_img\information\information.png'
@@ -332,6 +333,11 @@ class special_activity_img:
     power_empty = R'dongri_img\special_activity\power_empty.png'
     plus_small = R'dongri_img\special_activity\plus_small.png'
     orc_power2 = (369, 142, 501, 169)
+
+    # 获取火晶
+    spear = R'dongri_img\special_activity\spear.png'
+    build_fire_crystal = R'dongri_img\special_activity\build_fire_crystal.png'
+    fire_crystal_get = R'dongri_img\special_activity\fire_crystal_get.png'
     
 def change_direction(direction):
     if len(direction) == 4:

dongri_task.py

@@ -1035,16 +1035,13 @@ class task_paticipateInTeam(dongri_task):
         basic_operate.go_outside()
         if waitClickImg_noWait_withBool(check_img.conflits, 2, 1) == False:
             return False
-        myTimeSleep_small()
-        yys_dragAuto(check_img.move_down)
-        myTimeSleep_small()
-        yys_dragAuto(check_img.move_down)
-        myTimeSleep_small()
-        yys_dragAuto(check_img.move_down)
-        myTimeSleep_small()
-        set_isDown(True)
+        myTimeSleep_big()
+        dragTimes = random.randint(1, 3)
+        for i in range(dragTimes):
+            yys_dragAuto(check_img.move_down)
+            myTimeSleep_small()
+        
         ret = waitClickImg_noWait_withBool(monster_img.participate, 1, 1, True)
-        set_isDown(False)
         if ret == False:
             return False
         
@@ -1575,6 +1572,26 @@ class task_checkPower(dongri_task):
         print("current count:", count)
         return count
     
+class task_get_fire_crystal(dongri_task):
+    def __init__(self):
+        super().__init__(f"获取火晶")
+    def run(self):
+        basic_operate.go_town()
+        if waitClickImg_noWait_withBool(train_img.quick_panel, 2, 1) == False:
+            return False
+        
+        myTimeSleep_big()
+        if waitClickImg_noWait_withBool(special_activity_img.spear, 2, 1) == False:
+            return False
+        
+        if waitClickImg_noWait_withBool(special_activity_img.build_fire_crystal, 2, 1) == False:
+            return False
+        
+        while waitClickImg_noWait_withBool(special_activity_img.fire_crystal_get, 2, 1, True) == True:
+            continue
+
+        return True
+    
 class task_testFun(dongri_task):
     def __init__(self):
         super().__init__(f"测试功能")
@@ -1588,6 +1605,7 @@ class task_testFun(dongri_task):
 
 if __name__ == '__main__':
     myTimeSleep_big()
+    #task_get_fire_crystal().run()
     #task_checkPower().run()
     #task_testFun().run()
     #task_checkActivities().run()
@@ -1595,7 +1613,7 @@ if __name__ == '__main__':
     #task_check_Research().run()
     #save_game_screen()
     #basic_operate.get_line_num()
-    task_cure(True, 85).run()
+    #task_cure(True, 85).run()
     #task_fight_enemy().run()
     #task_fight_ranshuang().run()
     #task_gotoTree().run()
@@ -1626,7 +1644,7 @@ if __name__ == '__main__':
     #task_collect(3).run()
     #task_collect(4).run()
     #task_returnAllLine().run()
-    #task_paticipateInTeam().run()
+    task_paticipateInTeam().run()
     #task_fight_jina(True).run()
     #task_get_redPackage().run()
     #task_read_mails().run()