add SL

.gitignore

@@ -6,7 +6,6 @@
 *.mp4
 *.ove
 *.ogg
-/extract.py
 *.psd
 *.zip
 tmp*

extract.py

@@ -356,7 +356,7 @@ def screencap_distance(path="screencap"):
     point = defaultdict(int)
     distance = defaultdict(int)
     shift_right = 0
-    distance[1] = 250
+    distance[1] = 500
     for x in sorted(screencap.glob("*.jpg")):
         x = reader.readtext(str(x))
         print("x",x)

main.lua

@@ -51,7 +51,7 @@ default_auto_timeout_second = 300
 -- 设成1000//30时，真机同时开着B服与官服时会出现点着点着脚本就停（从基建开始做邮件）
 frame_milesecond = 1000 // 30
 milesecond_after_click = frame_milesecond
-release_date = "07.27 22:43"
+release_date = "08.01 20:32"
 ui_submit_color = "#ff0d47a1"
 ui_cancel_color = "#ff1976d2"
 ui_warn_color = "#ff33ccff"

path.lua

@@ -3975,7 +3975,67 @@ path.活动 = function(x)
     end, 5) then return end
 
   end
-  -- car_check()
+
+  local car_check = function()
+    if car_checked then return end
+    car_checked = true
+    car_check_times = car_check_times + 1
+    if not appear("活动导航0", 1) then return end
+
+    fight_failed_times[cur_fight] = (fight_failed_times[cur_fight] or 0) - 1
+
+    if not appearTap("风情街") then return end
+    -- ssleep(1)
+    -- tap("风情街")
+
+    appear("营业奖励")
+
+    if disappear("营业奖励", 1) then
+      tap("左上角返回")
+      appear("营业奖励")
+      ssleep(1)
+    end
+
+    tap("继续营业")
+
+    if not disappear("营业奖励") then return end
+
+    local first_time_see_home = time()
+    wait(function()
+
+      if findOne("主页") then
+        first_time_see_home = first_time_see_home or time()
+        if time() - first_time_see_home > 5000 then return true end
+      else
+        first_time_see_home = nil
+      end
+
+      -- if findTap("就这么决定了") then return end
+      -- if findTap("前往下一轮") then return end
+      tap("前往下一轮")
+      tap("前往下一轮")
+      tap("就这么决定了")
+      tap("就这么决定了")
+      gesture({
+        {
+          point = {
+            {screen.width - scale(50), screen.height // 2},
+            {screen.width - scale(50), 0},
+          },
+          start = 0,
+          duration = 250,
+        },
+      })
+      ssleep(.5)
+    end, 60)
+
+    if not wait(function()
+      if appear("活动导航0", 1) then return true end
+      back()
+    end, 5) then return end
+
+  end
+  car_check()
   if not findOne("活动导航0") then return end
   if not wait(function()
 

point.lua

@@ -20,6 +20,13 @@ minscale = min(hscale, wscale)
 maxscale = max(hscale, wscale)
 
 point = {
+  前往下一轮 = "1809|1012|202020",
+  -- 就这么决定了 = "1083|972|202020",
+  就这么决定了 = "1140|1008|202020",
+  打探消息 = "967|537|617D31,931|537|617D31,1021|537|617D31,958|552|FFFFFF",
+  继续营业 = "1756|952|010101",
+  营业奖励 = "1599|645|1F1F1F,1656|654|F5EADA",
+  风情街 = "1770|160|CF344C",
   同意协议 = {text = "我已阅读并同意以上协议"},
   神州返回 = "1845|115|BFBFBF,1825|114|595959,1846|87|595959,1846|135|595959",
   神州领取1 = "1081|895|9E9E9E",
@@ -187,8 +194,8 @@ point = {
   干员第一个采样列表 = {{661, 199}, {715, 244}, {769, 325}},
   活动商店支付 = "1245|834|D92536",
   活动商店横线 = "350|227|590000",
-  活动导航0 = "853|282|FEFEFE,870|433|F9EE50",
-  活动导航1 = "1677|423|060606",
+  活动导航0 = "1698|711|FEF6DE,1797|750|FFF6DE",
+  活动导航1 = "1698|711|FEF6DE,1797|750|FFF6DE",
   活动导航3 = "559|867|A19878",
   活动任务一键领取 = "350|813|000000",
   活动任务 = "135|455|87949B",
@@ -303,9 +310,9 @@ point = {
   --
   -- "1196|472|B89959,838|602|C7A55E"
   -- "1195|471|07A9A8,880|594|03B7B6,904|612|393939"
-  面板赠送一次 = "1773|723|FFFFFF,1761|709|07A9A8,1795|737|07A9A8",
+  面板赠送一次 = "1773|723|FFFFFF,1761|709|EA6EA0,1795|737|EA6EA0",
   面板赠送一次范围 = {1395, 631, 1920 - 1, 1080 - 1},
-  赠送一次 = "1326|877|03B7B6",
+  赠送一次 = "1326|877|FF76AD",
   寻访一次 = {1321, 980},
   感谢典点击领取 = "1377|716|00D654",
   感谢庆典返回 = "1564|193|C0C0C0,1536|193|595959,1560|163|595959,1563|213|595959",
@@ -1006,15 +1013,14 @@ point = {
     ["PR-C-0"] = "666|595|000000,672|612|FFFFFF,511|597|000000,672|636|FFFFFF",
     ["PR-D-0"] = "689|628|000000,693|646|FFFFFF,537|626|000000,699|671|FFFFFF",
 
-    ["HD-8"] = {960, 591},
-    ["HD-7"] = {960, 663},
-    ["HD-6"] = {960, 654},
-
-    ["HD-5"] = {960, 312},
-    ["HD-4"] = {960, 636},
-    ["HD-3"] = {960, 537},
-    ["HD-2"] = {960, 627},
-    ["HD-1"] = {960, 771},
+    ["HD-1"] = {960, 534},
+    ["HD-2"] = {960, 414},
+    ["HD-3"] = {960, 555},
+    ["HD-4"] = {960, 555},
+    ["HD-5"] = {960, 282},
+    ["HD-6"] = {960, 279},
+    ["HD-7"] = {960, 474},
+    ["HD-8"] = {960, 474},
 
     ["0-1"] = {960, 500},
     ["0-3"] = {960, 500},
@@ -1394,6 +1400,11 @@ autojs提供OCR、图像匹配、速度没测过。OCR看现有明日方舟辅
 开发过程中测试3种分辨率 720x1280、1920x1080、2400x1080。
 --]]
 center = {
+  前往下一轮 = "right_center",
+  就这么决定了 = "center_center",
+  继续营业 = "right_center",
+  营业奖励 = "center_center",
+  风情街 = "right_center",
   神州返回 = "center_center",
   神州领取1 = "center_center",
   神州领取2 = "center_center",
@@ -1462,7 +1473,7 @@ center = {
   活动商店支付 = "center_center",
   活动商店 = 'center_center',
   活动任务 = 'center_center',
-  活动导航0 = "center_center",
+  活动导航0 = "right_center",
   活动导航1 = "right_center",
   活动导航2 = "center_center",
   活动导航3 = "center_center",
@@ -1875,15 +1886,14 @@ center = {
 
 distance = {
 
-  ["HD-1"] = {swip_right_max, -200},
-  ["HD-2"] = {swip_right_max, -400},
-  ["HD-3"] = {swip_right_max, -1100},
-  ["HD-4"] = {swip_right_max, -1500},
-  ["HD-5"] = {swip_right_max, -1700},
-
-  ["HD-6"] = {swip_right_max, -1900},
-  ["HD-7"] = {swip_right_max, -2400},
-  ["HD-8"] = {swip_right_max, -2600},
+  ["HD-1"] = {swip_right_max, -565},
+  ["HD-2"] = {swip_right_max, -1030+300},
+  ["HD-3"] = {swip_right_max, -1163+300},
+  ["HD-4"] = {swip_right_max, -1417+300},
+  ["HD-5"] = {swip_right_max, -1419+300},
+  ["HD-6"] = {swip_right_max, -1846+100},
+  ["HD-7"] = {swip_right_max, -1882},
+  ["HD-8"] = {swip_right_max, -2266},
 
   ["11-1"] = {swip_right_max, -0},
   ["11-2"] = {swip_right_max, -209},
@@ -2338,6 +2348,8 @@ rfg = {
   剧目 = point.剧目范围,
   技能亮 = {0, 0, screen.width - 1, screen.height - 1},
   技能ready = {0, 0, screen.width - 1, screen.height - 1},
+
+  打探消息 = {0, 0, screen.width - 1, screen.height - 1},
 }
 
 rfl = {}

tag.lua

@@ -19,17 +19,17 @@ tag5 = {
   {{"近战位", "控场"}, 5, {"德克萨斯", "红"}},
   {{"近战位", "削弱"}, 5, {"槐琥"}},
   {{"近卫干员", "防护"}, 5, {"星极"}},
-  {{"输出", "防护"}, 5, {"石棉", "火神", "雷蛇", "星极"}},
+  {{"输出", "防护"}, 5, {"石棉", "星极", "火神", "雷蛇"}},
   {{"输出", "群攻"}, 5, {"断崖"}}, {{"输出", "位移"}, 5, {"崖心"}},
   {{"辅助干员", "输出"}, 5, {"真理"}},
   {{"辅助干员", "生存"}, 5, {"月禾"}},
   {{"辅助干员", "支援"}, 5, {"月禾"}},
-  {{"辅助干员", "控场"}, 5, {"梅尔", "格劳克斯"}},
+  {{"辅助干员", "控场"}, 5, {"格劳克斯", "梅尔"}},
   {{"辅助干员", "削弱"}, 5, {"初雪", "巫恋"}},
   {{"群攻", "削弱"}, 5, {"陨星", "慑砂"}},
   {{"生存", "防护"}, 5, {"火神"}},
   {{"狙击干员", "爆发"}, 5, {"守林人"}},
-  {{"特种干员", "输出"}, 5, {"狮蝎", "崖心"}},
+  {{"特种干员", "输出"}, 5, {"崖心", "狮蝎"}},
   {{"特种干员", "生存"}, 5, {"狮蝎"}},
   {{"特种干员", "控场"}, 5, {"红"}},
   {{"特种干员", "削弱"}, 5, {"槐琥"}},
@@ -38,46 +38,46 @@ tag5 = {
   {{"治疗", "输出"}, 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, {"暗索", "崖心", "食铁兽", "阿消", "可颂"}},
   {{"远程位", "生存"}, 4, {"月禾", "杰西卡"}},
-  {{"近战位", "减速"}, 4, {"霜叶", "食铁兽"}},
+  {{"近战位", "减速"}, 4, {"食铁兽", "霜叶"}},
   {{"治疗", "减速"}, 4, {"夜魔", "波登可"}},
-  {{"术师干员", "减速"}, 4, {"夜魔", "格雷伊"}}, {
+  {{"术师干员", "减速"}, 4, {"格雷伊", "夜魔"}}, {
     {"远程位", "输出", "减速"}, 4,
-    {"夜魔", "安比尔", "梅", "真理"},
+    {"夜魔", "梅", "安比尔", "真理"},
   },
-  {{"输出", "减速"}, 4, {"霜叶", "梅", "安比尔", "夜魔", "真理"}},
+  {{"输出", "减速"}, 4, {"夜魔", "梅", "霜叶", "真理", "安比尔"}},
   {{"近卫干员", "减速"}, 4, {"霜叶"}},
   {{"辅助干员", "治疗"}, 4, {"波登可"}},
   {{"群攻", "减速"}, 4, {"白雪", "格雷伊"}},
   {{"狙击干员", "生存"}, 4, {"杰西卡"}},
-  {{"狙击干员", "减速"}, 4, {"白雪", "安比尔", "梅"}},
+  {{"狙击干员", "减速"}, 4, {"白雪", "梅", "安比尔"}},
   {{"治疗", "费用回复"}, 4, {"桃金娘"}},
   {{"先锋干员", "治疗"}, 4, {"桃金娘"}},
 }

util.lua

@@ -3860,8 +3860,10 @@ predebug_hook = function()
   zl_skill_times = 100
 
   disable_game_up_check = true
-  -- swip("HD-8")
-  -- log(findOne("同意协议"))
+  swip("HD-2")
+  -- tap("作战列表HD-8")
+
+  log(findOne("就这么决定了"))
   -- local p = findOne("同意协议")
   -- if p ~= nil then
   --   local left, top = p.bounds.l, p.bounds.t
@@ -3990,7 +3992,7 @@ update_state_from_ui = function()
   -- log("fight", fight)
 
   -- 活动开放时间段
-  hd_open_time_end = parse_time("202307280400")
+  hd_open_time_end = parse_time("202308220400")
   hd_shop_open_time_end = parse_time("202306080400") -- 活动商店关闭时间
   hd2_open_time_end = parse_time("202303210400")
   hd2_shop_open_time_end = parse_time("202302240400") -- 活动2商店关闭时间