!2 add train upgrade function

dongri_pic.py

@@ -61,12 +61,15 @@ class train_img:
     gong = R'dongri_img\train\gong.png'
     train = R'dongri_img\train\train.png'
     begin_train = R'dongri_img\train\begin_train.png'
+    begin_train2 = R'dongri_img\train\begin_train2.png'
     getAll = R'dongri_img\train\getAll.png'
     enter = R'dongri_img\train\enter.png'
     soilder_lv1 = R'dongri_img\train\soilder_lv1.png'
     soilder_lv8 = R'dongri_img\train\soilder_lv8.png'
     soilder_lv9 = R'dongri_img\train\soilder_lv9.png'
     move_left = (117,516,458,525)
+    upgrade_small = R'dongri_img\train\upgrade_small.png'
+    upgrade_big = R'dongri_img\train\upgrade_big.png'
 
 class check_img:
     # = R'dongri_img\check\.png'

dongri_task.py

@@ -588,13 +588,22 @@ class task_train(dongri_task):
         if waitClickImg_noWait_withBool(train_img.train_success, 2, 1) == False:
             return False
         tryTimes = 3
+        isSuccess = False
         while tryTimes > 0:
             tryTimes -= 1
             waitClickImg_noWait_withBool([train_img.dun, train_img.gong, train_img.mao], 2, 1)
 
             if waitClickImg_noWait_withBool(train_img.train, 2, 1):
+                isSuccess = True
                 break
         
+        if isSuccess == False:
+            pcacc_mouse.quickclick_current()
+            myTimeSleep_big()
+            pcacc_mouse.quickclick_current()
+            if waitClickImg_noWait_withBool(train_img.train, 2, 1) == False:
+                return False
+        
         
         if self.train_type == 'lv1':
             myTimeSleep_big()
@@ -605,8 +614,11 @@ class task_train(dongri_task):
             waitClickImg_noWait_withBool(train_img.soilder_lv8, 2, 1)
         elif self.train_type == 'lv9':
             waitClickImg_noWait_withBool(train_img.soilder_lv9, 2, 1)
+        elif self.train_type == 'upgrade':
+            waitClickImg_noWait_withBool(train_img.upgrade_small, 2, 1)
+            waitClickImg_noWait_withBool(train_img.upgrade_big, 2, 1)
 
-        return basic_operate.enter_auto_supply_resource(train_img.begin_train)
+        return basic_operate.enter_auto_supply_resource([train_img.begin_train,train_img.begin_train2])
 
 class task_checkHelp(dongri_task):
     def __init__(self, isOutSide = False):
@@ -1098,7 +1110,7 @@ class task_fight_enemy(dongri_task):
 
 
 if __name__ == '__main__':
-    task_fight_enemy().run()
+    #task_fight_enemy().run()
     #task_fight_ranshuang().run()
     #task_gotoTree().run()
     #task_fight_jina_only().run()
@@ -1115,7 +1127,7 @@ if __name__ == '__main__':
     #task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()
-    #task_train("lv9").run()
+    task_train("upgrade").run()
     #task_information().run()
     #check_buildOrResearch().run()
     #task_checkDonata().run()

templates/index_dongri.html

@@ -85,6 +85,7 @@
                     <option value="lv1">优先lv1</option>
                     <option value="lv8">优先lv8</option>
                     <option value="lv9">优先lv9</option>
+                    <option value="upgrade">优先升级</option>
                 </select>
             </label>
             <label><input type="checkbox" id="SimpleCheckbox"> 是否小号</label>