瀏覽代碼

!2 modify get more information

pcacc 4 周之前
父節點
當前提交
0f466ffa74
共有 4 個文件被更改,包括 6 次插入9 次删除
  1. 4 8
      app_dongri.py
  2. 二進制
      dongri_img/information/get_more_information.png
  3. 1 0
      dongri_pic.py
  4. 1 1
      dongri_task.py

+ 4 - 8
app_dongri.py

@@ -36,7 +36,7 @@ class GlobalState:
     g_switch = False
     g_isRestart = True
     last_change_time = time.time()
-    g_firstRunBear = True
+    g_firstRunBear = 10
     frp_process: Optional[subprocess.Popen[Any]] = None 
 
 def startup_frpc():
@@ -320,16 +320,12 @@ def add_auto_task(isMaxCollect, isJina, isSimple = False, isAddStrengh = False,
         print(f"----第{GlobalState.g_times}次循环-----")
         if isSimple == False and is_within_n_minutes(get_todo_time("巨熊行动"), 30, 35):
             print("in fight bear")
+            GlobalState.g_times += 1
             if len(GlobalState.task_queue) < 5:
-                if GlobalState.g_firstRunBear:
-                    GlobalState.g_firstRunBear = False
+                while GlobalState.g_firstRunBear > 0:
+                    GlobalState.g_firstRunBear -= 1
                     GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
                     GlobalState.task_queue.appendleft(task_returnAllLine())
-                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
-                    GlobalState.task_queue.appendleft(task_returnAllLine())
-                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
-                    GlobalState.task_queue.appendleft(task_returnAllLine())
-                    GlobalState.task_queue.appendleft(task_useAnnimalSkill(True))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))
                 GlobalState.task_queue.appendleft(task_paticipateInTeam(not GlobalState.g_switch))

二進制
dongri_img/information/get_more_information.png


+ 1 - 0
dongri_pic.py

@@ -284,6 +284,7 @@ class information_img:
     hero_fight = R'dongri_img\information\hero_fight.png'
     add_strength = R'dongri_img\information\add_strength.png'
     information_suc = R'dongri_img\information\information_suc.png'
+    get_more_information = R'dongri_img\information\get_more_information.png'
 
 
 class special_activity_img:

+ 1 - 1
dongri_task.py

@@ -1006,7 +1006,7 @@ class task_information(dongri_task):
 
         hero_arr = [information_img.hero0, information_img.hero1, information_img.hero2, information_img.hero3, information_img.hero4]
         camp_arr = [information_img.camp1, information_img.camp2, information_img.camp3, information_img.camp4]
-        wolf_arr = [information_img.wolf0, information_img.wolf1, information_img.wolf2, information_img.wolf3, information_img.wolf4, information_img.huojing1, information_img.wolf5, information_img.wolf6, information_img.wolf7]
+        wolf_arr = [information_img.wolf0, information_img.wolf1, information_img.wolf2, information_img.wolf3, information_img.wolf4, information_img.huojing1, information_img.wolf5, information_img.wolf6, information_img.wolf7, information_img.get_more_information]
         total_arr = hero_arr + camp_arr + wolf_arr
         
         if waitFindImg_withBool(total_arr, 2, 1) == False: