!2 fight bears now check power first

dongri_pic.py

@@ -328,6 +328,7 @@ class special_activity_img:
     power0 = R'dongri_img\special_activity\power0.png'
     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)
     
 def change_direction(direction):
     if len(direction) == 4:

dongri_task.py

@@ -1053,7 +1053,7 @@ class task_paticipateInTeam(dongri_task):
         while maxTryTimes > 0:
             maxTryTimes -= 1
             if waitFindImg_withBool(special_activity_img.power0, 1, 0.5) == False:# 实力不为0
-                
+                '''
                 ret1, powerPos = pcacc_img.find_img_origin(special_activity_img.power_empty)
                 ret2, plusPos = pcacc_img.find_img_origin(special_activity_img.plus_small)
                 if ret1 == False or ret2 == False:
@@ -1062,6 +1062,10 @@ class task_paticipateInTeam(dongri_task):
                 
                 if plusPos[0] - powerPos[0] < 74:
                     return False
+                '''
+                powerCount = task_checkPower().run()
+                if powerCount < 4000000:
+                    return False
                 
                 waitClickImg_withBool([monster_img.fight, monster_img.fight2, monster_img.fight3], 1, 0.5)
                 return True
@@ -1562,10 +1566,10 @@ class task_checkPower(dongri_task):
     def __init__(self):
         super().__init__(f"检查实力")
     def run(self):
-        countStr = yys_ocrAuto(special_activity_img.orc_power)
+        countStr = yys_ocrAuto(special_activity_img.orc_power2)
         if len(countStr) == 0:
             count = 0
-            return False
+            return 0
         cleaned_text = countStr[0].replace('.', '')
         cleaned_text = cleaned_text.replace(',', '')
         try:
@@ -1573,7 +1577,7 @@ class task_checkPower(dongri_task):
         except:
             return False
         print("current count:", count)
-        return True
+        return count
     
 class task_testFun(dongri_task):
     def __init__(self):
@@ -1581,6 +1585,8 @@ class task_testFun(dongri_task):
     def run(self):
         ret1, powerPos = pcacc_img.find_img_origin(special_activity_img.power_empty)
         ret2, plusPos = pcacc_img.find_img_origin(special_activity_img.plus_small)
+        print(plusPos[0] - powerPos[0])
+        task_checkPower().run()
         #task_paticipateInTeam().run()
         return True