!2 fix collect line num bug

dongri_task.py

@@ -38,7 +38,11 @@ def get_todo_msg():
 
 def get_todo_msgList():
     global todo_list
-    return todo_list
+    todo_str = ''
+
+    for item in todo_list:
+        todo_str += f'{item["item"]}:{item["time"]}</br>'
+    return todo_str
 
 def fing_todoList_time(taskStr):
     for item in todo_list:
@@ -516,9 +520,7 @@ class task_collect(dongri_task):
         if self.type == None:
             return True
         basic_operate.go_outside()
-        if False == basic_operate.click_outside_search():
-            return False
-        
+
         maxLineNum = 6
         if self.isSimple:
             if self.isAddStrenghth:
@@ -533,7 +535,9 @@ class task_collect(dongri_task):
 
         if basic_operate.get_line_num() >= maxLineNum:
             return False
-            
+
+        if False == basic_operate.click_outside_search():
+            return False
         
         if waitFindImg_withBool(monster_img.search, 2, 1):
             myTimeSleep_big()
@@ -625,7 +629,7 @@ class task_checkStoreRoom(dongri_task):
             return False
         myTimeSleep_big()
         if waitFindImg_withBool(check_img.pet_findtreature, 2, 1) == False:
-            myTimeSleep_big()
+            waitClickImg_noWait_withBool(check_img.bigGet, 2, 1)
             pcacc_mouse.quickclick_current()
             myTimeSleep_big()
             if waitClickImg_noWait_withBool((check_img.detail,check_img.detail2), 2, 1):
@@ -1006,7 +1010,7 @@ class task_checkActivities(dongri_task):
 if __name__ == '__main__':
     #task_fight_jina_only().run()
     #task_checkConfilits().run()
-    task_checkActivities().run()
+    #task_checkActivities().run()
     #task_checkMaster().run()
     #basic_operate.get_line_num()
     #yys_ocrAuto(check_img.line_orc)
@@ -1014,7 +1018,7 @@ if __name__ == '__main__':
     #basic_operate.add_strength()
     #task_fightMonster(False, False,False).run()
     #task_checkHelp().run()
-    #task_checkStoreRoom().run()
+    task_checkStoreRoom().run()
     #task_activity_lianmeng().run()
     #task_fight_yongbing(True).run()
     #task_collect([4,3,2,1]).run()