!2 conflict auto stop

dongri_pic.py

@@ -116,6 +116,8 @@ class check_img:
     conflits = R'dongri_img\check\conflits.png'
     paticipate = R'dongri_img\check\paticipate.png'
     auto_confilit = R'dongri_img\check\auto_confilit.png'
+    conflict_50 = R'dongri_img\check\conflict_50.png'
+    conflict_stop = R'dongri_img\check\conflict_stop.png'
     union = R'dongri_img\check\union.png'
     union_technology = R'dongri_img\check\union_technology.png'
     technology_better = R'dongri_img\check\technology_better.png'

dongri_task.py

@@ -774,6 +774,12 @@ class task_checkConfilits(dongri_task):
             return False
         if waitClickImg_noWait_withBool(check_img.paticipate, 2, 1) == False:
             return False
+        
+        if waitFindImg_withBool(check_img.conflict_50, 2, 1) == True:
+            waitClickImg_noWait_withBool(check_img.conflict_stop, 2, 1)
+            return True
+
+
         if waitClickImg_noWait_withBool(check_img.auto_confilit, 2, 1) == False:
             return False
         return True