add TW-6, TW-7, TW-8

tkkcc · Jun 17, 2021 · 629ec48 · 629ec48
1 parent eccc53f
commit 629ec48
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/main.lua b/main.lua
@@ -5,6 +5,7 @@ require("util")
 cron = require("crontab")
 
 -- sleep(1)
+-- swipq("TW-6")
 -- swipq("资源收集列表"..1)
 -- swipq({10000,-1000},{1600,500})
 -- swipq({10000,-2000},{1600,500})
@@ -68,14 +69,17 @@ debug0415 = false
 debug0416 = false
 if debug0415 then
   opt.fight = {
+    "TW-6",
+    "TW-7",
+    "TW-8",
     -- ============= debug
-    "潮没海滨",
-    "切尔诺伯格",
-    "龙门外环",
-    "龙门市区",
-    "废弃矿区",
-    "大骑士领郊外",
-    "北原冰封废城",
+    -- "潮没海滨",
+    -- "切尔诺伯格",
+    -- "龙门外环",
+    -- "龙门市区",
+    -- "废弃矿区",
+    -- "大骑士领郊外",
+    -- "北原冰封废城",
 
     -- "PL-1", "PL-2", "PL-3", "PL-4", "PL-5",
 

diff --git a/path.lua b/path.lua
@@ -1301,18 +1301,18 @@ path.沃伦姆德的薄暮 = function(x)
   local p = update(path.base, {
     面板 = function()
       tap("面板作战活动")
-      tap("议事大厅")
-      sleep(1)
-    end,
-    前往八月集市 = function()
+      tap("议事高塔")
       swipq(x)
-      sleep(1)
       if not findTap("作战列表" .. x) then
         log(x .. "未找到")
         unfound_fight[x] = (unfound_fight[x] or 0) + 1
       end
       return true
     end,
+    ["作战列表" .. x] = function()
+      findTap("作战列表" .. x)
+      return true
+    end,
   })
   auto(p)
   path.开始游戏(x)

diff --git a/point.lua b/point.lua
@@ -190,7 +190,7 @@ point = {
     ["4-8"] = "905|349|0x000000,1048|351|0x000000,972|370|0x333333,962|387|0x333333,974|388|0x333333,1003|369|0x333333,1012|377|0x333333,1018|385|0xffffff",
     ["4-9"] = "1280|518|0x333333,1211|483|0x000000,1356|483|0x000000,1323|513|0xffffff,1320|513|0x333333,1305|515|0x333333,1311|530|0x333333,1280|524|0x333333",
     ["4-10"] = "1696|507|0xffffff,1689|530|0xffffff,1683|518|0xffffff,1668|506|0xffffff,1668|518|0xffffff,1668|530|0xffffff,1634|506|0xffffff,1634|522|0xffffff,1622|522|0xffffff,1717|479|0x000000,1566|479|0x000000",
-    ["S4-1"] =  "1803|646|0xffffff,946|505|0x333333,932|523|0x333333,946|530|0x333333,979|505|0x333333,975|531|0x333333,1014|484|0x000000",
+    ["S4-1"] = "1803|646|0xffffff,946|505|0x333333,932|523|0x333333,946|530|0x333333,979|505|0x333333,975|531|0x333333,1014|484|0x000000",
     ["S4-2"] = "350|792|0x333333,350|805|0x333333,345|817|0x333333,376|794|0x333333,377|810|0x333333,366|810|0x333333,409|791|0x333333,415|801|0x333333,402|818|0x333333",
     ["S4-3"] = "982|646|0xffffff,1080|650|0xffffff,773|774|0xffffff,679|772|0xffffff,1300|485|0x000000",
     ["S4-4"] = "329|640|0x333333,327|651|0x333333,357|644|0x333333,356|662|0x333333,390|642|0x333333,394|664|0x333333,412|618|0xffffff,274|621|0xffffff",
@@ -264,7 +264,10 @@ point = {
     ["DM-6"] = "1321|793|0xffffff,302|325|0x333333,302|344|0x333333,302|350|0x333333,319|338|0x333333,330|338|0x333333,351|338|0x333333,330|350|0x333333,350|326|0x333333,1340|756|0x000000,1482|306|0x000000,747|801|0xffffff",
     ["DM-7"] = "1463|561|0xffffff,302|325|0x333333,302|344|0x333333,302|350|0x333333,319|338|0x333333,330|338|0x333333,351|338|0x333333,330|350|0x333333,350|326|0x333333,1340|756|0x000000,1482|306|0x000000,747|801|0xffffff",
     ["DM-8"] = "1606|343|0xffffff,302|325|0x333333,302|344|0x333333,302|350|0x333333,319|338|0x333333,330|338|0x333333,351|338|0x333333,330|350|0x333333,350|326|0x333333,1340|756|0x000000,1482|306|0x000000,747|801|0xffffff",
-    ["TW-8"] = "734|536|0x333333,772|556|0x333333,803|540|0x333333,807|549|0xffffff,814|549|0x333333,975|536|0xffffff,693|512|0x000000",
+
+    ["TW-6"] = "403|656|0x000000,786|511|0x000000,1258|511|0x000000,1132|511|0x000000,949|539|0xffffff,660|513|0x000000,446|643|0xffffff,415|655|0x000000,285|248|0x000000",
+    ["TW-7"] = "786|511|0x000000,1258|511|0x000000,1132|511|0x000000,949|539|0xffffff,660|513|0x000000,446|643|0xffffff,415|655|0x000000,285|248|0x000000",
+    ["TW-8"] = "1258|511|0x000000,1132|511|0x000000,949|539|0xffffff,660|513|0x000000,446|643|0xffffff,415|655|0x000000,285|248|0x000000",
     -- 火蓝之心
     ["OF-F1"] = "425|725|0xffffff,778|538|0xffffff,1251|670|0xffffff,1604|473|0xffffff,1591|442|0x000000,1432|444|0x010000,1107|642|0x000000,1261|637|0x000000,435|694|0x000000,286|692|0x000000",
     ["OF-F2"] = "778|538|0xffffff,1251|670|0xffffff,1604|473|0xffffff,1591|442|0x000000,1432|444|0x010000,1107|642|0x000000,1261|637|0x000000,435|694|0x000000,286|692|0x000000",
@@ -496,7 +499,9 @@ point = {
     ["OF-6"] = {-10000, 100},
     ["OF-F3"] = {10000},
     ["OF-F4"] = {10000},
-    ["TW-8"] = {10000, -100},
+    ["TW-6"] = {10000, -80},
+    ["TW-7"] = {10000, -80},
+    ["TW-8"] = {10000, -80},
     ["RI-8"] = {-10000},
     ["MN-8"] = {-10000},
     ["MN-7"] = {-10000, 100},
@@ -644,7 +649,7 @@ point = {
   骑兵与猎人 = {72, 256},
   火蓝之心 = {72, 424},
   喧闹法则 = {72, 592},
-  议事大厅 = {1725, 561},
+  议事高塔 = {1725, 561},
   物资筹备列表 = {
     {285, 580}, {677, 580}, {1085, 580}, {1477, 580}, {1762, 580},
   },
@@ -965,6 +970,7 @@ tap_extra_delay = {
   遗尘漫步 = 1,
   覆潮之下 = 1,
   荒败盐风 = 1,
+  议事高塔 = 1,
 }
 flatten = function()
   local p = {}