change pr fight order

tkkcc · Aug 15, 2022 · c81260e · c81260e
1 parent c79c782
commit c81260e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/cloud.lua b/cloud.lua
@@ -104,7 +104,7 @@ m.fetchSolveTask = function()
     -- log("res", res)
     local status, data
     status, data = pcall(JsonDecode, res)
-    log("data",data)
+    log("data", data)
     if type(data) == 'table' and type(data.data) == 'table' then
       m.solveTask(data.data)
     end
@@ -118,7 +118,8 @@ m.startHeartBeat = function()
   if not m.enabled() then return end
   local f = function()
     while true do
-      m.heartBeat()
+      local res, code = m.heartBeat()
+      if code == 500 then stop('心跳500') end
       ssleep(5)
     end
   end

diff --git a/dlt.py b/dlt.py
@@ -42,7 +42,7 @@
     "10": "103.36.200.150:301",
     "5": "103.36.203.105:301",
 }
-daily_device = ["4", "5", "9"]
+daily_device = ['4',"5", "9"]
 rg_device = ["1", "2", "0"]
 oppid = "com.hypergryph.arknights"
 bppid = "com.hypergryph.arknights.bilibili"

diff --git a/docs/guide.md b/docs/guide.md
@@ -228,7 +228,8 @@ hd => hd-10*99 hd-9*99 ... 蓝材料及以上关卡
 hd1 => hd-10 hd-9 ... hd-1 break 普通活动关各1次
 ce => ce-6*99 ce-5*99 ...
 ls/ap/sk/ca 同 ce
-pr => pr-b-2*99 pr-a-2*99 pr-c-2*99 pr-d-2*99 pr-b-1*99 pr-a-1*99 pr-c-1*99 pr-d-1*99
+pr => pr-b-2 pr-a-2 pr-c-2 pr-d-2 pr-b-2 ... pr-b-1 pr-a-1 pr-c-1 pr-d-1 pr-b-1 ...
+
 ```
 简写后不可再接次数。jm应与`最大剿灭次数`联用。
 :::

diff --git a/main.lua b/main.lua
@@ -50,7 +50,7 @@ default_findcolor_confidence = 95 / 100
 -- 设成1000//30时，真机同时开着B服与官服时会出现点着点着脚本就停（从基建开始做邮件）
 frame_milesecond = 1000 // 30
 milesecond_after_click = frame_milesecond
-release_date = "08.13 15:37"
+release_date = "08.15 17:16"
 ui_submit_color = "#ff0d47a1"
 ui_cancel_color = "#ff1976d2"
 ui_warn_color = "#ff33ccff"

diff --git a/path.lua b/path.lua
@@ -2831,7 +2831,9 @@ path.开始游戏 = function(x, disable_ptrs_check)
       tap("开始行动红按钮")
     end, 10) then return end
     if not wait(function()
-      if findAny({"接管作战", "单选确认框"}) then return true end
+      if findAny({"接管作战", "单选确认框", "剿灭接管作战"}) then
+        return true
+      end
     end, 60) then
 
       -- if findOne("跳过剧情2") and not disappear("跳过剧情2", 10) then

diff --git a/release b/release
diff --git a/util.lua b/util.lua
@@ -3622,7 +3622,7 @@ predebug_hook = function()
   swipu_flipy = 0
   swipu_flipx = 0
 
-  yg3= "ff303030"
+  yg3 = "ff303030"
   log(colorDiff(yg3, "ff003030"))
   -- path.跳过剧情()
   exit()
@@ -4538,7 +4538,8 @@ parse_fight_config = function(fight_ui)
       v = extrajianpin2name[v]
     end
     if table.find({
-      '活动', "DH", "GA", "TC", "IC", "DV", "WR", "IW", "WD", "SN", "SV", "LE",
+      '活动', "DH", "GA", "TC", "IC", "DV", "WR", "IW", "WD", "SN", "SV",
+      "LE",
     }, startsWithX(v)) then
       local idx = v:gsub(".-(%d+)$", '%1')
       v = "HD-" .. (idx or '')
@@ -4551,14 +4552,12 @@ parse_fight_config = function(fight_ui)
         for _ = 1, 99 do table.insert(expand_fight, v .. '-' .. i) end
       end
     elseif table.includes({'PR'}, v) then
-      for _ = 1, 99 do table.insert(expand_fight, "PR-B-2") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-A-2") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-C-2") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-D-2") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-B-1") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-A-1") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-C-1") end
-      for _ = 1, 99 do table.insert(expand_fight, "PR-D-1") end
+      for _ = 1, 99 do
+        table.extend(expand_fight, {"PR-B-2", "PR-A-2", "PR-C-2", "PR-D-2"})
+      end
+      for _ = 1, 99 do
+        table.extend(expand_fight, {"PR-B-1", "PR-A-1", "PR-C-1", "PR-D-1"})
+      end
     elseif table.includes({'WT', 'JM'}, v) then
       for _ = 1, 99 do table.insert(expand_fight, '当期委托') end
       for _ = 1, 99 do table.insert(expand_fight, '长期委托1') end