Merge branch 'master' of http://192.168.50.108:37829/pcacc/yys_auto

dongri_task.py

@@ -453,10 +453,7 @@ class task_fightMonster(dongri_task):
                 return False
             
         maxLineNum = 6
-        if self.isSimple:
-            maxLineNum = 4
-        else:
-            maxLineNum = 6
+
         if basic_operate.get_line_num() >= maxLineNum:
             return False
 
@@ -542,16 +539,11 @@ class task_collect(dongri_task):
         basic_operate.go_outside()
 
         maxLineNum = 6
-        if self.isSimple:
-            if self.isAddStrenghth  or g_task_lineCheck:
-                maxLineNum = 3
-            else:
-                maxLineNum = 4
+
+        if self.isAddStrenghth  or g_task_lineCheck:
+            maxLineNum = 5
         else:
-            if self.isAddStrenghth  or g_task_lineCheck:
-                maxLineNum = 5
-            else:
-                maxLineNum = 6
+            maxLineNum = 6
 
         if basic_operate.get_line_num() >= maxLineNum:
             return False