Merge branch 'master' of http://1.94.225.168:6602/pcacc/yys_auto

dongri_pic.py

@@ -50,9 +50,7 @@ class monster_img:
     average_select = R'dongri_img\monster\average_select.png'
     attack = R'dongri_img\monster\attack.png'
     attack2 = R'dongri_img\monster\attack2.png'
-    enough_strengh = R'dongri_img\monster\enough_strengh.png'
-    enough_strengh2 = R'dongri_img\monster\enough_strengh2.png'
-    enough_strengh3 = R'dongri_img\monster\enough_strengh3.png'
+    enough_strengh = R'dongri_img\monster\enough_strengh3.png'
     returnLine = R'dongri_img\monster\returnLine.png'
     enter = R'dongri_img\monster\enter.png'
     participate = R'dongri_img\monster\participate.png'

dongri_task.py

@@ -299,7 +299,7 @@ class task_fight_yongbing(dongri_task):
     def run(self):
         basic_operate.go_outside()
 
-        if False == waitFindImg_withBool(monster_img.enough_strengh2, 2, 1):
+        if False == waitFindImg_withBool(monster_img.enough_strengh, 2, 1):
             if self.add_strengh:
                 basic_operate.add_strength()
                 basic_operate.go_outside()
@@ -501,7 +501,7 @@ class task_fightMonster(dongri_task):
 
         basic_operate.go_outside()
 
-        if False == waitFindImg_withBool((monster_img.enough_strengh2, monster_img.enough_strengh3), 2, 1):
+        if False == waitFindImg_withBool(monster_img.enough_strengh, 2, 1):
             if self.add_strengh:
                 basic_operate.add_strength()
                 basic_operate.go_outside()
@@ -987,15 +987,6 @@ class task_information(dongri_task):
         self.isAddStrengh = isAddStrengh
     def run(self):
         basic_operate.go_outside()
-        '''
-        if False == waitFindImg_withBool((monster_img.enough_strengh, monster_img.enough_strengh3), 2, 1):
-            if self.isAddStrengh:
-                basic_operate.add_strength()
-                basic_operate.go_outside()
-            else:
-                print("没有足够的体力了")
-                return False
-        '''
 
         if waitClickImg_noWait_withBool(information_img.information, 1, 1) == False:
             return False
@@ -1756,7 +1747,7 @@ if __name__ == '__main__':
     #yys_ocrAuto(check_img.line_orc)
     #basic_operate.go_town()
     #basic_operate.add_strength()
-    #task_fightMonster(False, True,False).run()
+    task_fightMonster(False, True,False).run()
     #task_checkHelp().run()
     #task_checkStoreRoom().run()
     #task_start_game(1)