drop 502apk (memory leak unsolved)

satsgsda · Jun 2, 2022 · 91d3d6f · 91d3d6f
1 parent abcf048
commit 91d3d6f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 27 deletions.
diff --git a/dlt.py b/dlt.py
@@ -231,17 +231,6 @@ def clear():
         for i in range(1, 31):
             c(x, "username" + str(i), "")
             c(x, "password" + str(i), "")
-            # if not x["username" + str(i)] or not x["password" + str(i)]:
-            #     if first_empty_i == 0:
-            #         first_empty_i = i
-            #     continue
-            # print(
-            #     i,
-            #     x["username" + str(i)],
-            #     x["password" + str(i)],
-            #     "b" if x["server" + str(i)] == 1 else "",
-            # )
-
         x = {}
         save("config_multi_account.json", x)
 
@@ -320,14 +309,14 @@ def start():
                     x, y = ok
                     adb("shell", "input", "tap", str(x), str(y))
                     see_package = True
-            snap = findNode(id="com.bilabila.arknightsspeedrun2:id/switch_snap")
-            if snap:
-                x, y = snap
-                adb("shell", "input", "tap", str(x), str(y))
+            # snap = findNode(id="com.bilabila.arknightsspeedrun2:id/switch_snap")
+            # if snap:
+            #     x, y = snap
+            #     adb("shell", "input", "tap", str(x), str(y))
             # if foreground() == oppid or foreground() == bppid:
             #     break
-            # elif see_package:
-            #     break
+            elif see_package:
+                break
 
     def rg1(username, password, server=None, fight=None):
         normal()

diff --git a/main.lua b/main.lua
@@ -50,7 +50,7 @@ default_findcolor_confidence = 95 / 100
 -- 设成1000//30时，真机同时开着B服与官服时会出现点着点着脚本就停（从基建开始做邮件）
 frame_milesecond = 1000 // 30
 milesecond_after_click = frame_milesecond
-release_date = "2022.06.01 21:11"
+release_date = "2022.06.02 13:03"
 ui_submit_color = "#ff0d47a1"
 ui_cancel_color = "#ff1976d2"
 ui_warn_color = "#ff33ccff"

diff --git a/path.lua b/path.lua
@@ -4294,8 +4294,8 @@ path.前瞻投资 = function(lighter)
 
   if not findOne("常规行动") then return end
 
-  -- log(zl_coin, zl_level)
-  -- exit()
+  log(zl_coin, zl_level)
+  exit()
   -- 放弃探索
   if findOne("放弃探索") then
     if not wait(function()

diff --git a/point.lua b/point.lua
@@ -24,7 +24,8 @@ point = {
   战略源石锭入口 = "282|834|787878",
   -- 战略等级 = {1651, 25, 1806, 70},
   -- 战略等级 = {1462, 45, 1575, 91},
-  战略等级 = {1551, 58, 1695, 108},
+  -- 战略等级 = {1551, 58, 1695, 108},
+  战略等级 = {1551, 58, 1729, 96},
   战略源石锭 = {1639, 22, 1870, 94},
 
   覆巢之下主页 = "402|54|A5A5A7,540|33|232426,543|72|2C2D2D",

diff --git a/release b/release
diff --git a/util.lua b/util.lua
@@ -3564,19 +3564,27 @@ predebug_hook = function()
       -- local r = point["战略等级"]
       -- "148|516|282320,284|570|1C1C1C"
       -- "1171|9|121A1A,1237|63|181818"
-      r = {1034, 39, 1130, 72}
-      log(r)
-      local id = createHUD()
+      -- r = {1034, 39, 1130, 72}
+      -- log(r)
+      -- local id = createHUD()
       -- showHUD(id, "等", 20, "0xffffb525", "0xff000000", 0, r[3], r[2], 0, 0) -- 显示HUD内容
       -- ssleep(1)
-      local x = ocrBinaryEx(r[1], r[2], r[3], r[4], "000000-feb525") or {}
+      -- local x = ocrBinaryEx(r[1], r[2], r[3], r[4], "000000-feb525") or {}
+
+      -- local r = point["战略等级"]
+      -- r =  {1034, 39, 1153, 64}
+      -- local x = ocrBinaryEx(r[1], r[2], r[3], r[4], "000000-feb525") or {}
+
       -- local x = ocrEx(r[1], r[2], 1111, 95) or {}
       --
       -- 右上角源石锭 可
       -- local x = ocrEx(1078,9,1234,57) or {}
       --
-      --- 360
+      -- 360
       -- local x = ocrEx(1093, 15, 1247, 63) or {}
+      -- local x = ocrEx(1134,25,1238,51) or {}
+      local x = ocrEx(477,592,571,627,"0-01d3ae") or {}
+      -- local x = ocrBinaryEx(1093, 15, 1247, 63,"000000-555555") or {}
 
       --  右上角等级 可
       -- local x = ocrEx(1104,17,1204,45) or {}