修复死循环，日志读取优化，运行流程优化

AUTO_MAA.py

@@ -1,29 +1,76 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
 import sqlite3
 import subprocess
+import atexit
 import datetime
 import time
 import os
 from termcolor import colored
 
+#资源回收
+def cleanup():
+    if os.path.exists("state/BEGIN"):
+        os.remove("state/BEGIN")
+
 DATABASE="data/data.db"
-db=sqlite3.connect(DATABASE)
-cur=db.cursor()
-cur.execute("SELECT * FROM timeset WHERE True")
-timeset=cur.fetchall()
-timeset=[list(row) for row in timeset]
+
+#设置回调函数
+atexit.register(cleanup)
 while True:
-    curtime=datetime.datetime.now().strftime("%H:%M")
-    print(colored("当前时间："+curtime,'green'))
-    timenew=[]
-    timenew.append(curtime)
-    if timenew in timeset:
-        print(colored("开始执行",'yellow'))
-        maa=subprocess.Popen(["run.exe"])
-        maapid=maa.pid
-        while True:
-            if os.path.exists("OVER"):
-                os.system('taskkill /F /T /PID '+str(maapid))
-                os.remove("OVER")
-                print(colored("执行完毕",'yellow'))
-                break
-    time.sleep(1)
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
+    cur.execute("SELECT * FROM timeset WHERE True")
+    timeset=cur.fetchall()
+    cur.close()
+    db.close()
+    timeset=[list(row) for row in timeset]
+    timeset=[timeset[i][0] for i in range(len(timeset))]
+    for i in range(60):
+        #展示当前信息
+        curtime=datetime.datetime.now().strftime("%H:%M")
+        os.system('cls')
+        if len(timeset)!=0:
+            print(colored("设定时间："+'，'.join(timeset),'green'))
+        print(colored("当前时间："+curtime,'green'))
+        print(colored("运行日志：",'green'))
+        if os.path.exists("state/running"):
+            print(colored("正在运行代理",'yellow'))
+        elif os.path.exists("log.txt"):
+            with open("log.txt",'r',encoding="utf-8") as f:
+                linex=f.read()
+                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)
+            run=subprocess.Popen(["run.exe"])
+            runpid=run.pid
+            while True:
+                if os.path.exists("state/END"):
+                    os.system('taskkill /F /T /PID '+str(runpid))
+                    os.remove("state/END")
+                    break
+                time.sleep(1)
+            os.remove("state/BEGIN")
+        time.sleep(1)

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,26 +1,40 @@
 # AUTO_MAA
 MAA多账号管理与自动化软件
 
+!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/AUTO_MAA.png "软件图标")
+
 ----------------------------------------------------------------------------------------------
 
-## 免责声明
-本软件是一个外部工具，旨在优化MAA多账号功能体验。该软件包可以存储多账号数据，并通过修改MAA配置文件、读取MAA日志等行为自动完成多账号代理。
+## 重要声明
+本软件是一个外部工具，旨在优化MAA多账号功能体验。该软件包可以存储明日方舟多账号数据，并通过修改MAA配置文件、读取MAA日志等行为自动完成多账号代理。本开发团队承诺，不会修改明日方舟游戏本体与相关配置文件。
 
-This software is open source, free of charge and for learning and exchange purposes only. The developer team has the final right to interpret this project. All problems arising from the use of this software are not related to this project and the developer team. If you encounter a merchant using this software to practice on your behalf and charging for it, it may be the cost of equipment and time, etc. The problems and consequences arising from this software have nothing to do with it.
+本项目使用GPL开源，相关细则如下：
 
-本软件开源、免费，仅供学习交流使用。开发者团队拥有本项目的最终解释权。使用本软件产生的所有问题与本项目与开发者团队无关。若您遇到商家使用本软件进行代练并收费，可能是设备与时间等费用，产生的问题及后果与本软件无关。
+- **作者：** AUTO_MAA软件作者为DLmaster、DLmaster361或DLmaster_361，以上均指代同一人。
+- **使用：** AUTO_MAA使用者可以按自己的意愿自由使用本软件。依据GPL，对于由此可能产生的损失，AUTO_MAA项目组不负任何责任
+- **分发：** AUTO_MAA允许任何人自由分发本软件，包括进行商业活动牟利。但所有分发者必须遵循GPL向接收者提供本软件项目地址、完整的软件源码与GPL协议原文（件），违反者可能会被追究法律责任
+- **传播：** AUTO_MAA原则上允许传播者自由传播本软件。但由于软件性质，项目组不希望发现任何人在明日方舟官方媒体（包括官方媒体账号与森空岛社区等）或明日方舟游戏相关内容（包括同好群、线下活动与游戏内容讨论等）下提及AUTO_MAA或MAA，希望各位理解
+- **衍生：** AUTO_MAA允许任何人对软件本体或软件部分代码进行二次开发或利用。但依据GPL，相关成果也必须使用GPL开源
+- **授权：** 如果希望在使用AUTO_MAA的相关成果后仍保持自己的项目闭源，请在Issues中说明来意。得到项目组认可后，我们可以提供另一份使用不同协议的代码，此协议主要内容如下：被授权者可以自由使用该代码并维持闭源；被授权者必须定期为AUTO_MAA作出贡献
+- **贡献：** 不论是直接参与软件的维护编写，或是撰写文档、测试、反馈BUG、给出建议、参与讨论，都为AUTO_MAA项目的发展完善做出了不可忽视的贡献。项目组提倡各位贡献者遵照GitHub开源社区惯例，发布Issues参与项目。避免私信或私发邮件（安全性漏洞或敏感问题除外），以帮助更多用户
+
+以上细则是本项目对GPL的相关补充与强调。未提及的以GPL为准，发生冲突的以GPL为准。如有不清楚的部分，请发Issues询问。若发生纠纷，相关内容也没有在Issues上提及的，项目组拥有最终解释权
+
+**注意**
+- 由于本软件有修改其它目录JSON文件等行为，使用前请将AUTO_MAA添加入Windows Defender信任区以及防病毒软件的信任区或开发者目录，避免被误杀
+- 如程序无法正常启动，请删除`state`目录下所有文件后重试
 
 ## 安装与配置MAA
 
 本软件是MAA的外部工具，需要安装配置MAA后才能使用。
 
-#### MAA安装
+### MAA安装
 
 什么是MAA？    [官网](https://maa.plus/)/[GitHub](https://github.com/CHNZYX/Auto_Simulated_Universe/archive/refs/heads/main.zip)
 
 MAA下载地址    [GitHub下载](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
 
-#### MAA配置
+### MAA配置
 
 1.完成MAA的adb配置等基本配置
 
@@ -46,177 +60,185 @@ GitHub下载地址    [GitHub下载](https://github.com/DLmaster361/AUTO_MAA/rel
 
 ## 配置用户信息与相关参数
 
-注意：当前所有的密码输入部分都存在一点“小问题”，请在输入密码时避免输入Delete、F12、Tab等功能键。
+**注意：** 当前所有的密码输入部分都存在一点“小问题”，请在输入密码时避免输入Delete、F12、Tab等功能键。
 
 -------------------------------------------------
 
-#### 第一次启动
+### 第一次启动
 
-双击启动`manage.exe`，输入MAA所在文件夹路径并回车（注意使用斜杠的种类，不要使用反斜杠），然后设置管理密钥。
+双击启动`manage.exe`，输入MAA所在文件夹路径并回车（注意使用斜杠的种类，不要使用反斜杠），然后设置管理密钥（密钥可以包含字母大小写与特殊字符）。
 
-![信息配置1](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置1.png "MAA配置1")
+![信息配置1](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置1.png "信息配置1")
 
 管理密钥是解密用户密码的唯一凭证，与数据库绑定。密钥丢失或`data/key/`目录下任一文件损坏都将导致解密无法正常进行。
 
-本项目采用自主组建的混合加密模式，项目组也无法找回您的管理密钥或修复`data/key/`目录下的文件。如果不幸的事发生，建议您删除`data/data.db`重新录入信息。
+本项目采用自主开发的混合加密模式，项目组也无法找回您的管理密钥或修复`data/key/`目录下的文件。如果不幸的事发生，建议您删除`data/data.db`重新录入信息。
 
-当前暂不支持修改管理密钥，请等待后续更新。
-
-#### 添加用户
+### 添加用户
 
 输入“+”以开始添加用户。依次输入：
 
-用户名：管理用户的惟一凭证
+**用户名：** 管理用户的惟一凭证
 
-手机号码：允许隐去中间四位以“****”代替
+**手机号码：** 允许隐去中间四位以“****”代替
 
-代理天数：这个还要我解释吗？
+**代理天数：** 这个还要我解释吗？
 
-密码：警告！密码功能暂未开发，输入的信息会以明文存储，有泄露风险，请勿使用。可以用无意义的字符串代替。由于忽略警告导致的信息泄露，本项目组概不负责
+![信息配置2](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置2.png "信息配置2")
 
-![信息配置2](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置2.png "MAA配置2")
-
-#### 删除用户
+### 删除用户
 
 输入用户名+“-”以删除用户。格式：
 
-```plaintext
+```
 用户名 -
 ```
 
-![信息配置3](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置3.png "MAA配置3")
+![信息配置3](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置3.png "信息配置3")
 
-#### 配置用户状态
+### 配置用户状态
 
-启用代理：输入用户名+“y”以启用该用户的代理。格式：
+**启用代理：** 输入用户名+“y”以启用该用户的代理。格式：
 
-```plaintext
+```
 用户名 y
 ```
 
-![信息配置4](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置4.png "MAA配置4")
+![信息配置4](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置4.png "信息配置4")
 
-禁用代理：输入用户名+“n”以禁用该用户的代理。格式：
+**禁用代理：** 输入用户名+“n”以禁用该用户的代理。格式：
 
-```plaintext
+```
 用户名 n
 ```
 
-![信息配置5](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置5.png "MAA配置5")
+![信息配置5](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置5.png "信息配置5")
 
-#### 续期
+### 续期
 
 输入用户名+续期天数+“+”以延长该用户的代理天数。格式：
 
-```plaintext
+```
 用户名 续期天数 +
 ```
 
-![信息配置6](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置6.png "MAA配置6")
+![信息配置6](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置6.png "信息配置6")
 
-#### 修改刷取关卡
+### 修改刷取关卡
 
 输入用户名+关卡号+“~”以更改该用户的代理关卡。格式：
 
-```plaintext
+```
 用户名 关卡号 ~
 ```
 
-![信息配置7](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置7.png "MAA配置7")
+![信息配置7](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置7.png "信息配置7")
 
-特别的：
+**特别的：**
 
 你可以自定义关卡号替换方案。程序会读取`gameid.txt`中的数据，依据此进行关卡号的替换，便于常用关卡的使用。`gameid.txt`在初始已经存储了一些常用资源本的替代方案。
 
 ![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/gameid.png "gameid")
 
-#### 设置MAA路径
+### 设置MAA路径
 
 输入“/”+新的MAA文件夹路径以修改MAA安装位置的配置。格式：
 
-```plaintext
+```
 /新的MAA文件夹路径
 ```
 
-注意：‘/’与路径间没有空格，路径同样不能使用反斜杠
+**注意：** ‘/’与路径间没有空格，路径同样不能使用反斜杠
 
-![信息配置8](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置8.png "MAA配置8")
+![信息配置8](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置8.png "信息配置8")
 
-#### 设置启动时间
+### 设置启动时间
 
-添加启动时间：输入“:+”+时间以添加定时启动时间。格式：
+**添加启动时间：** 输入“:+”+时间以添加定时启动时间。格式：
 
-```plaintext
+```
 :+小时:分钟
 ```
 
-注意：所有输入间没有空格
+**注意：** 所有输入间没有空格
 
-![信息配置9](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置9.png "MAA配置9")
+![信息配置9](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置9.png "信息配置9")
 
-删除启动时间：输入“:-”+时间以删除定时启动时间。格式：
+**删除启动时间：** 输入“:-”+时间以删除定时启动时间。格式：
 
-```plaintext
+```
 :-小时:分钟
 ```
 
-注意：所有输入间没有空格
+**注意：** 所有输入间没有空格
 
-![信息配置10](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置10.png "MAA配置10")
+![信息配置10](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置10.png "信息配置10")
 
-#### 检索信息
+### 检索信息
 
-检索所有信息：`manage.exe`打开时会打印所有用户与配置信息。除此之外，你可以通过输入“all ?”以打印所有信息，如下：
+**检索所有信息：** `manage.exe`打开时会打印所有用户与配置信息。除此之外，你可以通过输入“all ?”以打印所有信息，如下：
 
-```plaintext
+```
 all ?
 ```
 
-![信息配置11](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置11.png "MAA配置11")
+![信息配置11](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置11.png "信息配置11")
 
-检索MAA路径：输入“maa ?”以检索MAA安装路径，如下：
+**检索MAA路径：** 输入“maa ?”以检索MAA安装路径，如下：
 
-```plaintext
+```
 maa ?
 ```
 
-![信息配置12](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置12.png "MAA配置12")
+![信息配置12](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置12.png "信息配置12")
 
-检索启动时间：输入“time ?”以检索定时启动的时间，如下：
+**检索启动时间：** 输入“time ?”以检索定时启动的时间，如下：
 
-```plaintext
+```
 time ?
 ```
 
-![信息配置13](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置13.png "MAA配置13")
+![信息配置13](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置13.png "信息配置13")
 
-检索指定用户：输入用户名+“?”以检索指定用户信息，如下：
+**检索指定用户：** 输入用户名+“?”以检索指定用户信息，如下：
 
-```plaintext
+```
 用户名 ?
 ```
 
-![信息配置14](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置14.png "MAA配置14")
+**注意：** 由于需要检索用户密码，每一次`manage.exe`启动后的首次查询需要验证管理密钥。为了方便操作，之后的查询不会再要求重复验证。因此，完成密码查询后，请及时关闭`manage.exe`。
 
-#### 退出
+![信息配置14](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置14.png "信息配置14")
+
+### 修改管理密钥
+
+输入“*”以开始修改管理密钥。依次输入：
+
+**旧管理密钥：** 当数据库中没有存储用户信息时，允许跳过验证直接配置新管理密钥
+
+**新管理密钥：** 请妥善保管，丢失无法找回。
+
+![信息配置15](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/信息配置15.png "信息配置15")
+
+### 退出
 
 输入“-”以退出`manage.exe`，如下：
 
-```plaintext
+```
 -
 ```
 
 ## 运行代理
 
-#### 直接运行
+### 直接运行
 
 双击`run.exe`直接运行 
 
-#### 定时运行
+### 定时运行
 
 双击`AUTO_MAA.exe`打开，不要关闭。它会读取设定时间，在该时刻自动运行
 
-注意：周一将自动进行剿灭代理
+**注意：** 将优先进行剿灭代理
 
 ## 关于
 
@@ -224,9 +246,9 @@ time ?
 
 ----------------------------------------------------------------------------------------------
 
-欢迎加入，欢迎反馈bug
+欢迎加入AUTO_MAA项目组，欢迎反馈bug
 
-QQ群：没有
+QQ群：暂时没有
 
 ----------------------------------------------------------------------------------------------
 
@@ -249,4 +271,4 @@ QQ群：没有
 
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=DLmaster361/AUTO_MAA&type=Date)](https://star-history.com/#DLmaster361/AUTO_MAA&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=DLmaster361/AUTO_MAA&type=Date)](https://star-history.com/#DLmaster361/AUTO_MAA&Date)

data/gameid.txt

@@ -1,5 +1,5 @@
 龙门币：CE-6
 技能：CA-5
 红票：AP-5
-经验：CA-5
+经验：LS-6
 剿灭模式：Annihilation

data/key/说明.txt

@@ -0,0 +1,3 @@
+管理密钥是解密用户密码的唯一凭证，与数据库绑定。密钥丢失或data/key/目录下任一文件损坏都将导致解密无法正常进行。
+
+本项目采用自主开发的混合加密模式，项目组也无法找回您的管理密钥或修复data/key/目录下的文件。如果不幸的事发生，建议您删除data/data.db重新录入信息。

manage.py

@@ -1,3 +1,23 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
 import sqlite3
 import datetime
 import msvcrt
@@ -36,7 +56,6 @@ def readpass(text):
             p+=typed.decode("utf-8")
             sys.stdout.write(typed.decode("utf-8"))
             sys.stdout.flush()
-        
     print('')
     return p
 
@@ -101,12 +120,51 @@ def decryptx(note,PASSWORD):
         private_key=RSA.import_key(private_key_pem)
         #使用RSA私钥解密数据
         decrypter=PKCS1_OAEP.new(private_key)
-        return decrypter.decrypt(note)
+        note=decrypter.decrypt(note)
+        return note.decode("utf-8")
+
+#修改管理密钥
+def changePASSWORD():
+    #获取用户信息
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
+    cur.execute("SELECT * FROM adminx WHERE True")
+    data=cur.fetchall()
+    cur.close()
+    db.close()
+    data=[list(row) for row in data]
+    global PASSWORD
+    #验证管理密钥
+    PASSWORDold=readpass("请输入旧管理密钥：")
+    if len(data)==0:
+        print("当前无用户，验证自动通过")
+        PASSWORDnew=readpass("请输入新管理密钥：")
+        getPASSWORD(PASSWORDnew)
+        PASSWORD=PASSWORDnew
+        return "管理密钥修改成功"
+    while decryptx(data[0][6],PASSWORDold)=="管理密钥错误":
+            print("管理密钥错误")
+            PASSWORDold=readpass("请输入旧管理密钥：")
+    print("验证通过")
+    #修改管理密钥
+    PASSWORDnew=readpass("请输入新管理密钥：")
+    #使用旧管理密钥解密
+    for i in range(len(data)):
+        data[i][6]=decryptx(data[i][6],PASSWORDold)
+    #使用新管理密钥重新加密
+    getPASSWORD(PASSWORDnew)
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
+    for i in range(len(data)):
+        cur.execute("UPDATE adminx SET password=? WHERE admin=?",(encryptx(data[i][6]),data[i][0]))
+        db.commit()
+    cur.close()
+    db.close()
+    PASSWORD=PASSWORDnew
+    return "管理密钥修改成功"
 
 #添加用户
 def add():
-    db=sqlite3.connect(DATABASE)
-    cur=db.cursor()
     adminx=input("用户名：")
     #用户名重复验证
     while search(adminx,0)=="":
@@ -118,6 +176,8 @@ def add():
     passwordx=readpass("密码：")
     passwordx=encryptx(passwordx)
     #应用更新
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
     cur.execute("INSERT INTO adminx VALUES(?,?,?,'y','2000-01-01',?,?)",(adminx,numberx,dayx,gamex,passwordx))
     db.commit()
     cur.close()
@@ -126,14 +186,12 @@ def add():
 
 #删除用户信息
 def delete(id):
-    db=sqlite3.connect(DATABASE)
-    cur=db.cursor()
     #检查用户是否存在
-    cur.execute("SELECT * FROM adminx WHERE admin=?",(id,))
-    data=cur.fetchall()
-    if len(data)==0:
+    if search(id,0)!="":
         return "未找到"+id
     #应用更新
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
     cur.execute("DELETE FROM adminx WHERE admin=?",(id,))
     db.commit()
     cur.close()
@@ -197,7 +255,7 @@ def search(id,book):
     db.close()
     data=[list(row) for row in data]
     if len(data)>0:
-        #转译执行情况、用户状态，对全部信息查询隐去密码
+        #转译执行情况、用户状态，对全部信息查询与无输出查询隐去密码
         curdate=datetime.date.today()
         curdate=curdate.strftime('%Y-%m-%d')
         for i in range(len(data)):
@@ -209,14 +267,14 @@ def search(id,book):
                 data[i][3]="启用"
             else:
                 data[i][3]="禁用"
-            if id=="all":
+            if id=="all" or book==0:
                 data[i][6]="******"
             else:
                 #解密
                 global PASSWORD
-                if PASSWORD==0:
-                    PASSWORD=input("请输入管理密钥：")
-                data[i][6]=decryptx(data[i][6],PASSWORD).decode("utf-8")
+                if PASSWORD==0 or decryptx(data[i][6],PASSWORD)=="管理密钥错误":
+                    PASSWORD=readpass("请输入管理密钥：")
+                data[i][6]=decryptx(data[i][6],PASSWORD)
         #制表输出
         if book==1:
             print('')
@@ -238,15 +296,13 @@ def renewal(readxx):
             dayp=int(readxx[i+1:])
             break
     #检查用户是否存在
+    if search(id,0)!="":
+        return "未找到"+id
+    #应用更新
     db=sqlite3.connect(DATABASE)
     cur=db.cursor()
     cur.execute("SELECT * FROM adminx WHERE admin=?",(id,))
     data=cur.fetchall()
-    if len(data)==0:
-        cur.close()
-        db.close()
-        return "未找到"+id
-    #应用更新
     cur.execute("UPDATE adminx SET day=? WHERE admin=?",(data[0][2]+dayp,id))
     db.commit()
     cur.close()
@@ -256,15 +312,11 @@ def renewal(readxx):
 #用户状态配置
 def turn(id,t):
     #检查用户是否存在
-    db=sqlite3.connect(DATABASE)
-    cur=db.cursor()
-    cur.execute("SELECT * FROM adminx WHERE admin=?",(id,))
-    data=cur.fetchall()
-    if len(data)==0:
-        cur.close()
-        db.close()
+    if search(id,0)!="":
         return "未找到"+id
     #应用更新
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
     cur.execute("UPDATE adminx SET status=? WHERE admin=?",(t,id))
     db.commit()
     cur.close()
@@ -283,13 +335,7 @@ def gameid(readxx):
             gamep=readxx[i+1:]
             break
     #检查用户是否存在
-    db=sqlite3.connect(DATABASE)
-    cur=db.cursor()
-    cur.execute("SELECT * FROM adminx WHERE admin=?",(id,))
-    data=cur.fetchall()
-    if len(data)==0:
-        cur.close()
-        db.close()
+    if search(id,0)!="":
         return "未找到"+id
     #导入与应用特殊关卡规则
     games={}
@@ -305,6 +351,8 @@ def gameid(readxx):
     if gamep in games:
         gamep=games[gamep]
     #应用更新
+    db=sqlite3.connect(DATABASE)
+    cur=db.cursor()
     cur.execute("UPDATE adminx SET game=? WHERE admin=?",(gamep,id))
     db.commit()
     cur.close()
@@ -385,7 +433,7 @@ if not os.path.exists(DATABASE):
     db.commit()
     cur.close()
     db.close()
-    PASSWORD=readpass("请设置管理密钥（密钥与数据库绑定且唯一不可变）：")
+    PASSWORD=readpass("请设置管理密钥（密钥与数据库绑定）：")
     getPASSWORD(PASSWORD)
 
 #初始界面
@@ -397,24 +445,26 @@ while True:
     read=input()
     if len(read)==0:
         print("无法识别的输入")
-    elif read[0]=='+':
+    elif read[0]=='+' and len(read)==1:
         print(add())
-    elif read[0]=='-':
-        exit()
+    elif read[0]=='-' and len(read)==1:
+        os._exit(0)
     elif read[0]=='/':
         print(setpath(read[1:]))
+    elif read[0]=='*' and len(read)==1:
+        print(changePASSWORD())
     elif read[0]==':' and (read[1]=='+' or read[1]=='-'):
         print(settime(read[1],read[2:]))
     else:
-        if read[-1]=='?':
+        if read[-1]=='?' and read[-2]==' ':
             print(search(read[:-2],1))
-        elif read[-1]=='+':
+        elif read[-1]=='+' and read[-2]==' ':
             print(renewal(read[:-2]))
-        elif read[-1]=='-':
+        elif read[-1]=='-' and read[-2]==' ':
             print(delete(read[:-2]))
-        elif read[-1]=='~':
+        elif read[-1]=='~' and read[-2]==' ':
             print(gameid(read[:-2]))
-        elif read[-1]=='y' or read[-1]=='n':
+        elif (read[-1]=='y' or read[-1]=='n') and read[-2]==' ':
             print(turn(read[:-2],read[-1]))
         else:
             print("无法识别的输入")

res/info.txt

@@ -0,0 +1,43 @@
+# UTF-8
+#
+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, 3, 0),
+    prodvers=(0, 0, 0, 0),
+    # Contains a bitmask that specifies the valid bits 'flags'r
+    mask=0x3f,
+    # Contains a bitmask that specifies the Boolean attributes of the file.
+    flags=0x0,
+    # The operating system for which this file was designed.
+    # 0x4 - NT and there is no need to change it.
+    OS=0x4,
+    # The general type of file.
+    # 0x1 - the file is an application.
+    fileType=0x1,
+    # The function of the file.
+    # 0x0 - the function is not defined for this fileType
+    subtype=0x0,
+    # Creation date and time stamp.
+    date=(0, 0)
+    ),
+  kids=[
+    VarFileInfo([VarStruct('Translation', [0, 1200])]), 
+    StringFileInfo(
+      [
+      StringTable(
+        '000004b0',
+        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),
+        StringStruct('CompanyName', 'AUTO_MAA Team'),
+        StringStruct('FileDescription', 'AUTO_MAA Component'),
+        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.3'),
+        StringStruct('Assembly Version', '2.1.3.0')])
+      ])
+  ]
+)

run.py

@@ -1,48 +1,102 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
 import os
+import sys
 import subprocess
+import atexit
 import sqlite3
 import datetime
 import time
 import json
 from termcolor import colored
 
-#判断MAA程序运行状态
-def ifoff():
-    while True:
-        time.sleep(10)
-        with open(logpath,'r',encoding='utf-8') as f:
-            logs=f.readlines()[-1:-10:-1]
-            log=''.join(logs)
-            print(colored('\n'.join(logs[::-1]),"green"))
-            if "任务已全部完成！" in log:
-                return True
-            elif ("请检查连接设置或尝试重启模拟器与 ADB 或重启电脑" in log) or ("已停止" in log):
-                return False
-
 #执行MAA任务
-def runmaa(tel,game,num=2):
+def runmaa(id,tel,game,num=3):
     #配置MAA运行参数
     with open(setpath,"r",encoding="utf-8") as f:
-        data = json.load(f)
+        data=json.load(f)
     data["Configurations"]["Default"]["Start.AccountName"]=tel[:3]+"****"+tel[7:]
-    week=str(datetime.datetime.now().strftime('%A'))
-    if week=="Monday":
-        data["Configurations"]["Default"]["MainFunction.Stage1"]="Annihilation"
-    else:
-        data["Configurations"]["Default"]["MainFunction.Stage1"]=game
+    data["Configurations"]["Default"]["MainFunction.Stage1"]="Annihilation"
+    data["Configurations"]["Default"]["Fight.RemainingSanityStage"]=game
+    data["Configurations"]["Default"]["Fight.UseRemainingSanityStage"]="True"
+    data["Configurations"]["Default"]["GUI.CustomStageCode"]="True"
     with open(setpath,"w",encoding="utf-8") as f:
         json.dump(data,f)
     #开始运行
     for i in range(num):
+        global idnew,idold,idfail,idall,logx,logi
+        #创建MAA任务
+        time.sleep(10)
         maa=subprocess.Popen([maapath])
         maapid=maa.pid
-        time.sleep(60)
-        if ifoff():
-            return True
+        #等待MAA启动
+        idsuccess=idnew+idold
+        idwait=[idx for idx in idall if not idx in idsuccess+idfail+[id]]
+        os.system('cls')
+        if i==0:
+            print(colored("正在代理：",'white')+colored(id,'blue'))
         else:
-            os.system('taskkill /F /T /PID '+str(maapid))
+            print(colored("正在代理：",'white')+colored(id,'light_blue'))
+        print(colored("等待代理：",'white')+colored('，'.join(idwait),'yellow'))
+        print(colored("代理成功：",'white')+colored('，'.join(idsuccess),'green'))
+        print(colored("代理失败：",'white')+colored('，'.join(idfail),'red'))
+        print(colored("运行日志：",'white')+colored("等待MAA初始化",'light_green'))
+        time.sleep(60)
+        #监测MAA运行状态
+        while True:
+            #打印基本信息
+            os.system('cls')
+            if i==0:
+                print(colored("正在代理：",'white')+colored(id,'blue'))
+            else:
+                print(colored("正在代理：",'white')+colored(id,'light_blue'))
+            print(colored("等待代理：",'white')+colored('，'.join(idwait),'yellow'))
+            print(colored("代理成功：",'white')+colored('，'.join(idsuccess),'green'))
+            print(colored("代理失败：",'white')+colored('，'.join(idfail),'red'))
+            print(colored("运行日志：",'white'))
+            #读取并保存MAA日志
+            with open(logpath,'r',encoding='utf-8') as f:
+                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)
+            #判断MAA程序运行状态
+            if ("任务已全部完成！" in log):
+                return True
+            elif ("请检查连接设置或尝试重启模拟器与 ADB 或重启电脑" in log) or ("已停止" in log) or ("MaaAssistantArknights GUI exited" in log) or timeout():
+                os.system('taskkill /F /T /PID '+str(maapid))
+                break
+            time.sleep(10)
     return False
 
+#检查是否超时
+def timeout():
+    global logx
+    log0=logx[0]
+    for i in range(len(logx)):
+        if logx[i]!=log0:
+            return False
+    return True
+
 #更新已完成用户的数据
 def updata(id):
     db=sqlite3.connect(DATABASE)
@@ -57,6 +111,19 @@ def updata(id):
     db.close()
     return 0
 
+#资源回收
+def cleanup():
+    if os.path.exists("state/RUNNING"):
+        os.remove("state/RUNNING")
+
+#读取运行情况
+if os.path.exists("state/RUNNING"):
+    os._exit(1)
+#标记当前正在运行
+with open("state/RUNNING","w",encoding="utf-8") as f:
+    print("RUNNING",file=f)
+#设置回调函数
+atexit.register(cleanup)
 #获取PATH与用户数据
 DATABASE="data/data.db"
 db=sqlite3.connect(DATABASE)
@@ -73,32 +140,39 @@ data=[list(row) for row in data]
 cur.close()
 db.close()
 #开始执行
-curdate=datetime.date.today()
-curdate=curdate.strftime('%Y-%m-%d')
+curdate=datetime.date.today().strftime('%Y-%m-%d')
+begintime=datetime.datetime.now().strftime("%H:%M")
 idnew=[]
 idold=[]
 idfail=[]
+idall=[data[i][0] for i in range(len(data))]
+LOGXLEN=60
+logx=['' for i in range(LOGXLEN)]
+logi=0
 for i in range(len(data)):
     if data[i][3]=='y' and data[i][4]!=curdate and data[i][2]>0:
-        book=runmaa(data[i][1],data[i][5])
+        book=runmaa(data[i][0],data[i][1],data[i][5])
         if book:
             updata(data[i][0])
             idnew.append(data[i][0])
-            print(colored("已完成"+data[i][0]+"今日的代理","yellow"))
         else:
             idfail.append(data[i][0])
-            print(colored("异常中止"+data[i][0]+"的代理","red"))
 for i in range(len(data)):
     if data[i][3]=='y' and data[i][4]==curdate and data[i][2]>0:
-        book=runmaa(data[i][1],data[i][5])
+        book=runmaa(data[i][0],data[i][1],data[i][5])
         if book:
             idold.append(data[i][0])
-            print(colored("已重复完成"+data[i][0]+"今日的代理","yellow"))
-with open("log.txt","w", encoding="utf-8") as f:
-    print("任务结束，已完成数："+str(len(idnew))+"，未完成数："+str(len(idfail))+"，重复执行数："+str(len(idold)),file=f)
+        else:
+            idall.remove(data[i][0])
+endtime=datetime.datetime.now().strftime("%H:%M")
+with open("log.txt","w",encoding="utf-8") as f:
+    print("任务开始时间："+begintime+"，结束时间："+endtime,file=f)
+    print("已完成数："+str(len(idnew))+"，未完成数："+str(len(idfail))+"，重复执行数："+str(len(idold)),file=f)
     if len(idfail)!=0:
         print("代理未完成的用户：",file=f)
     for i in range(len(idfail)):
         print(idfail[i],file=f)
-with open("OVER","w", encoding="utf-8") as f:
-    print("OVER",file=f)
+if os.path.exists("state/BEGIN"):
+    with open("state/END","w",encoding="utf-8") as f:
+        print("END",file=f)
+sys.exit(0)

state/说明.txt

@@ -0,0 +1 @@
+此文件夹内文件用于AUTO_MAA组件间的信息传递，如果遇到run.exe闪退或AUTO_MAA.exe一直显示“正在运行代理”，请尝试删除本文件夹下的所有文件。

toexe.py

@@ -1,5 +1,25 @@
+#   <AUTO_MAA:A MAA Multi Account Management and Automation Tool>
+#   Copyright © <2024> <DLmaster361>
+
+#   This file is part of AUTO_MAA.
+
+#   AUTO_MAA is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published
+#   by the Free Software Foundation, either version 3 of the License,
+#   or (at your option) any later version.
+
+#   AUTO_MAA is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty
+#   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+#   the GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with AUTO_MAA. If not, see <https://www.gnu.org/licenses/>.
+
+#   DLmaster_361@163.com
+
 import os
 
-os.system("pyinstaller -F -i res/AUTO_MAA.ico manage.py")
-os.system("pyinstaller -F -i res/AUTO_MAA.ico run.py")
-os.system("pyinstaller -F -i res/AUTO_MAA.ico AUTO_MAA.py")
+os.system("pyinstaller -F --version-file res/info.txt -i res/AUTO_MAA.ico manage.py")
+os.system("pyinstaller -F --version-file res/info.txt -i res/AUTO_MAA.ico run.py")
+os.system("pyinstaller -F --version-file res/info.txt -i res/AUTO_MAA.ico AUTO_MAA.py")

更新说明.txt

@@ -0,0 +1,3 @@
+项目初始阶段，不会提供专门的版本更新程序，您需要手动更新程序。
+v2.1.2版本的使用者，将旧版本data文件夹移动至新版本软件根目录下，覆盖掉预置文件，即可完成更新。（其它文件不需要动）
+新用户请忽略本说明。