diff --git a/main.lua b/main.lua index c658e0a..f76d05f 100644 --- a/main.lua +++ b/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 diff --git a/path.lua b/path.lua index 1f4f1b4..d4d6cc9 100644 --- a/path.lua +++ b/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 diff --git a/point.lua b/point.lua index fee8b58..cf807af 100644 --- a/point.lua +++ b/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", diff --git a/tag.lua b/tag.lua index eb08d27..7184414 100644 --- a/tag.lua +++ b/tag.lua @@ -1,167 +1,228 @@ require("util") -tag = {"新手", "资深干员", "高级资深干员", "远程位", "近战位", - "先锋干员", "狙击干员", "医疗干员", "术师干员", - "近卫干员", "重装干员", "辅助干员", "特种干员", "治疗", - "支援", "输出", "群攻", "减速", "生存", "防护", "削弱", - "位移", "控场", "爆发", "召唤", "快速复活", "费用回复", - "支援机械"} --- tagw = table.concat(tag) +tag = { + "新手", "资深干员", "高级资深干员", "远程位", "近战位", + "先锋干员", "狙击干员", "医疗干员", "术师干员", + "近卫干员", "重装干员", "辅助干员", "特种干员", "治疗", + "支援", "输出", "群攻", "减速", "生存", "防护", "削弱", + "位移", "控场", "爆发", "召唤", "快速复活", "费用回复", + "支援机械", +} tagw = "位先减出击削助医卫发召员唤回场复存师干弱快战手护控援支攻新术机械治活深爆特狙生用疗种移程级群装费资辅输近远速重锋防高" -- https://www.taptap.com/topic/5828806 5月1日 -tag4 = [[ - 支援机械:5星 - 资深干员:5星 - 高级资深干员:6星 - - - 近战位+支援:杜宾(4星)、凛冬(5星)、诗怀雅(5星) - 近战位+减速:霜叶(4星)、食铁兽(5星) - 近战位+控场:德克萨斯(5星)、红(5星) - - - 远程位+生存:杰西卡(4星) - 远程位+支援:白面鸮(5星)、华法琳(5星) - 远程位+控场:梅尔(5星) - - - 输出+防护:雷蛇(5星)、火神(5星) - 输出+重装:雷蛇(5星)、火神(5星) - 输出+辅助:真理(5星) - 输出+特种:狮蝎(5星)、崖心(5星) - 输出+支援:杜宾(4星)、诗怀雅(5星) - 输出+削弱:夜烟(4星)、流星(4星) - 输出+减速:霜叶(4星)、真理(5星) - 输出+位移:崖心(5星) - 输出+治疗:夜魔(5星) - - - 防护+特种:砾(4星) - 防护+位移:可颂(5星) - 防护+输出:雷蛇(5星)、火神(5星) - 防护+生存:火神(5星) - - - 生存+远程:杰西卡(4星) - 生存+狙击:杰西卡(4星) - 生存+特种:狮蝎(5星) - - - 治疗+支援:白面鸮(5星)、华法琳(5星) - 治疗+术师:夜魔(5星) - 治疗+输出:夜魔(5星) - 治疗+减速:夜魔(5星) - - - 支援:杜宾(4星)、白面鸮(5星)、华法琳(5星)、凛冬(5星)、诗怀雅(5星) - 支援+先锋:凛冬(5星) - 支援+费用回复:凛冬(5星) - 支援+近卫:杜宾(4星)、诗怀雅(5星) - 支援+医疗:白面鸮(5星)、华法琳(5星) - 支援+治疗:白面鸮(5星)、华法琳(5星) - 支援+近战:杜宾(4星)、凛冬(5星)、诗怀雅(5星) - 支援+远程:白面鸮(5星)、华法琳(5星) - 支援+输出:杜宾(4星)、诗怀雅(5星) - - - 快速复活:砾(4星)、红(5星) - 快速复活+控场:红(5星) - 快速复活+防护:砾(4星) - - - 群攻+削弱:陨星(5星) - 群攻+减速:白雪(4星)、格雷伊(4星) - - - 召唤:梅尔(5星) - - - 削弱:夜烟(4星)、流星(4星)、初雪(5星)、陨星(5星) - 削弱+狙击:流星(4星)、陨星(5星) - 削弱+术师:夜烟(4星) - 削弱+辅助:初雪(5星) - 削弱+输出:夜烟(4星)、流星(4星) - 削弱+群攻:陨星(5星) - - - 减速+狙击:白雪(4星) - 减速+近卫:霜叶(4星) - 减速+术师:夜魔(5星)、格雷伊(4星) - 减速+特种:食铁兽(5星) - 减速+近战:霜叶(4星)、食铁兽(5星) - 减速+输出:霜叶(4星)、真理(5星) - 减速+群攻:白雪(4星)、格雷伊(4星) - 减速+治疗:夜魔(5星) - 减速+位移:食铁兽(5星) - - - 控场:德克萨斯(5星)、红(5星)、梅尔(5星) - 控场+先锋:德克萨斯(5星) - 控场+费用回复:德克萨斯(5星) - 控场+特种:红(5星) - 控场+辅助:梅尔(5星) - 控场+近战:德克萨斯(5星)、红(5星) - 控场+远程:梅尔(5星) - 控场+快速复活:红(5星) - - - 位移:暗索(4星)、阿消(4星)、崖心(5星)、食铁兽(5星)、可颂(5星) - 位移+重装:可颂(5星) - 位移+特种:暗索(4星)、阿消(4星)、崖心(5星)、食铁兽(5星) - 位移+输出:崖心(5星) - 位移+防护:可颂(5星) - 位移+减速:食铁兽(5星) - - - 爆发:守林人(5星) - - - 狙击+削弱:流星(4星)、陨星(5星) - 狙击+减速:白雪(4星) - 狙击+爆发:守林人(5星) - 狙击+生存:杰西卡(4星) - - - 术师+削弱:夜烟(4星) - 术师+治疗:夜魔(5星) - 术师+减速:夜魔(5星)、格雷伊(4星) - - - 先锋+支援:凛冬(5星) - 先锋+控场:德克萨斯(5星) - 费用回复+支援:凛冬(5星) - 费用回复+控场:德克萨斯(5星) - - - 近卫+减速:霜叶(4星) - 近卫+支援:杜宾(4星)、诗怀雅(5星) - - - 重装+位移:可颂(5星) - 重装+输出:雷蛇(5星)、火神(5星) - 重装+生存:火神(5星) - - - 医疗+支援:白面鸮(5星)、华法琳(5星) - - - 辅助+削弱:初雪(5星) - 辅助+输出:真理(5星) - 辅助+控场:梅尔(5星) - - - 特种:砾(4星)、暗索(4星)、阿消(4星)、红(5星)、狮蝎(5星)、崖心(5星)、食铁兽(5星) - 特种+输出:狮蝎(5星)、崖心(5星) - 特种+防护:砾(4星) - 特种+生存:狮蝎(5星) - 特种+减速:食铁兽(5星) - 特种+控场:红(5星) - 特种+位移:暗索(4星)、阿消(4星)、崖心(5星)、食铁兽(5星) -]] +-- tag4 = [[ +-- 支援机械:5星 +-- 资深干员:5星 +-- 高级资深干员:6星 +-- 近战位+支援:杜宾(4星)、凛冬(5星)、诗怀雅(5星) +-- 近战位+减速:霜叶(4星)、食铁兽(5星) +-- 近战位+控场:德克萨斯(5星)、红(5星) +-- 远程位+生存:杰西卡(4星) +-- 远程位+支援:白面鸮(5星)、华法琳(5星) +-- 远程位+控场:梅尔(5星) +-- 输出+防护:雷蛇(5星)、火神(5星) +-- 输出+重装:雷蛇(5星)、火神(5星) +-- 输出+辅助:真理(5星) +-- 输出+特种:狮蝎(5星)、崖心(5星) +-- 输出+支援:杜宾(4星)、诗怀雅(5星) +-- 输出+削弱:夜烟(4星)、流星(4星) +-- 输出+减速:霜叶(4星)、真理(5星) +-- 输出+位移:崖心(5星) +-- 输出+治疗:夜魔(5星) +-- 防护+特种:砾(4星) +-- 防护+位移:可颂(5星) +-- 防护+输出:雷蛇(5星)、火神(5星) +-- 防护+生存:火神(5星) +-- 生存+远程:杰西卡(4星) +-- 生存+狙击:杰西卡(4星) +-- 生存+特种:狮蝎(5星) +-- 治疗+支援:白面鸮(5星)、华法琳(5星) +-- 治疗+术师:夜魔(5星) +-- 治疗+输出:夜魔(5星) +-- 治疗+减速:夜魔(5星) +-- 支援:杜宾(4星)、白面鸮(5星)、华法琳(5星)、凛冬(5星)、诗怀雅(5星) +-- 支援+先锋:凛冬(5星) +-- 支援+费用回复:凛冬(5星) +-- 支援+近卫:杜宾(4星)、诗怀雅(5星) +-- 支援+医疗:白面鸮(5星)、华法琳(5星) +-- 支援+治疗:白面鸮(5星)、华法琳(5星) +-- 支援+近战:杜宾(4星)、凛冬(5星)、诗怀雅(5星) +-- 支援+远程:白面鸮(5星)、华法琳(5星) +-- 支援+输出:杜宾(4星)、诗怀雅(5星) +-- 快速复活:砾(4星)、红(5星) +-- 快速复活+控场:红(5星) +-- 快速复活+防护:砾(4星) +-- 群攻+削弱:陨星(5星) +-- 群攻+减速:白雪(4星)、格雷伊(4星) +-- 召唤:梅尔(5星) +-- 削弱:夜烟(4星)、流星(4星)、初雪(5星)、陨星(5星) +-- 削弱+狙击:流星(4星)、陨星(5星) +-- 削弱+术师:夜烟(4星) +-- 削弱+辅助:初雪(5星) +-- 削弱+输出:夜烟(4星)、流星(4星) +-- 削弱+群攻:陨星(5星) +-- 减速+狙击:白雪(4星) +-- 减速+近卫:霜叶(4星) +-- 减速+术师:夜魔(5星)、格雷伊(4星) +-- 减速+特种:食铁兽(5星) +-- 减速+近战:霜叶(4星)、食铁兽(5星) +-- 减速+输出:霜叶(4星)、真理(5星) +-- 减速+群攻:白雪(4星)、格雷伊(4星) +-- 减速+治疗:夜魔(5星) +-- 减速+位移:食铁兽(5星) +-- 控场:德克萨斯(5星)、红(5星)、梅尔(5星) +-- 控场+先锋:德克萨斯(5星) +-- 控场+费用回复:德克萨斯(5星) +-- 控场+特种:红(5星) +-- 控场+辅助:梅尔(5星) +-- 控场+近战:德克萨斯(5星)、红(5星) +-- 控场+远程:梅尔(5星) +-- 控场+快速复活:红(5星) +-- 位移:暗索(4星)、阿消(4星)、崖心(5星)、食铁兽(5星)、可颂(5星) +-- 位移+重装:可颂(5星) +-- 位移+特种:暗索(4星)、阿消(4星)、崖心(5星)、食铁兽(5星) +-- 位移+输出:崖心(5星) +-- 位移+防护:可颂(5星) +-- 位移+减速:食铁兽(5星) +-- 爆发:守林人(5星) +-- 狙击+削弱:流星(4星)、陨星(5星) +-- 狙击+减速:白雪(4星) +-- 狙击+爆发:守林人(5星) +-- 狙击+生存:杰西卡(4星) +-- 术师+削弱:夜烟(4星) +-- 术师+治疗:夜魔(5星) +-- 术师+减速:夜魔(5星)、格雷伊(4星) +-- 先锋+支援:凛冬(5星) +-- 先锋+控场:德克萨斯(5星) +-- 费用回复+支援:凛冬(5星) +-- 费用回复+控场:德克萨斯(5星) +-- 近卫+减速:霜叶(4星) +-- 近卫+支援:杜宾(4星)、诗怀雅(5星) +-- 重装+位移:可颂(5星) +-- 重装+输出:雷蛇(5星)、火神(5星) +-- 重装+生存:火神(5星) +-- 医疗+支援:白面鸮(5星)、华法琳(5星) +-- 辅助+削弱:初雪(5星) +-- 辅助+输出:真理(5星) +-- 辅助+控场:梅尔(5星) +-- 特种:砾(4星)、暗索(4星)、阿消(4星)、红(5星)、狮蝎(5星)、崖心(5星)、食铁兽(5星) +-- 特种+输出:狮蝎(5星)、崖心(5星) +-- 特种+防护:砾(4星) +-- 特种+生存:狮蝎(5星) +-- 特种+减速:食铁兽(5星) +-- 特种+控场:红(5星) +-- 特种+位移:暗索(4星)、阿消(4星)、崖心(5星)、食铁兽(5星) +-- ]] + +--[[ +# how to get tag5 +# open https://arkn.lolicon.app/#/hr, click 查看保底词条组合, open console and run +let all=[...document.querySelector("#arkn-hr .comb-large table").querySelectorAll('tr')].slice(1) +let ans='' +ans+='{' +all.forEach(line=>{ + let tag=[...line.children[1].querySelectorAll('button')].map(x=>x.textContent) + let star=line.children[2].textContent.slice(0,1) + let operator=[...line.children[3].querySelectorAll('span')].map(x=>x.textContent) + ans+=`{{${tag.map(x=>'"'+x+'"')}},${star},{${operator.map(x=>'"'+x+'"')}}},` +}) +ans+='}' +console.log(ans) +--]] + +tag5 = { + {{"控场"}, 5, {"德克萨斯", "梅尔", "红", "格劳克斯"}}, + {{"爆发"}, 5, {"守林人"}}, {{"召唤"}, 5, {"梅尔"}}, { + {"特种干员"}, 4, + { + "红", "槐琥", "崖心", "狮蝎", "食铁兽", "砾", "暗索", + "阿消", + }, + }, { + {"支援"}, 4, + {"白面鸮", "凛冬", "诗怀雅", "华法琳", "杜宾", "清流"}, + }, {{"削弱"}, 4, {"陨星", "槐琥", "初雪", "夜烟", "流星"}}, + {{"快速复活"}, 4, {"红", "槐琥", "砾"}}, + {{"位移"}, 4, {"可颂", "崖心", "食铁兽", "暗索", "阿消"}}, + {{"近卫干员", "防护"}, 5, {"星极"}}, + {{"重装干员", "输出"}, 5, {"雷蛇", "火神"}}, + {{"重装干员", "生存"}, 5, {"火神"}}, + {{"重装干员", "位移"}, 5, {"可颂"}}, + {{"辅助干员", "输出"}, 5, {"真理"}}, + {{"辅助干员", "削弱"}, 5, {"初雪"}}, + {{"术师干员", "治疗"}, 5, {"夜魔"}}, + {{"特种干员", "输出"}, 5, {"崖心", "狮蝎"}}, + {{"特种干员", "生存"}, 5, {"狮蝎"}}, + {{"特种干员", "减速"}, 5, {"食铁兽"}}, + {{"特种干员", "削弱"}, 5, {"槐琥"}}, + {{"先锋干员", "支援"}, 5, {"凛冬"}}, + {{"治疗", "输出"}, 5, {"夜魔"}}, {{"治疗", "减速"}, 5, {"夜魔"}}, + {{"支援", "费用回复"}, 5, {"凛冬"}}, + {{"输出", "防护"}, 5, {"星极", "雷蛇", "火神"}}, + {{"输出", "位移"}, 5, {"崖心"}}, {{"生存", "防护"}, 5, {"火神"}}, + {{"群攻", "削弱"}, 5, {"陨星"}}, {{"防护", "位移"}, 5, {"可颂"}}, + {{"减速", "位移"}, 5, {"食铁兽"}}, + {{"削弱", "快速复活"}, 5, {"槐琥"}}, + {{"削弱", "近战位"}, 5, {"槐琥"}}, + {{"近卫干员", "减速"}, 4, {"霜叶"}}, + {{"狙击干员", "生存"}, 4, {"杰西卡"}}, + {{"狙击干员", "减速"}, 4, {"梅", "白雪"}}, + {{"术师干员", "减速"}, 4, {"夜魔", "格雷伊"}}, + {{"先锋干员", "治疗"}, 4, {"桃金娘"}}, + {{"治疗", "费用回复"}, 4, {"桃金娘"}}, + {{"输出", "减速"}, 4, {"真理", "夜魔", "梅", "霜叶"}}, + {{"生存", "远程位"}, 4, {"杰西卡"}}, + {{"群攻", "减速"}, 4, {"格雷伊", "白雪"}}, + {{"减速", "近战位"}, 4, {"食铁兽", "霜叶"}}, + {{"术师干员", "输出", "减速"}, 5, {"夜魔"}}, +} +table.extend(tag5, { + {{'支援机械'}, 5, {"支援机械"}}, + {{'资深干员'}, 5, {"资深干员"}}, + {{'高级资深干员'}, 6, {"高级资深干员"}}, +}) + -- parse to key:value tagk = {} tagv = {} -for k, v in tag4:gmatch('([^\r\n%s]+):([^\r\n%s]+)') do - local t = {} - for i in k:gmatch("[^%+]+") do - i = table.find(tag, function(x) return x:startsWith(i) end) - if not i then log('tag map error', k) end - insert(t, tag[i]) - end - -- ignore duplication - flag = true - for k, v in pairs(tagk) do - if #v == #t and - not table.any(v, function(x) return not table.includes(t, x) end) then - flag = false - break +tagl = {} +-- old parse function for tag4 +-- for k, v in tag4:gmatch('([^\r\n%s]+):([^\r\n%s]+)') do +-- local t = {} +-- for i in k:gmatch("[^%+]+") do +-- i = table.find(tag, function(x) return x:startsWith(i) end) +-- if not i then log('tag map error', k) end +-- insert(t, tag[i]) +-- end +-- -- ignore duplication +-- flag = true +-- for k, v in pairs(tagk) do +-- if #v == #t and +-- not table.any(v, function(x) return not table.includes(t, x) end) then +-- flag = false +-- break +-- end +-- end +-- if flag then +-- -- log(t) +-- insert(tagk, t) +-- insert(tagv, v) +-- end +-- end + +-- parse function for tag5 +for k, v in pairs(tag5) do + for _,t in pairs(v[1])do + if not table.includes(tag,t) then + log("invalid tag",t) end end - if flag then - -- log(t) - insert(tagk, t) - insert(tagv, v) - end + insert(tagk,v[1]) + insert(tagl,v[2]) + insert(tagv,v[3]) end --- for k, v in pairs(tagk) do log(v) end +-- for k, v in pairs(tagk) do log(tagk[k],tagl[k],tagv[k]) end -- return bottom/right blank line num detect_blank_line = function(s, ah, aw) @@ -229,12 +290,16 @@ ocr = function(x) -- loop each word if bottom <= top or right <= left then return result end -- offset - local of = {{-1, -1}, {-1, 0}, {-1, 1}, {0, -1}, {0, 0}, {0, 1}, {1, -1}, - {1, 0}, {1, 1}} - of = {{-2, -2}, {-2, -1}, {-2, -0}, {-2, 1}, {-2, 2}, {-1, -2}, {-1, -1}, - {-1, -0}, {-1, 1}, {-1, 2}, {-0, -2}, {-0, -1}, {-0, -0}, {-0, 1}, - {-0, 2}, {1, -2}, {1, -1}, {1, -0}, {1, 1}, {1, 2}, {2, -2}, {2, -1}, - {2, -0}, {2, 1}, {2, 2}} + local of = { + {-1, -1}, {-1, 0}, {-1, 1}, {0, -1}, {0, 0}, {0, 1}, {1, -1}, {1, 0}, + {1, 1}, + } + of = { + {-2, -2}, {-2, -1}, {-2, -0}, {-2, 1}, {-2, 2}, {-1, -2}, {-1, -1}, + {-1, -0}, {-1, 1}, {-1, 2}, {-0, -2}, {-0, -1}, {-0, -0}, {-0, 1}, {-0, 2}, + {1, -2}, {1, -1}, {1, -0}, {1, 1}, {1, 2}, {2, -2}, {2, -1}, {2, -0}, + {2, 1}, {2, 2}, + } -- of = {{-1, 0}, {0, 0}, {-2, 0}} of = {{0, 0}} local cps = 1 -- compare point step @@ -316,7 +381,7 @@ create_font_map = function() ocr(t) end --- created tag map +-- created font map fm = { 位 = "000000000000000001100000000000000011000000011110000000000000011110000000111000000000000001111000000011110000000000001111000000001111000000000000111100000000111000000000000111100111111111111111111000011110011111111111111111100011111001111111111111111110011111100011111111111111110001111110000000000000000000001111111000011110000001111000111111100001111000000111100011111110000111100000011110001111111000001110000001111000010111100000111000000111000000011110000011110000011100000001111000001111000001110000000111100000111100001111000000011110000011110000111100000001111000001111000011100000000111100000011100001110000000011110000001110000111000000001111000000111000111100000000111100000000000011110000000011110011111111111111111100001111011111111111111111111000111101111111111111111111100011110111111111111111111110001111000000000000000000000", 先 = "000000000000000000000000000000000110000011100000000000000000111100001110000000000000000011110000111000000000000000001111000011100000000000000000111111111111111111111000000111111111111111111111100000011111111111111111111110000011111111111111111111111000001111000000111000000000000001111000000011100000000000000111100000001110000000000000000100000000111000000000000000000000000011100000000000001111111111111111111111111110111111111111111111111111111011111111111111111111111111101111111111111111111111111110000000011110000111100000000000000001111000011110000000000000000111000001111000000000000000111100000111100000000000000011110000011110000000000000011111000001111000001110000011111000000111100000111100011111000000011110000011100111111100000000111100011110111111100000000011111111111011111100000000001111111111100111000000000000011111111000", diff --git a/ui.json b/ui.json index 382ccf6..7f437cf 100644 --- a/ui.json +++ b/ui.json @@ -48,12 +48,6 @@ "text": "202101191600,202102020400", "type": "Edit" }, - { - "id": "drug_enable", - "list": "吃药,吃石头", - "select": "0", - "type": "CheckBoxGroup" - }, { "text": "轮次作战地图(英文逗号隔开):", "type": "Label" @@ -63,6 +57,19 @@ "text": "R8-2,7-15,CE-5,LMSQ", "type": "Edit" }, + { + "id": "drug_enable", + "list": "吃药,吃石头,保底最高4星时自动招募", + "select": "0,2", + "type": "CheckBoxGroup" + }, + { + "id": "line1", + "color": "220,220,220", + "width": 850, + "height": 1, + "type": "Line" + }, { "id": "now_enable", "list": "立即执行:",