From bfe87aef7596346eacdb7c3a39eada4f81cb1e14 Mon Sep 17 00:00:00 2001 From: bilabila Date: Wed, 17 Aug 2022 15:05:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=96=B0=E6=89=8B=E6=B1=A0=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=AF=8F=E6=97=A5=E5=8D=95=E6=8A=BD=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dlt.py | 6 +++--- docs/guide.md | 6 ++---- main.lua | 2 +- path.lua | 2 ++ point.lua | 2 ++ release | 2 +- util.lua | 3 +++ 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlt.py b/dlt.py index 5483ff5..06d21f3 100755 --- a/dlt.py +++ b/dlt.py @@ -781,12 +781,12 @@ def check(key="", show=True): or not str(y["password" + str(i)]).strip() ): continue - username = y["username" + str(i)].split("#")[0].strip() - password = y["password" + str(i)].split("#")[0].strip()[:-1] + username = y["username" + str(i)].strip() + password = y["password" + str(i)].strip() if username in my_account: user2device[username] = device continue - serial = dlt.all2serial(" " + password, quiet=True) + serial = dlt.all2serial(" " + password + " ", quiet=True) if not serial: print("all2serial not found", password) continue diff --git a/docs/guide.md b/docs/guide.md index c8fcd57..57c5f6b 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -190,11 +190,9 @@ username3 password3 b 高级设置`游戏重启间隔`，不建议调整。 -#### 运行一段时间后回到点确定界面 +#### 运行一段时间后卡在点确定界面 -高级设置`完全重启间隔`，不建议调整。 - -如果一直停在点确定界面，应换设备。 +高级设置勾`禁用完全重启`，或更换设备。 ## 日常功能 diff --git a/main.lua b/main.lua index c10f932..f33bbaf 100644 --- 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 = "08.16 1:31" +release_date = "08.17 15:01" ui_submit_color = "#ff0d47a1" ui_cancel_color = "#ff1976d2" ui_warn_color = "#ff33ccff" diff --git a/path.lua b/path.lua index 81d126d..e6c28c6 100644 --- a/path.lua +++ b/path.lua @@ -670,6 +670,8 @@ path.限时活动 = function(retry) }) elseif findOne("面板赠送一次") and not disable_free_draw then tap("面板干员寻访") + if not appear("赠送一次") then tap("寻访右") end + if not appear("赠送一次") then tap("寻访右") end if not appear("赠送一次") then return end ssleep(.5) if not wait(function() diff --git a/point.lua b/point.lua index 2f635ee..bc0716d 100644 --- a/point.lua +++ b/point.lua @@ -20,6 +20,7 @@ minscale = min(hscale, wscale) maxscale = max(hscale, wscale) point = { + 寻访右 = "1843|580|3162A5", fullscreen = {0, 0, screen.width - 1, screen.height - 1}, 后院工坊 = {174, 814}, 自走车友会有 = "193|895|FF5341", @@ -1265,6 +1266,7 @@ autojs提供OCR、图像匹配、速度没测过。OCR看现有明日方舟辅 --]] center = { + 寻访右 = "center_center", 车友交流2 = "center_center", 车友交流1 = "center_center", diff --git a/release b/release index b1efa22..7327931 160000 --- a/release +++ b/release @@ -1 +1 @@ -Subproject commit b1efa2241ba2bb5423d20c227adb07cacaafc6b0 +Subproject commit 73279314af176e85eadca25553f1c56a6ee32bce diff --git a/util.lua b/util.lua index 1018913..0005e5c 100644 --- a/util.lua +++ b/util.lua @@ -771,6 +771,7 @@ stop = function(msg, mode, nohome, complete) disable_log = false -- 强制开启日志 local info = table.join(qqmessage, ' ') .. ' ' .. msg captureqqimagedeliver(info, true) + closeapp(appid) toast(msg) if complete then cloud.completeTask(last_upload_img) @@ -1881,6 +1882,7 @@ poweroff = kill_game_last_time = {[oppid] = time(), [bppid] = time()} closeapp = function(package) + if not package then return end -- log("package",package) -- 记录app被杀时间 kill_game_last_time[package] = time() @@ -3621,6 +3623,7 @@ predebug_hook = function() swipu_flipy = 0 swipu_flipx = 0 + exit() yg3 = "ff303030" log(colorDiff(yg3, "ff003030"))