Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ark light 20231009 resources navigation zude #35

Merged
merged 3 commits into from
Oct 9, 2023
Merged

Ark light 20231009 resources navigation zude #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa8c8f5
update:添加战备资源签到和别传关卡扭转醇刷取
xufeixianggithub Oct 9, 2023
755a825
update:添加战备资源签到和别传关卡扭转醇刷取
xufeixianggithub Oct 9, 2023
44b65af
Merge remote-tracking branch 'origin/arkLight-20231009-resources-navi…
xufeixianggithub Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions path.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,19 @@ path.fallback = {
end
end, 5)
end,
战备支援签到返回 = function()
wait(function()
tap("战备支援签到")
ssleep(.2)
end, 1)
wait(function()
tap("战备支援签到返回")
ssleep(.2)
tap("开包skip")
if not appear("面板") then tap("开包skip") end
if appear("面板", 1) then return true end
end, 5)
end,
端午签到返回 = function()
wait(function()
tap("端午签到左")
Expand Down Expand Up @@ -3254,6 +3267,8 @@ get_fight_type = function(x)
return "物资芯片"
elseif table.any({ "CW" }, f) then
return "插曲"
elseif table.any({ "GT" }, f) then
return "别传"
elseif table.any(table.values(jianpin2name), f) then
return "剿灭"
elseif f('HD') then
Expand Down Expand Up @@ -3787,6 +3802,46 @@ path.插曲 = function(x)
path.开始游戏(x)
end

path.别传 = function(x)
log("别传")
local chapter = x:find("-")
chapter = x:sub(1, chapter - 1)
if findOne("开始行动") then return path.开始游戏(x) end
path.跳转("首页")
tap("面板作战")
if not appear("主页") then return end
if not wait(function()
if findOne("别传界面") then return true end
tap("别传")
end) then
return
end
if not wait(function()
-- point模块加载时将GT打平到point,这里对应直接点击别传左侧具体是哪个别传类型的坐标,如骑兵与猎人或火蓝之心等
tap("别传列表" .. chapter)
if findOne("进入活动") then return true end
end) then
return
end
if not wait(function()
tap("进入活动")
if not appear("进入活动") then return true end
end) then
return
end
swip(x)
ssleep(.5)
-- point模块加载时将GT打平到point,这里对应直接点击具体的关卡坐标
tap("作战列表" .. x)
if not appear("开始行动") then
wait(function()
if appear("主页") then return true end
back()
end, 30)
end
path.开始游戏(x)
end

path.上一次 = function(x)
log("1265")
if findOne("开始行动") then return path.开始游戏(x) end
Expand Down
10 changes: 10 additions & 0 deletions point.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,9 @@ point = {
九色鹿签到 = "1487|853|000000,1404|831|5F1613,1457|807|9B2017,1574|817|731A15,1607|847|000000,1484|836|260806",
九色鹿签到返回 = "1801|151|595959,1802|181|BFBFBF,1802|208|595959",
国庆签到返回 = "1875|150|C1C1C1,1861|151|595959,1874|130|595959,1902|161|595959",
战备支援签到返回="1830|74|595959,1884|70|595959,1864|90|595959",
--战备支援签到="1624|915|069AD4,1742|951|E7F6FB",
战备支援签到="1624|915|069AD4",
抽签返回 = "1804|114|BFBFBF,1848|97|595959,1879|123|595959,1820|123|595959,1851|154|595959",
正在释放神经递质 = "0|950|E7D602",
下载资源确认 = "1174|669|1D6485,1339|727|313131,966|725|313131,574|722|313131,579|351|313131,1344|353|313131",
Expand Down Expand Up @@ -992,6 +995,9 @@ point = {
插曲列表 = {
["CW"] = { 79, 840 },
},
别传列表 = {
["GT"] = { 79, 210 },
},
滴水湖周边 = { 1440, 585 },
作战列表 = {
["STOP"] = { 0, 0 },
Expand Down Expand Up @@ -1038,6 +1044,7 @@ point = {
["HD-8"] = { 960, 525 },

["CW-6"] = { 960, 603 },
["GT-5"] = { 1270, 570 },

["0-1"] = { 960, 500 },
["0-3"] = { 960, 500 },
Expand Down Expand Up @@ -1268,6 +1275,8 @@ point = {
主题曲 = "357|963|ECECEC",
插曲界面 = "1787|68|313131",
插曲 = "594|963|ECECEC",
别传界面 = "1787|68|313131",
别传 = "830|1003|4F4F4F",
资源收集 = "1077|963|ECECEC",
每周部署 = "1323|963|ECECEC",
集成战略 = "1555|963|ECECEC",
Expand Down Expand Up @@ -1924,6 +1933,7 @@ distance = {
["HD-8"] = { swip_right_max, -3058 },

["CW-6"] = { swip_right_max, -1349 },
["GT-5"] = { swip_right_max, -1535},

["11-1"] = { swip_right_max, -0 },
["11-2"] = { swip_right_max, -209 },
Expand Down
2 changes: 1 addition & 1 deletion util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4111,7 +4111,7 @@ parse_fight_config = function(fight_ui)
'聚酸酯组', '聚酸酯', '糖组', '糖', '异铁组', '异铁', '酮凝集组', '酮凝集', '凝胶',
'炽合金', '晶体元件', '半自然溶剂', '化合切削液', '转质盐组' }, v) then
if v == '扭转醇' then
for _, i in pairs({ '6-11', '11-13' }) do
for _, i in pairs({ 'GT-5','6-11', '11-13' }) do
for _ = 1, 99 do table.insert(expand_fight, i) end
end
elseif v == '轻锰矿' then
Expand Down