diff --git a/AUTO_MAA.exe b/AUTO_MAA.exe index e9378fd..e6a9961 100644 Binary files a/AUTO_MAA.exe and b/AUTO_MAA.exe differ diff --git a/AUTO_MAA.py b/AUTO_MAA.py index 5466642..d46ee91 100644 --- a/AUTO_MAA.py +++ b/AUTO_MAA.py @@ -60,7 +60,7 @@ def cleanup(): print(colored(linex,'light_green')) else: print(colored("暂无",'light_green')) - if (curtime in timeset) and not os.path.exists("running"): + if (curtime in timeset) and not os.path.exists("state/running"): with open("state/BEGIN","w",encoding="utf-8") as f: print("BEGIN",file=f) maa=subprocess.Popen(["run.exe"]) diff --git a/manage.exe b/manage.exe index e49079c..f687e3f 100644 Binary files a/manage.exe and b/manage.exe differ diff --git a/manage.py b/manage.py index af4c6e9..8169167 100644 --- a/manage.py +++ b/manage.py @@ -448,7 +448,7 @@ def unit(x,m): elif read[0]=='+' and len(read)==1: print(add()) elif read[0]=='-' and len(read)==1: - exit() + os._exit(0) elif read[0]=='/': print(setpath(read[1:])) elif read[0]=='*' and len(read)==1: diff --git a/run.exe b/run.exe index 61e9355..940b043 100644 Binary files a/run.exe and b/run.exe differ diff --git a/run.py b/run.py index d08cacc..7175215 100644 --- a/run.py +++ b/run.py @@ -19,6 +19,7 @@ # DLmaster_361@163.com import os +import sys import subprocess import atexit import sqlite3 @@ -116,7 +117,7 @@ def cleanup(): #读取运行情况 if os.path.exists("state/RUNNING"): - exit() + os._exit(1) #标记当前正在运行 with open("state/RUNNING","w",encoding="utf-8") as f: print("RUNNING",file=f) @@ -173,4 +174,4 @@ def cleanup(): if os.path.exists("state/BEGIN"): with open("state/END","w",encoding="utf-8") as f: print("END",file=f) -exit() \ No newline at end of file +sys.exit(0) \ No newline at end of file