update tags

main.lua

@@ -43,6 +43,9 @@ end
 if opt.drug_enable:find("1") then
   path.base.源石恢复理智取消 = "药剂恢复理智确认"
 end
+if opt.drug_enable:find("2") then
+  opt.star4_auto = true
+end
 opt.fight = string.split(opt.fight, ',')
 for k, v in pairs(opt.fight) do
   if table.includes(table.keys(jianpin2name), v) then
@@ -72,10 +75,14 @@ update_open_time()
 -- opt.fight[1]="大骑士领郊外"
 
 debug0415 = false
+debug0416 = false
 if debug0415 then
   opt.fight = {
-    -- "1-12","S5-7","LS-1","LS-2","LS-3","LS-4","LS-5","SK-1","SK-2","SK-3","SK-4","SK-5",
-    "CA-1","CA-2","CA-3","CA-4","CA-5",
+    -- "1-12","S5-7",
+    "LS-1", "LS-2", "LS-3", "LS-4", "LS-5", "SK-1", "SK-2", "SK-3", "SK-4",
+    "SK-5", "CA-1", "CA-2", "CA-3", "CA-4", "CA-5", "CE-1", "CE-2", "CE-3",
+    "CE-4", "CE-5", "AP-1", "AP-2", "AP-3", "AP-4", "AP-5", "PR-A-1", "PR-A-2",
+    "PR-B-1", "PR-B-2", "PR-C-1", "PR-C-2", "PR-D-1", "PR-D-2",
     -- 生于黑夜
     -- "DM-1", "DM-2", "DM-3", "DM-4", "DM-5", "DM-6", "DM-7", "DM-8", "TW-8",
     -- "WR-8", "WR-9", "WR-10",
@@ -118,6 +125,11 @@ if debug0415 then
     -- "WD-6", "WD-7", "WD-8",
   }
 end
+if debug0416 then
+  now("公开招募刷新","显示全部")
+  pause()
+  lua_exit()
+end
 
 if opt.now_enable:find("0") then now(opt.now) end
 if #opt.cron > 0 then cron(opt.cron) end

path.lua

@@ -542,6 +542,7 @@ path.邮件 = update(path.base, {
 
 tick = 0
 path.轮次作战 = function()
+  if #opt.fight == 0 then return true end
   while running ~= "理智不足" do
     set("tick", tick)
     tick = tick % #opt.fight + 1
@@ -1089,6 +1090,7 @@ path.公开招募刷新 = function()
   auto(update(path.base, {面板 = "面板公开招募", 公开招募 = true}))
   -- if find("公开招募联络次数0") then return end
   local a, tt, t, flag
+  local total_max_star = 4
   for i = 1, #point.公开招募列表 do
     auto(update(path.base, {面板 = "面板公开招募", 公开招募 = true}))
     auto(update(path.base, {
@@ -1142,24 +1144,26 @@ path.公开招募刷新 = function()
 
         if #t ~= 0 then
           -- 判断保底是否只有4星
-          local min_star = 4
+          local max_star = 4
           for k, v in pairs(t) do
-            tt = table.concat(tagk[v], ',') .. '=>' .. tagv[v]
-            log(tt)
-            if not tagv[v]:find("4") then
-              min_star = 5
-              taglog = taglog .. tt .. '\n'
+            -- tt = table.concat(tagk[v], ',') .. ' ' .. tagl[v] .. '★'
+            if tagl[v] > 4 then
+              max_star = max(max_star, tagl[v])
+              total_max_star = max(total_max_star, tagl[v])
+              taglog = total_max_star .. '★'
+              -- taglog = taglog .. tt .. '\n'
             end
           end
           -- 9小时招募
-          if min_star == 4 then
+          if max_star == 4 and opt.star4_auto then
             tt = tagk[t[1]]
             for k, v in pairs(tt) do
               p = table.find(a, function(x) return x == v end)
               tap("公开招募标签列表" .. p)
             end
-            for i = 1, 8 do tap("公开招募时间加") end
-            tap("公开招募确认")
+            -- for i = 1, 8 do tap("公开招募时间加") end
+            tap("公开招募时间减")
+            if not debug0416 then tap("公开招募确认") end
           end
         else
           if findTap("公开招募标签刷新蓝") then

point.lua

@@ -821,6 +821,7 @@ point = {
   公开招募标签刷新蓝 = "1449|613|0x0098dc,1453|577|0xffffff,1335|839|0x0098dc,1455|863|0xffffff,1467|953|0xffffff,1591|995|0x313131,1896|105|0x313131",
   消耗一次联络机会确认 = {1263, 765},
   公开招募时间加 = {677, 233},
+  公开招募时间减 = {677, 450},
   settings = "57|132|0xffffff,33|124|0x263238,261|64|0x21272b,187|146|0xffffff,170|149|0x263238,162|149|0xffffff,1909|16|0x21272b,1891|184|0x263238",
   settings_Apps = {300, 1000},
   Apps = "68|143|0xffffff,38|111|0x263238,164|51|0x21272b,230|152|0xffffff,301|148|0xffffff,272|147|0xffffff,1524|51|0x21272b,1614|123|0x263238",