!2 add upgrade dpme4

dongri_pic.py

@@ -73,6 +73,7 @@ class check_img:
     upgrade_done = R'dongri_img\check\upgrade_done.png'
     upgrade_done2 = R'dongri_img\check\upgrade_done2.png'
     upgrade_done3 = R'dongri_img\check\upgrade_done3.png'
+    upgrade_done4 = R'dongri_img\check\upgrade_done4.png'
     upgrade_next = R'dongri_img\check\upgrade_next.png'
     research_type1 = R'dongri_img\check\research_type1.png'
     research_type2 = R'dongri_img\check\research_type2.png'

dongri_task.py

@@ -420,7 +420,7 @@ class check_buildOrResearch(dongri_task):
         
         dstType = 'none'
         while True:
-            if waitFindImg_withBool([check_img.upgrade_done, check_img.upgrade_done2, check_img.upgrade_done3, check_img.upgrade_next], 2, 1):
+            if waitFindImg_withBool([check_img.upgrade_done, check_img.upgrade_done2, check_img.upgrade_done3, check_img.upgrade_next, check_img.upgrade_done4], 2, 1):
                 dstType = 'build'
                 break
             handRet, handPos = waitFindImg(check_img.hand, 2, 1)
@@ -453,7 +453,7 @@ class check_buildOrResearch(dongri_task):
             return False
         elif dstType == 'build':
             buildtimes = 4
-            while basic_operate.enter_auto_supply_resource([check_img.upgrade_done, check_img.upgrade_done2, check_img.upgrade_done3, check_img.upgrade_next]):
+            while basic_operate.enter_auto_supply_resource([check_img.upgrade_done, check_img.upgrade_done2, check_img.upgrade_done3, check_img.upgrade_next, check_img.upgrade_done4]):
                 buildtimes -= 1
                 if buildtimes == 0:
                     break       
@@ -567,7 +567,7 @@ if __name__ == '__main__':
     #task_fightMonster(False, True).run()
     #task_checkHelp().run()
     #task_checkStoreRoom().run()
-    #task_collect().run()
+    task_collect(0, True).run()
     #task_train().run()
     #task_information().run()
     #check_buildOrResearch().run()
@@ -578,4 +578,4 @@ if __name__ == '__main__':
     #task_collect(4).run()
     #task_returnAllLine().run()
     #task_paticipateInTeam().run()
-    task_train(True).run()
+    #task_train(True).run()