From ebd3273251c6f194d3e8143eeff7de4ad99246e6 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Wed, 3 Apr 2024 20:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=BB=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=EF=BC=8C=E6=97=A5=E5=BF=97=E8=AF=BB=E5=8F=96=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E8=BF=90=E8=A1=8C=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTO_MAA.exe | Bin 8936640 -> 8936660 bytes AUTO_MAA.py | 8 +++++--- manage.exe | Bin 14413006 -> 14413006 bytes res/info.txt | 8 ++++---- run.exe | Bin 8961566 -> 8961586 bytes run.py | 5 +++-- state/说明.txt | 1 + 更新说明.txt | 3 +++ 8 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 state/说明.txt create mode 100644 更新说明.txt diff --git a/AUTO_MAA.exe b/AUTO_MAA.exe index e6a99619bacb218342fc552c0d850b877cfb0bf1..5b3ab6dfd31101a6cad4b7ff0604ca70c98b0511 100644 GIT binary patch delta 2891 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 delta 3121 zcmYk$2{hE}8wc>;ShFN!%aS!pWDCg_iY!Aa`;v(<85!$Lb_QcBQiw?sB7~5VHCuIQ zvD{?K4apiNb+g=T|HnP|_P@V#KIeVU`F?-T`@FBuXKDpi+$bh4FFHP*4`t4%^e&N# zLnYu)I~ZzlD8_F$|4tL^GZ_IBU0RfE{oEPOuwrfjxj5paD;2 zU=$Xcb-W(9Ig%ds?RcB5f=s%{hv(NQy+=G9rud&(8ru^~=UN&{6W4mPeoV%{Zg}>g zrDlP`=c@9F$uwcTCU{Vbznn3zvw+P_=DM&MV)wX``vd)+ZTOo3equoJ>!0camE|jG%nDia zQq8|#)RdGmYEYTu=}zhS*%8x0W$oBRZGW2?pE~g>Zce( z`*XA{f_`fq8Bd~EfUiJD*HpQd*xi=fS`1g7IV zQdzF&qMenl?vqTzx4ykyjo8ByqvZv60^AN{B_G5ICDTW9_3GBw?^lmgwpZG= zC&z>bIFwUO@E%!)asx75CM=Sa?sr0-_a2KobhW#y$>e>E*F|5?NgtKnU*%?_q4?2B z_Uewr}mE4Zl zSDC^^HEqdC#8mZ^U_81{Cq0lgFSxDmHUi~(@?+{v3n`+D5PB<0AqK&#gTW=yI z8CoTvb=%~AzClu|JEw3allj$aw|q^Ds#&r#U$F6VQpvaW4E$gwzq@H*ne?sD{Y?6U z;B)TEvI4#Z=lYaAxp`S++7mBOdanfYbPN74P4~{aYRLJ9?5tcq%hn@6jv}b~7xHqS z&Q`}2Vd`~;HmwdxrbkgHs{YC{V4E?_N@2evVTRIwKXa#UuJwL-py;uHi+u(W-9)Xb znYTrZPH-72EdMGaZ<=R$Dy}N8n});K>Mv=|J3o6{(prqlWeAt4&RC*+N!Fm{G|Kjr zBx7+K^{zP&8!tAxW!LUqsHbYZbUq$9cdLE1)H?Un@*(To?tZLx*!Bs7YsWL$^ zZdCVZ(BUBS;&Pg?;W$|)6dO9_mBUVqKwJ*1(>HOv`?`0kCcUk*)&^zUgvABG~6FTN;eg|@O{61N12hB zZm4zoweRdkuhsDWVc+aZ8;wb;CC-(Cx+HbN)Sw8iy)S{pxx3EWI)_LxD3>{2W(x*;7c_zt!fmT1!)g&}EaT19~x+n;c)n zZb`3ek17p%Hnj|${iEc2j__EPUWrC<<<~B8#nhVx4!(q@<{;Ol&9(`yntY7ctQ;z- z%wd(7mQa~+GxOsc+#6g_6D4G^Z}5F4w(PECmug{fyzRi=p0c}9(`>SLqv*qDswE@t zYmF~WCvZrT$4C!P2oIL}J=B`-wu;lL_ZU6vH!1pO3acaoKTddiaebz!)r4^q+ zeZ4wM|A%~w>XYkRm&EynpKK;caBu4EW(tx|U|Zk={6GNg1%f~b2m=wY4~POWAPyve zB#;98fi#c-2f#rf3l0G}urvQKPymWR2`B>|$z)4^TjKC>i3`~G2FasE14lKZFUY+d_hvkEk(%>>;2?1~%4~SPKIKPFDgkPZvfILlp!Gf}DgW;&K1kVJ9ENAe@F=h``iN{?88o n{EZ;Wh=Yg&?FT%A>ZVCMC+flB?wq)vxfLP3=%gh(Cz|{Z+Mbx1 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 f687e3f347f05d5c8ae37f0ca0b96fdb3013a184..68e6124aa0f75236ff12a451bd0923a7dfbebf09 100644 GIT binary patch delta 942 zcmW;FMN<_30EN+cf?c54-JOWtEn*k8Vt03of?XiksMy`l?hZ^;^fx%pxO3;h#hGt$ z7dIp8cdiUBg#|*3cPuzDDIyS)BfMyQTp%$nkS#|rE)eo3`Tv+0n-W4OImtzC@{pH& z1SKg&Y06NR za+Ie66{$pJs!)|`RHp_tsYPw-P?vhtrvVLVL}Rl5n-E1)n$esVw4@cSX+vAu(Vh-; zq!XR#LRY%cogPHflNfr@n?CfVAN?7?Kn5|GA;dD2VGL&kBN@eL#xRyR#xb4=Ok@(1 znZi`2F`XIAWEQiT!(8Sup9L&r5sO*EQkJot6|7_xt69TZ;#tRf5=dkN8`;EWwy>3L zY-a~M*+mk`>?Va&_OO?I?B@UnIYb(VIl@uWImU5LaFSD;<_u>!$9XPrkxN|W3Rk(t zb#4&kCbziF9qw|E`#j(wk9f=zp7M<6yx=9Tc+DH$@{SDN^MQ|i;xk{!g-5r>izd@bx=D`_1Jbbf< zo!L$M`YSAr^WlLke<%EmPmTygXG)Drhz%sg1~Oy{#Rf9}-uk~xib=^#7P1mXHnNk0 zoa7=mdB{sX!pTp8P)tg}s2?T|B}6<91R_J@6C)bR?fZfInl-Ft9qZY^ zMmDjTEhMv*ZKSZB9qeQmyV*l3d)dc+4seh|9Oei|ImU5LaFSD;<_u>!$9XPrkxN|W z3ReknjqBXtCbziF9qw|E`#j(wk9f=zp7M<6yx=9Tcug8_c*{H9^MQ|~^NG)V;Va)l K>A~-R;{O2w$PAMJ 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 940b0436ebf96309f2c7e72622ae016c367dbe41..d33d0c78731e2c967a3aaa9eeae214d46cc67f70 100644 GIT binary patch delta 6165 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 delta 6423 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 Y86^wK$Id8b%m)xpHn#Mg&M4LY0m*kU7ytkO 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