diff --git a/xsp/src/ScanMain.lua b/xsp/src/ScanMain.lua index b7ee833aee9626e2348e31d86494c195759e9211..0dc734f38d50264b5305985b0797f0e5654c616b 100644 --- a/xsp/src/ScanMain.lua +++ b/xsp/src/ScanMain.lua @@ -2043,6 +2043,21 @@ function scanChapter() return isSP, mode, 13 end + -- level 14 + colors = { + { 154,71,0xeaf3ff }, + { 154,84,0xd0e9ff }, + { 147,81,0xd7e8ff }, + { 151,78,0x495fb7 }, + { 137,77,0x4558a4 }, + { 139,71,0xe0f1ff }, + { 135,74,0xddeeff }, + { 140,84,0xd8ebfd } + } + if cmpColor(colors) then + return isSP, mode, 14 + end + -- level tebieyanxi if scanIsTBYX() then return false, "hard", Lid_TBYXLevel diff --git a/xsp/src/mainLogic.lua b/xsp/src/mainLogic.lua index 45de07584e89c4ff7f29ccfe1233852685ddbafa..3c0ca03629eff52b6ed51822b89f329ea6d56844 100644 --- a/xsp/src/mainLogic.lua +++ b/xsp/src/mainLogic.lua @@ -1479,14 +1479,16 @@ function mainLogic() -- showConsole('path ='..path) --if ((mTime() - STATE.combat_begin_time) / 1000) < 10 then - if prev_cnt > 350 or login_tried >= max_login_retries or + if DEVICE.isPrivate and SETTINGS.autoRestartApp then + if prev_cnt > 350 or login_tried >= max_login_retries or (STATE.combat_begin_time > 0 and ((mTime() - STATE.combat_begin_time) / 1000) > 350) - then - if DEVICE.isPrivate and SETTINGS.autoRestartApp then + then do_restart_game() -- end end - elseif path == "preload" then + end + + if path == "preload" then if login_tried < max_login_retries then click(451, 78, 1031, 385) login_tried = login_tried + 1