!2 add with_cv function

dongri_task.py

@@ -1173,7 +1173,7 @@ if __name__ == '__main__':
     #task_fightMonster(False, False,False).run()
     #task_checkHelp().run()
     #task_checkStoreRoom().run()
-    #task_activity_lianmeng().run()
+    task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()
     #task_train("upgrade").run()
@@ -1185,5 +1185,5 @@ 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()

scriptBase/comon.py

@@ -46,13 +46,13 @@ def binarize_image(image):
     return threshold
 
 
-def waitFindImg(imgPath, waitTime, preWaitTime):
+def waitFindImg(imgPath, waitTime, preWaitTime, isCV=False):
     if preWaitTime > 0:
         myTimeSleep(preWaitTime)
     #sleep 0.2s per times
     curTime = 0
     while waitTime == -1 or curTime < waitTime:
-        ret, pos_cur = pcacc_img.find_imgs(imgPath)
+        ret, pos_cur = pcacc_img.find_imgs(imgPath, isCV)
         if ret:
             return ret, pos_cur
         else:
@@ -61,35 +61,18 @@ def waitFindImg(imgPath, waitTime, preWaitTime):
     
     return False, None
 
-def waitFindImg_withBool(imgPath, waitTime, preWaitTime):
-    ret, pos = waitFindImg(imgPath, waitTime, preWaitTime)
+def waitFindImg_withBool(imgPath, waitTime, preWaitTime, isCV=False):
+    ret, pos = waitFindImg(imgPath, waitTime, preWaitTime, isCV)
     return ret
 
-def waitFindImgPosition(imgPath, waitTime, preWaitTime):
-    if preWaitTime > 0:
-        myTimeSleep(preWaitTime)
-    #sleep 0.2s per times
-    curTime = 0
-    while waitTime == -1 or curTime < waitTime:
-        ret, pos_cur = pcacc_img.find_img_position(imgPath)
-        if ret:
-            return ret, pos_cur
-        else:
-            myTimeSleep(0.2)
-            curTime = curTime + 0.2
-    return False, None
-
-def waitFindImgPosition_withBool(imgPath, waitTime, preWaitTime):
-    ret, pos = waitFindImgPosition(imgPath, waitTime, preWaitTime)
-    return ret
 
-def waitClickImg_noWait(imgPath, waitTime, preWaitTime):
+def waitClickImg_noWait(imgPath, waitTime, preWaitTime, isCV=False):
     if preWaitTime > 0:
         myTimeSleep(preWaitTime)
     #sleep 0.2s per times
     curTime = 0
     while waitTime == -1 or curTime < waitTime:
-        ret, pos_cur = pcacc_img.find_imgs(imgPath)
+        ret, pos_cur = pcacc_img.find_imgs(imgPath, isCV)
         if ret:
             pcacc_mouse.click(pos_cur[0], pos_cur[1])
             myTimeSleep(0.5)
@@ -99,8 +82,8 @@ def waitClickImg_noWait(imgPath, waitTime, preWaitTime):
             curTime = curTime + 0.2
     return False, (-1, -1)
 
-def waitClickImg_noWait_withBool(imgPath, waitTime, preWaitTime):
-    ret, pos = waitClickImg_noWait(imgPath, waitTime, preWaitTime)
+def waitClickImg_noWait_withBool(imgPath, waitTime, preWaitTime, isCV=False):
+    ret, pos = waitClickImg_noWait(imgPath, waitTime, preWaitTime, isCV)
     return ret
 
 
@@ -130,34 +113,34 @@ def waitclickMultiImg(imgArr, waitTime, preWaitTime):
     return False, (-1, -1)
 
 
-def waitClickImg(imgPath, waitTime, preWaitTime):
+def waitClickImg(imgPath, waitTime, preWaitTime, isCV=False):
     if preWaitTime > 0:
         myTimeSleep(preWaitTime)
     #sleep 0.2s per times
     curTime = 0
     while waitTime == -1 or curTime < waitTime:
-        ret, pos_cur = pcacc_img.find_imgs(imgPath)
+        ret, pos_cur = pcacc_img.find_imgs(imgPath, isCV)
         if ret:
             pcacc_mouse.move_mouse(pos_cur[0], pos_cur[1])
-            ret, pos_cur2 = pcacc_img.find_imgs(imgPath)
+            ret, pos_cur2 = pcacc_img.find_imgs(imgPath, isCV)
             if ret:
                 pcacc_mouse.click(pos_cur2[0], pos_cur2[1])
             else:
                 pcacc_mouse.click(pos_cur[0], pos_cur[1])
             myTimeSleep(0.5)
-            ret, pos_cur = pcacc_img.find_imgs(imgPath)
+            ret, pos_cur = pcacc_img.find_imgs(imgPath, isCV)
             if ret == False:
                 return True, pos_cur
             
             pcacc_mouse.move_mouse(pos_cur[0], pos_cur[1])
-            ret, pos_cur2 = pcacc_img.find_imgs(imgPath)
+            ret, pos_cur2 = pcacc_img.find_imgs(imgPath, isCV)
             if ret:
                 pcacc_mouse.click(pos_cur2[0], pos_cur2[1])
             else:
                 pcacc_mouse.click(pos_cur[0], pos_cur[1])
 
             myTimeSleep(0.5)
-            ret, pos_cur = pcacc_img.find_imgs(imgPath)
+            ret, pos_cur = pcacc_img.find_imgs(imgPath, isCV)
             if ret == False:
                 return True, pos_cur
             else:
@@ -167,8 +150,8 @@ def waitClickImg(imgPath, waitTime, preWaitTime):
             curTime = curTime + 0.2
     return False, (-1, -1)
 
-def waitClickImg_withBool(imgPath, waitTime, preWaitTime):
-    ret, pos = waitClickImg(imgPath, waitTime, preWaitTime)
+def waitClickImg_withBool(imgPath, waitTime, preWaitTime, isCV=False):
+    ret, pos = waitClickImg(imgPath, waitTime, preWaitTime, isCV)
     return ret
 
 def myTimeSleep(curTime , FunStatus=None):

scriptBase/imgFind.py

@@ -214,6 +214,14 @@ class pcacc_img:
 
     @staticmethod
     def find_imgArr(imgArr):
+        for cur_img in imgArr:
+            ret, pos = pcacc_img.find_img(cur_img)
+            if ret:
+                return ret, pos
+        return False, None
+    
+    @staticmethod
+    def find_imgArr_cv(imgArr):
         for cur_img in imgArr:
             ret, pos = pcacc_img.find_img_cv(cur_img)
             if ret:
@@ -221,11 +229,23 @@ class pcacc_img:
         return False, None
 
     @staticmethod
-    def find_imgs(images):
+    def find_imgs(images, is_cv=False):
+        if is_cv:
+            return pcacc_img.find_imgs_cv(images)
+        else:
+            if isinstance(images, str):
+                return pcacc_img.find_img(images)
+            elif isinstance(images, (list, tuple)):
+                return pcacc_img.find_imgArr(images)
+            else:
+                raise ValueError("Invalid input type for 'images' parameter.")
+        
+    @staticmethod
+    def find_imgs_cv(images):
         if isinstance(images, str):
             return pcacc_img.find_img_cv(images)
         elif isinstance(images, (list, tuple)):
-            return pcacc_img.find_imgArr(images)
+            return pcacc_img.find_imgArr_cv(images)
         else:
             raise ValueError("Invalid input type for 'images' parameter.")