diff --git a/AUTO_MAA.exe b/AUTO_MAA.exe index e6a9961..5b3ab6d 100644 Binary files a/AUTO_MAA.exe and b/AUTO_MAA.exe differ diff --git a/AUTO_MAA.py b/AUTO_MAA.py index d46ee91..5851968 100644 --- a/AUTO_MAA.py +++ b/AUTO_MAA.py @@ -60,15 +60,17 @@ while True: print(colored(linex,'light_green')) else: print(colored("暂无",'light_green')) + #定时执行 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"]) - maapid=maa.pid + run=subprocess.Popen(["run.exe"]) + runpid=run.pid while True: if os.path.exists("state/END"): - os.system('taskkill /F /T /PID '+str(maapid)) + os.system('taskkill /F /T /PID '+str(runpid)) os.remove("state/END") break + time.sleep(1) os.remove("state/BEGIN") time.sleep(1) \ No newline at end of file diff --git a/manage.exe b/manage.exe index f687e3f..68e6124 100644 Binary files a/manage.exe and b/manage.exe differ diff --git a/res/info.txt b/res/info.txt index 5d37a2b..542c0f5 100644 --- a/res/info.txt +++ b/res/info.txt @@ -4,7 +4,7 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(2, 1, 2, 0), + filevers=(2, 1, 3, 0), prodvers=(0, 0, 0, 0), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, @@ -31,13 +31,13 @@ VSVersionInfo( [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'), StringStruct('CompanyName', 'AUTO_MAA Team'), StringStruct('FileDescription', 'AUTO_MAA Component'), - StringStruct('FileVersion', '2.1.2'), + StringStruct('FileVersion', '2.1.3'), StringStruct('InternalName', 'AUTO_MAA'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('OriginalFilename', 'AUTO_MAA'), StringStruct('ProductName', 'AUTO_MAA'), - StringStruct('ProductVersion', 'v2.1.2'), - StringStruct('Assembly Version', '2.1.2.0')]) + StringStruct('ProductVersion', 'v2.1.3'), + StringStruct('Assembly Version', '2.1.3.0')]) ]) ] ) \ No newline at end of file diff --git a/run.exe b/run.exe index 940b043..d33d0c7 100644 Binary files a/run.exe and b/run.exe differ diff --git a/run.py b/run.py index 7175215..f76c8ab 100644 --- a/run.py +++ b/run.py @@ -44,6 +44,7 @@ def runmaa(id,tel,game,num=3): for i in range(num): global idnew,idold,idfail,idall,logx,logi #创建MAA任务 + time.sleep(10) maa=subprocess.Popen([maapath]) maapid=maa.pid #等待MAA启动 @@ -73,8 +74,8 @@ def runmaa(id,tel,game,num=3): print(colored("运行日志:",'white')) #读取并保存MAA日志 with open(logpath,'r',encoding='utf-8') as f: - logs=f.readlines()[-1:-10:-1] - print(colored(''.join(logs[::-1]),'light_green')) + logs=f.readlines()[-1:-11:-1] + print(colored(''.join(logs[::-1]),'light_green'),end='') log=''.join(logs) logx[logi]=log logi=(logi+1) % len(logx) diff --git a/state/说明.txt b/state/说明.txt new file mode 100644 index 0000000..96ae1ac --- /dev/null +++ b/state/说明.txt @@ -0,0 +1 @@ +此文件夹内文件用于AUTO_MAA组件间的信息传递,如果遇到run.exe闪退或AUTO_MAA.exe一直显示“正在运行代理”,请尝试删除本文件夹下的所有文件。 \ No newline at end of file diff --git a/更新说明.txt b/更新说明.txt new file mode 100644 index 0000000..a7c30bb --- /dev/null +++ b/更新说明.txt @@ -0,0 +1,3 @@ +项目初始阶段,不会提供专门的版本更新程序,您需要手动更新程序。 +v2.1.2版本的使用者,将旧版本data文件夹移动至新版本软件根目录下,覆盖掉预置文件,即可完成更新。(其它文件不需要动) +新用户请忽略本说明。 \ No newline at end of file