diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..c3bee034
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "pip" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "weekly"
+ ignore:
+ - dependency-name: "polygon3"
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
deleted file mode 100644
index 3a66859d..00000000
--- a/.github/workflows/auto-merge.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Automerge
-
-on:
- pull_request:
- types:
- - labeled
- - unlabeled
- - synchronize
- - opened
- - edited
- - ready_for_review
- - reopened
- - unlocked
- pull_request_review:
- types:
- - submitted
- status:
- workflow_dispatch:
-
-jobs:
- auto-merge:
- runs-on: ubuntu-latest
- steps:
- - name: Automerge
- uses: 'pascalgn/automerge-action@v0.15.6'
- env:
- GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
- MERGE_LABELS: ''
diff --git a/.github/workflows/update_requirements.yml b/.github/workflows/update_requirements.yml
deleted file mode 100644
index 6c498cfe..00000000
--- a/.github/workflows/update_requirements.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: 更新依赖
-
-on:
- push:
- branches:
- - 2.0
- paths:
- - '**'
-
- workflow_dispatch:
-
-
-jobs:
- update:
- name: Update Map
- runs-on: windows-latest
- steps:
- - name: Checkout repo
- uses: actions/checkout@master
-
- - name: Setup python
- uses: actions/setup-python@v1
- with:
- python-version: 3.10.11
-
- - name: Update Requirements
- run: |
- pip install pipreqs
- pip install docopt
- pipreqs . --encoding=utf8 --force --mode=no-pin
- python map_res_list.py --type=replace --find_str=win32gui --replace_str=pywin32
- - name: Commit changes
- uses: EndBug/add-and-commit@v9.1.3
- with:
- author_name: github-actions[bot]
- author_email: github-actions[bot]@users.noreply.github.com
- message: ':wrench: 自动更新依赖'
- add: |
- 'requirements.txt'
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 35733ec2..b10de045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,8 @@ plugins/
StarRailAssistant_backup/
/*test*.py
/*map*.py
+new_cv_tools.py
+old_cv_tools.py
map_list.json
LICENSE
picture_list.json
diff --git a/Honkai_Star_Rail.py b/Honkai_Star_Rail.py
index 77659918..efcb912b 100644
--- a/Honkai_Star_Rail.py
+++ b/Honkai_Star_Rail.py
@@ -17,19 +17,18 @@
import tqdm
from docopt import docopt
-from questionary import ValidationError
from pluggy import PluginManager
from get_width import get_width
from utils.log import log, fight_log
-from utils.config import read_json_file, load_all_config_data, modify_json_file, add_key_value, read_maps, CONFIG_FILE_NAME, _
+from utils.config import read_json_file, load_all_config_data, modify_json_file, add_key_value, read_maps, CONFIG_FILE_NAME, sra_config_obj, _
from utils.simulated_universe import Simulated_Universe
from utils.update_file import update_file
from utils.commission import Commission
from utils.calculated import calculated
from utils.exceptions import Exception
from utils.map import Map as map_word
-from utils.requests import *
+from utils.requests import get
game_title = _("崩坏：星穹铁道")
plugins_path = "plugins"
@@ -51,19 +50,19 @@ def __init__(self) -> None:
'skip_verify': False,
'type': "star",
'version': "main",
- 'url_zip': f"https://github.com/{sra_config_obj.github_source}/StarRailAssistant/archive/refs/heads/main.zip",
+ 'url_zip': f"https://github.com/{sra_config_obj.github_source}/Auto_Star_Rail/archive/refs/heads/main.zip",
'unzip_path': ".",
'keep_folder': ['.git', 'logs', 'picture', 'map', 'tmp', 'venv'],
'keep_file': ['config.json', 'version.json', 'star_list.json', 'README_CHT.md', 'README.md'],
'zip_path': "StarRailAssistant-main/",
'name': _("脚本"),
- 'delete_file': False
+ 'delete_file': True
},
_("地图"):{
'skip_verify': False,
'type': "map",
'version': "map",
- 'url_zip': f"https://raw.githubusercontent.com/{sra_config_obj.github_source}/StarRailAssistant/map/map.zip",
+ 'url_zip': f"https://raw.githubusercontent.com/{sra_config_obj.github_source}/Auto_Star_Rail_MAP/main/map.zip",
'unzip_path': "map",
'keep_folder': [],
'keep_file': [],
@@ -75,7 +74,7 @@ def __init__(self) -> None:
'skip_verify': False,
'type': "picture",
'version': "map",
- 'url_zip': f"https://raw.githubusercontent.com/{sra_config_obj.github_source}/StarRailAssistant/map/picture.zip",
+ 'url_zip': f"https://raw.githubusercontent.com/{sra_config_obj.github_source}/Auto_Star_Rail_MAP/main/picture.zip",
'unzip_path': "picture",
'keep_folder': [],
'keep_file': [],
@@ -158,7 +157,7 @@ def select_map(main_map):
option_ = questionary.select(title_, list(options_map.keys())).ask()
side_map = options_map[option_]
presets_list = read_json_file(CONFIG_FILE_NAME).get("presets", [])
- presets_list = ['、'.join(i) for i in presets_list]
+ presets_list = ['、'.join(i) for i in sra_config_obj.presets]
choose_role = questionary.select(_("要使用的预设队伍:"), choices=presets_list).ask()
role_list = choose_role.split("、")
fate = [_('存护'), _('记忆'), _('虚无'), _('丰饶'), _('巡猎'), _('毁灭'), _('欢愉')]
@@ -185,7 +184,7 @@ def set_config(self, start = True):
sra_config_obj.language = options[option]
importlib.reload(utils.config)
title = _("请选择代理地址：（不使用代理选空白选项）")
- options = ['https://ghproxy.com/', 'https://ghproxy.net/', 'hub.fgit.ml', '']
+ options = ['https://ghproxy.com/', 'https://ghproxy.net/', '']
url_ms = []
pbar = tqdm.tqdm(total=len(options), desc=_('测速中'), unit_scale=True, unit_divisor=1024, colour="green")
for index,url in enumerate(options):
@@ -205,7 +204,7 @@ def set_config(self, start = True):
option = options[url_ms.index(questionary.select(title, url_ms).ask())]
sra_config_obj.github_proxy = option
title = _("请选择下载代理地址：（不使用代理选空白选项）")
- options = ['https://ghproxy.com/', 'https://ghproxy.net/', 'raw.fgit.ml', '']
+ options = ['https://ghproxy.com/', 'https://ghproxy.net/', '']
url_ms = []
pbar = tqdm.tqdm(total=len(options), desc=_('测速中'), unit_scale=True, unit_divisor=1024, colour="green")
for index,url in enumerate(options):
@@ -245,7 +244,7 @@ def set_config(self, start = True):
option = options[url_ms.index(questionary.select(title, url_ms).ask())]
sra_config_obj.apigithub_proxy = option
title = _("请选择你的仓库来源：")
- options = ["Starry-Wind", "Night-stars-1"]
+ options = ["Night-stars-1"]
option = questionary.select(title, options).ask()
sra_config_obj.github_source = option
while True:
@@ -293,7 +292,7 @@ def main(self, option:str=_('大世界'),start: str=None,role_list: str=None):
(start, role_list) = self.choose_map(option) if not start else (start, role_list)
if start:
log.info(_("脚本将自动切换至游戏窗口，请保持游戏窗口激活"))
- calculated(game_title, start=False).switch_window()
+ #calculated(game_title, start=False).switch_window()
time.sleep(0.5)
get_width(game_title)
#map_instance.calculated.CONFIG = read_json_file(CONFIG_FILE_NAME)
@@ -312,7 +311,7 @@ def main(self, option:str=_('大世界'),start: str=None,role_list: str=None):
raise Exception(role_list)
else:
log.info(_("脚本将自动切换至游戏窗口，请保持游戏窗口激活"))
- calculated(game_title, start=False).switch_window()
+ #calculated(game_title, start=False).switch_window()
time.sleep(0.5)
get_width(game_title)
#map_instance.calculated.CONFIG = read_json_file(CONFIG_FILE_NAME)
@@ -321,13 +320,10 @@ def main(self, option:str=_('大世界'),start: str=None,role_list: str=None):
self.option_dict[option]()
if __name__ == "__main__":
- join_time = read_json_file(CONFIG_FILE_NAME).get("join_time", {})
- if type(join_time) == dict:
- sra_config_obj.join_time = 9
sra = SRA()
try:
sra.set_config() # 无config直接更新时初始化config文件
- print(_("\033[0;31;40m星穹铁道小助手为开源项目，完全免费\n如果你是购买的那么你被骗了\n开源仓库地址: https://github.com/Starry-Wind/StarRailAssistant\033[0m"))
+ print(_("\033[0;31;40m星穹铁道小助手为开源项目，完全免费\n如果你是购买的那么你被骗了\n开源仓库地址: https://github.com/Night-stars-1/Auto_Star_Rail\033[0m"))
sra.load_plugin()
sra.run_plugins()
if not pyuac.isUserAdmin():
@@ -341,19 +337,14 @@ def select():
options[options.index(_('更新资源'))] = _("更新资源")+f"({','.join(need_updata)})"
option = questionary.select(title, options).ask()
option = list(sra.option_dict.keys())[options.index(option)]
- if option == _("更新资源"):
- sra.up_data()
- raise Exception(_("请重新运行"))
- elif option == _("编辑配置"):
- sra.set_config(False)
- elif option == None:
- ...
- else:
- if option:
- sra.main(option)
+ if option is not None:
+ if option == _("更新资源"):
+ sra.up_data()
+ raise Exception(_("请重新运行"))
+ elif option == _("编辑配置"):
+ sra.set_config(False)
else:
- if questionary.select(_("请问要退出脚本吗？"), [_("退出"), _("返回主菜单")]).ask() == _("返回主菜单"):
- select()
+ sra.main(option)
serial_map = args.get("--map") if args.get("--map") != "default" else "1-1_1" # 地图编号
select() if not serial_map else sra.main(start=serial_map)
sra.end()
diff --git a/LICENSE b/LICENSE
index 644e57a4..f288702d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,674 @@
-MIT License
-
-Copyright (c) 2023 Starry-Wind
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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:
+
+ Copyright (C)
+ 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
+.
+
+ 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
+.
diff --git a/README.md b/README.md
index 7200aa03..9f054699 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
* @Author: Night-stars-1 nujj1042633805@gmail.com
* @Date: 2023-06-15 19:31:43
* @LastEditors: Night-stars-1 nujj1042633805@gmail.com
- * @LastEditTime: 2023-10-01 22:41:43
+ * @LastEditTime: 2023-10-01 23:16:06
* @Description:
*
* Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
@@ -30,7 +30,7 @@ StarRailAssistan
## 界面展示
-
+
## 免责声明
diff --git a/get_width.py b/get_width.py
index 54eef031..855cfa7f 100644
--- a/get_width.py
+++ b/get_width.py
@@ -2,36 +2,32 @@
Author: Night-stars-1 nujj1042633805@gmail.com
Date: 2023-05-23 17:39:27
LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2023-07-14 22:44:33
+LastEditTime: 2023-08-01 21:07:06
Description:
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
'''
from ctypes import windll
-import pygetwindow as gw
-from PIL import ImageGrab
+import pywinctl as pwc # 跨平台支持
from utils.config import sra_config_obj, normalize_file_path, CONFIG_FILE_NAME
from utils.log import log
def get_width(title):
- window = gw.getWindowsWithTitle(title)[0]
- hwnd = window._hWnd
-
- # 获取活动窗口的大小
- window_rect = window.width, window.height
-
user32 = windll.user32
- desktop_width = user32.GetSystemMetrics(0)
- desktop_height = user32.GetSystemMetrics(1)
+ desktop_width = user32.GetSystemMetrics(0) # 显示器原始宽度
+ #desktop_height = user32.GetSystemMetrics(1)
#单显示器屏幕宽度和高度:
- img = ImageGrab.grab()
- width, height=img.size
-
+ window = pwc.getWindowsWithTitle(title)[0]
+ # 获取活动窗口的大小
+ window_rect = window.width, window.height
+ width, height = pwc.getScreenSize()# 显示器缩放后宽度
+ print(width)
+ print(desktop_width)
scaling = round(width/desktop_width*100)/100
- """
+ """
# 获取当前显示器的缩放比例
dc = win32gui.GetWindowDC(hwnd)
dpi_x = win32print.GetDeviceCaps(dc, win32con.LOGPIXELSX)
@@ -43,8 +39,8 @@ def get_width(title):
"""
# 计算出真实分辨率
- real_width = int(window_rect[0])
- real_height = int(window_rect[1])
+ real_width = int(window_rect[0]/scaling)
+ real_height = int(window_rect[1]/scaling)
borderless = True if real_width*scaling == 1920 else False
left_border = (real_width*scaling-1920)/2
up_border = (real_height*scaling-1080)-left_border
@@ -61,5 +57,5 @@ def get_width(title):
sra_config_obj.up_border = up_border
# 排除缩放干扰
- windll.user32.SetProcessDPIAware()
+ #user32.SetProcessDPIAware()
\ No newline at end of file
diff --git a/gui.py b/gui.py
index 2979a024..241dca68 100644
--- a/gui.py
+++ b/gui.py
@@ -2,7 +2,7 @@
Author: Night-stars-1 nujj1042633805@gmail.com
Date: 2023-05-29 16:54:51
LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2023-07-25 15:25:10
+LastEditTime: 2023-07-30 18:39:41
Description:
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
@@ -101,7 +101,7 @@ def add_log(message):
说明；
log在gui上输出
"""
- page.title = _("星穹铁道小助手-{VER}").format(VER=VER)
+ page.title = _("Auto_Star_Rail-{VER}").format(VER=VER)
log_text.controls.append(ft.Text(message[:-1]))
page.update()
@@ -150,10 +150,9 @@ def map_confirm(e):
page.vertical_alignment = "START"
page.horizontal_alignment = "START"
add(log_text)
- calculated(_("崩坏：星穹铁道")).switch_window()
+ #calculated(_("崩坏：星穹铁道"), start=False).switch_window()
time.sleep(0.5)
get_width(_("崩坏：星穹铁道"))
- import pyautogui # 缩放纠正
map_word().auto_map(start)
add(ft.ElevatedButton(_("返回"), on_click=to_page_main))
@@ -175,7 +174,7 @@ def word(e):
"""
page.clean()
add(
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(_("大世界"), size=30),
ft.Text(VER, size=20),
word_select_rg,
@@ -194,50 +193,7 @@ def updata(e):
rawghproxy = sra_config_obj.rawgithub_proxy
# asyncio.run(check_file(ghproxy, "map"))
# asyncio.run(check_file(ghproxy, "picture"))
- data = {
- _("脚本"):{
- 'url_proxy': ghproxy,
- 'raw_proxy': rawghproxy,
- 'skip_verify': False,
- 'type': "star",
- 'version': "main",
- 'url_zip': "https://github.com/Starry-Wind/StarRailAssistant/archive/refs/heads/main.zip",
- 'unzip_path': ".",
- 'keep_folder': ['.git', 'logs', 'picture', 'map', 'tmp', 'venv'],
- 'keep_file': ['config.json', 'version.json', 'star_list.json', 'README_CHT.md', 'README.md'],
- 'zip_path': "StarRailAssistant-main/",
- 'name': _("脚本"),
- 'delete_file': False
- },
- _("地图"):{
- 'url_proxy': ghproxy,
- 'raw_proxy': rawghproxy,
- 'skip_verify': False,
- 'type': "map",
- 'version': "map",
- 'url_zip': "https://raw.githubusercontent.com/Starry-Wind/StarRailAssistant/map/map.zip",
- 'unzip_path': "map",
- 'keep_folder': [],
- 'keep_file': [],
- 'zip_path': "map/",
- 'name': _("地图"),
- 'delete_file': True
- },
- _("图片"):{
- 'url_proxy': ghproxy,
- 'raw_proxy': rawghproxy,
- 'skip_verify': False,
- 'type': "picture",
- 'version': "map",
- 'url_zip': "https://raw.githubusercontent.com/Starry-Wind/StarRailAssistant/map/picture.zip",
- 'unzip_path': "picture",
- 'keep_folder': [],
- 'keep_file': [],
- 'zip_path': "map/",
- 'name': _("图片"),
- 'delete_file': True
- },
- }
+ data = sra.updata_dict
if not check_console:
del data[_("脚本")]
def add_updata_log(message):
@@ -253,7 +209,7 @@ def up_data(e):
page.clean()
up_close = ft.ElevatedButton(_("返回"), disabled=True, on_click=to_page_main)
add(
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(_("检查更新"), size=30),
ft.Text(VER, size=20),
ft.Column([ text, pb]),
@@ -265,7 +221,7 @@ def up_data(e):
Column.controls = [ft.ElevatedButton(i, on_click=up_data) for i in data]
page.clean()
add(
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(_("检查更新"), size=30),
ft.Text(VER, size=20),
Column,
@@ -289,9 +245,9 @@ def set_config(e):
fighting_list = [_('没打开'), _('打开了'), _('这是什么')]
fighting = fighting_list[sra_config_obj.auto_battle_persistence]
- github_proxy_list = ['https://ghproxy.com/', 'https://ghproxy.net/', 'hub.fgit.ml', "不设置代理"]
+ github_proxy_list = ['https://ghproxy.com/', 'https://ghproxy.net/', "不设置代理"]
github_proxy = sra_config_obj.github_proxy
- rawgithub_proxy_list = ['https://ghproxy.com/', 'https://ghproxy.net/', 'raw.fgit.ml', 'raw.iqiq.io', "不设置代理"]
+ rawgithub_proxy_list = ['https://ghproxy.com/', 'https://ghproxy.net/', 'raw.iqiq.io', "不设置代理"]
rawgithub_proxy = sra_config_obj.rawgithub_proxy
apigithub_proxy_list = ['https://github.srap.link/', "不设置代理"]
apigithub_proxy = sra_config_obj.apigithub_proxy
@@ -332,7 +288,7 @@ def set_config(e):
)
language_dd = ft.Dropdown(
label=_("游戏语言"),
- hint_text=_("设置星穹铁道小助手的语言"),
+ hint_text=_("设置Auto_Star_Rail的语言"),
options=[ft.dropdown.Option(i) for i in list(language_dict.keys())],
value=language,
width=200,
@@ -358,7 +314,7 @@ def save(e):
to_page_main(page)
page.clean()
add(
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(_("大世界"), size=30),
ft.Text(VER, size=20),
github_proxy_dd,
@@ -390,7 +346,7 @@ def about(e):
"""
page.clean()
add(
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(_("关于"), size=30),
ft.Text(VER, size=20),
ft.Text(get_mess(0), size=40, color=ft.colors.RED),
@@ -401,9 +357,9 @@ def about(e):
spans=[
ft.TextSpan(get_mess(2)),
ft.TextSpan(
- "https://github.com/Starry-Wind/StarRailAssistant",
+ "https://github.com/Night-stars-1/Auto_Star_Rail",
ft.TextStyle(decoration=ft.TextDecoration.UNDERLINE,color = ft.colors.BLUE),
- url="https://github.com/Starry-Wind/StarRailAssistant",
+ url="https://github.com/Night-stars-1/Auto_Star_Rail",
),
],
),
@@ -493,7 +449,7 @@ def on_window_event(e):
)
# %%
page.clean()
- page.title = _("星穹铁道小助手")
+ page.title = _("Auto_Star_Rail")
page.scroll = "AUTO"
page.theme = ft.Theme(font_family="Verdana")
page.vertical_alignment = "center"
@@ -514,7 +470,7 @@ def on_window_event(e):
}
button_dict = sra.run_plugins()[-1]
page_list = [
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(VER, size=20),
ft.ElevatedButton(_("大世界"), on_click=word),
#ft.ElevatedButton(_("模拟宇宙")),
@@ -524,7 +480,7 @@ def on_window_event(e):
]
if sra_config_obj.picture_version == "0" or sra_config_obj.map_version == "0":
page_list = [
- ft.Text(_("星穹铁道小助手"), size=50),
+ ft.Text(_("Auto_Star_Rail"), size=50),
ft.Text(VER, size=20),
ft.ElevatedButton(_("更新资源"), on_click=updata),
ft.ElevatedButton(_("编辑配置"), on_click=set_config),
diff --git a/model/cnocr/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-val-complete_match-epoch=0.9667-model.onnx b/model/cnocr/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-val-complete_match-epoch=0.9667-model.onnx
new file mode 100644
index 00000000..fab09104
Binary files /dev/null and b/model/cnocr/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-val-complete_match-epoch=0.9667-model.onnx differ
diff --git a/model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx b/model/cnocr/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx
similarity index 100%
rename from model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx
rename to model/cnocr/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx
diff --git a/model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx b/model/cnocr/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx
similarity index 100%
rename from model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx
rename to model/cnocr/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx
diff --git a/model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx b/model/cnocr/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx
similarity index 100%
rename from model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx
rename to model/cnocr/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx
diff --git a/model/label_cn.txt b/model/cnocr/label_cn.txt
similarity index 100%
rename from model/label_cn.txt
rename to model/cnocr/label_cn.txt
diff --git a/model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx b/model/cnstd/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx
similarity index 100%
rename from model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx
rename to model/cnstd/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx
diff --git a/model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx b/model/cnstd/1.2/ppocr/en_PP-OCRv3_det_infer.onnx
similarity index 100%
rename from model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx
rename to model/cnstd/1.2/ppocr/en_PP-OCRv3_det_infer.onnx
diff --git a/model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx b/model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx
deleted file mode 100644
index 03db25eb..00000000
Binary files a/model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx and /dev/null differ
diff --git a/requirements.txt b/requirements.txt
index 270b95f9..9a5092b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,16 +6,16 @@ numpy
packaging
protobuf
sympy
-whl\Polygon3-3.0.9-cp311-cp311-win_amd64.whl
+whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl
cnocr>=2.2.2.3
docopt
httpx
+httpx_socks
loguru
-opencv_contrib_python
opencv_python
Pillow
PyAutoGUI==0.9.53
-PyGetWindow
+pywinctl
pynput
pyuac
pywin32
@@ -23,8 +23,8 @@ questionary
tqdm
ultralytics
xpinyin
-whl\httpx_socks-0.7.7-py3-none-any.whl
+httpx_socks
flet
cryptography
pluggy
-httpcore==0.17.3
+httpcore
diff --git a/star_list.json b/star_list.json
index cd771947..a819c007 100644
--- a/star_list.json
+++ b/star_list.json
@@ -9,7 +9,7 @@
},
{
"path": "requirements.txt",
- "hash": "168bf19887a7da79ae637d9d7d7d3593"
+ "hash": "8ddf218f9469f91f0cb38ef37f281cd1"
},
{
"path": "get_width.py",
@@ -52,72 +52,9 @@
"hash": "fff249a0f8c75f5bc4f0f97c95880bd8"
},
{
- "path": "model/label_cn.txt",
+ "path": "model/cnocr/label_cn.txt",
"hash": "e3f7c9400f4379e05cadbbc8a43dda45"
- },
- {
- "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx",
- "hash": "72708a3ac241e25fefbc606832dc7529"
- },
- {
- "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx",
- "hash": "5732f8c84bd4cc0dab35094e7260f080"
- },
- {
- "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx",
- "hash": "332265c72378b39e83ced6b4e42954c4"
- },
- {
- "path": "model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx",
- "hash": "003da6ca16cae88c5270882fc5e7417b"
- },
- {
- "path": "model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx",
- "hash": "442ea7b4dabdbaec95af17a6d17c3503"
- },
- {
- "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx",
- "hash": "d661b811419ff7dde7eb8543690cdd2b"
- },
- {
- "path": "utils/calculated.py",
- "hash": "62c8e59e52c3c8afc738151f5ed14d26"
- },
- {
- "path": "utils/update_file.py",
- "hash": "4e4299b884808a778eba8acd3df47f5c"
- },
- {
- "path": "utils/exceptions.py",
- "hash": "77cc57669183fd844fbc2345fef88a3f"
- },
- {
- "path": "utils/record_v7.2.py",
- "hash": "cdb55d975f8d60af7fac1b3464eb18bf"
- },
- {
- "path": "utils/cv_tools.py",
- "hash": "2ff051a5ad70adfc3c673dd3f0810654"
- },
- {
- "path": "utils/map.py",
- "hash": "295b2c0f75d55c0857d78781a168330f"
- },
- {
- "path": "utils/old_cv_tools.py",
- "hash": "d58c447d88f7924704ddbc593985bf0b"
- },
- {
- "path": "utils/adb.py",
- "hash": "4a19acb6a8f259b2818172d4c3b5a1ba"
- },
- {
- "path": "utils/log.py",
- "hash": "172d7d4d63c1b3136c5600055e666967"
- },
- {
- "path": "utils/requests.py",
- "hash": "27952d3e76aca6502a540c69dbf58a2a"
+ }
},
{
"path": "utils/simulated_universe.py",
diff --git a/utils/adb.py b/utils/adb.py
index 1c7af4c7..5b45d99c 100644
--- a/utils/adb.py
+++ b/utils/adb.py
@@ -8,13 +8,16 @@
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
'''
import base64
+from subprocess import DEVNULL, run
+from typing import Any, Dict, Optional, Union
+
import cv2 as cv
import numpy as np
-from subprocess import run, DEVNULL
-from PIL import ImageGrab, Image
-from typing import Dict, Optional, Any, Union
+from PIL import Image, ImageGrab
+
from .log import log
+
class ADB:
def __init__(self, order="127.0.0.1:62001", adb_path="picture\\adb\\adb"):
"""
diff --git a/utils/calculated.py b/utils/calculated.py
index 3e86a070..4307b1ab 100644
--- a/utils/calculated.py
+++ b/utils/calculated.py
@@ -1,30 +1,32 @@
"""
系统控制项，以及玩家控制
"""
-import re
+import itertools
import os
+import re
import sys
import time
-import win32api
-import itertools
+from datetime import datetime
+from pathlib import Path
+from typing import Any, Dict, List, Literal, Optional, Tuple, Union
+
import cv2 as cv
import numpy as np
-import pygetwindow as gw
-
+import pywinctl as pwc # 跨平台支持
+import win32api
from cnocr import CnOcr
-from datetime import datetime
-from pathlib import Path
-from PIL import ImageGrab, Image
+from PIL import Image, ImageGrab
from pynput import mouse
+from pynput.keyboard import Controller as KeyboardController
+from pynput.keyboard import Key
from pynput.mouse import Controller as MouseController
-from pynput.keyboard import Controller as KeyboardController, Key
-from typing import Dict, Optional, Any, Union, Tuple, List, Literal
-from .config import sra_config_obj, CONFIG_FILE_NAME, get_file, _
+from .config import CONFIG_FILE_NAME, _, get_file, sra_config_obj
+from .cv_tools import CV_Tools, show_img
from .exceptions import Exception
from .log import log
-from .cv_tools import CV_Tools, show_img
-from .get_angle import Point
+
+#from .get_angle import Point
class calculated(CV_Tools):
@@ -43,7 +45,7 @@ def __init__(self, title=_("崩坏：星穹铁道"), det_model_name="ch_PP-OCRv3
self.DEBUG = sra_config_obj.debug
self.mouse = MouseController()
self.keyboard = KeyboardController()
- self.point = Point(title)
+ #self.point = Point(title)
self.pos = (100, 100)
@@ -52,7 +54,7 @@ def __init__(self, title=_("崩坏：星穹铁道"), det_model_name="ch_PP-OCRv3
dir = sys._MEIPASS
else:
dir = Path()
- self.ocr = CnOcr(det_model_name=det_model_name, rec_model_name=rec_model_name,det_root=os.path.join(dir, "model/cnocr"), rec_root=os.path.join(dir, "model/cnstd")) if not number else CnOcr(det_model_name=det_model_name, rec_model_name=rec_model_name,det_root="./model/cnocr", rec_root="./model/cnstd", cand_alphabet='0123456789')
+ self.ocr = CnOcr(det_model_name=det_model_name, rec_model_name=rec_model_name, rec_vocab_fp="model/cnocr/label_cn.txt", det_root=os.path.join(dir, "model/cnstd"), rec_root=os.path.join(dir, "model/cnocr")) if not number else CnOcr(det_model_name=det_model_name, rec_model_name=rec_model_name,det_root="./model/cnstd", rec_root="./model/cnocr", cand_alphabet='0123456789')
#self.ocr = CnOcr(det_model_name='db_resnet34', rec_model_name='densenet_lite_114-fc')
self.check_list = lambda x,y: re.match(x, str(y)) != None
self.compare_lists = lambda a, b: all(x <= y for x, y in zip(a, b))
@@ -282,14 +284,14 @@ def click_target(self, target_path: str, threshold, flag:bool=True, check:bool=F
"map_2-7": _("机械聚落"),
#"orientation_4": (79, 80), # _("仙舟「罗浮")
"map_3-1": _("流云渡"),
- "map_3-2": _("迥星港"),
+ "map_3-2": _("迴星港"),
"map_3-3": _("太卜司"),
"map_3-4": _("工造司"),
"map_3-5": _("丹鼎司"),
"map_3-6": _("鳞渊境"),
"change_team": _("更换队伍"),
}
-
+
if temp_name in temp_ocr:
log.info(temp_name)
if "orientation" in temp_name:
@@ -383,9 +385,9 @@ def click_target(self, target_path: str, threshold, flag:bool=True, check:bool=F
if ((time.time() - start_time > 15 and "point" not in temp_name) \
or (time.time() - start_time > 30 and "point" in temp_name)): #防止卡死.重启线程
log.info(_("传送识别超时"))
- self.keyboard.press(Key.esc)
- time.sleep(0.1)
- self.keyboard.release(Key.esc)
+ #self.keyboard.press(Key.esc)
+ #time.sleep(0.1)
+ #self.keyboard.release(Key.esc)
break
if flag == False:
break
@@ -417,72 +419,18 @@ def fighting(self):
return True
def check_fighting(self):
- while True:
- end_str = str(self.part_ocr((20,95,100,100)))
- if any(substring in end_str for substring in self.end_list):
- log.info(_("未在战斗状态"))
- break
- else:
- log.info(_("未知状态,可能遇袭处于战斗状态"))
- time.sleep(1) # 避免长时间ocr
-
- def fighting_old(self):
- """
- 说明：
- 攻击
- 参数：
- :param type: 类型 大世界/模拟宇宙
- """
- start_time = time.time()
- log.info(_("识别中"))
- #识别敌人
while True:
- if time.time() - start_time > 10: # 如果已经识别了10秒还未找到目标图片，则退出循环
- log.info(_("识别超时,此处可能漏怪!"))
- return False
- if self.scan_screenshot(self.attack,points=(3.75,5.5,11.6,23))["max_val"] > 0.97: #修改检测机制,精度更高
- self.click()
- time.sleep(0.3)
- doubt_time = time.time()
- log.info(_("监控疑问或警告"))
- while time.time() - doubt_time < 8:
- if self.scan_screenshot(self.doubt,points=(3.75,5.5,11.6,23))["max_val"] > 0.95 or self.scan_screenshot(self.warn,points=(3.75,5.5,11.6,23))["max_val"] > 0.95:
- log.info(_("识别到疑问或警告,等待怪物开战或反击"))
- self.click()
- time.sleep(1.5)
- log.info(_("识别反击"))
- result = self.scan_screenshot(self.finish,points=(0,95,100,100))
- if result["max_val"] < 0.95:
- break
- time.sleep(0.1)
- result = self.scan_screenshot(self.finish,points=(0,95,100,100))
- time.sleep(0.3)
- if result["max_val"] < 0.95:
- break
+ if (
+ self.compare_lists([0, 0, 222], self.get_pix_rgb(pos=(1435, 58))) and
+ self.compare_lists(self.get_pix_rgb(pos=(1435, 58)), [0, 0, 240]) and
+ self.compare_lists([20, 90, 80], self.get_pix_rgb(pos=(88, 979))) and
+ self.compare_lists(self.get_pix_rgb(pos=(88, 979)), [25, 100, 90])
+ ):
+ log.info(_("未在战斗状态"))
+ break
else:
- self.click()
- time.sleep(0.3)
- doubt_time = time.time() + 7
- log.info(_("监控疑问或警告!"))
- while time.time() < doubt_time:
- if self.scan_screenshot(self.doubt,pos=(3.75,5.5,11.6,23))["max_val"] > 0.95 or self.scan_screenshot(self.warn,pos=(3.75,5.5,11.6,23))["max_val"] > 0.95:
- log.info(_("识别到疑问或警告,等待怪物开战或反击"))
- self.click()
- time.sleep(1.5)
- log.info(_("识别反击"))
- break
- result = self.scan_screenshot(self.finish,points=(0,95,100,100))
- if result["max_val"] < 0.95:
- break
- time.sleep(0.1)
- result = self.scan_screenshot(self.finish,points=(0,95,100,100))
- time.sleep(0.3)
- if result["max_val"] < 0.95:
- break
- log.info(_("未发现敌人!"))
- return True
- time.sleep(2)
- self.wait_fight_end() # 无论是否识别到敌人都判断是否结束战斗，反正怪物袭击
+ log.info(_("未知状态,可能遇袭处于战斗状态"))
+ time.sleep(1) # 避免长时间ocr
def wait_fight_end(self, type=0):
"""
@@ -511,8 +459,12 @@ def wait_fight_end(self, type=0):
start_time = time.time() # 开始计算战斗时间
while True:
if type == 0:
- end_str = str(self.part_ocr((20,95,100,100)))
- if any(substring in end_str for substring in self.end_list):
+ if (
+ self.compare_lists([0, 0, 222], self.get_pix_rgb(pos=(1435, 58))) and
+ self.compare_lists(self.get_pix_rgb(pos=(1435, 58)), [0, 0, 240]) and
+ self.compare_lists([20, 90, 80], self.get_pix_rgb(pos=(88, 979))) and
+ self.compare_lists(self.get_pix_rgb(pos=(88, 979)), [25, 100, 90])
+ ):
log.info(_("完成自动战斗"))
break
elif type == 1:
@@ -558,13 +510,13 @@ def move(self, com: str = ["w","a","s","d","f"], sleep_time=1, map_name=""):
:param com: 键盘操作 wasdf
:param time 操作时间,单位秒
'''
- loc = self.get_loc(map_name=map_name)
+ loc = self.get_loc(map_name=map_name) if self.DEBUG else (0, 0)
+ log.info(loc)
if type(sleep_time) == list:
set_loc = sleep_time[1]
sleep_time = sleep_time[0]
self.move_com(com, sleep_time)
- loc = self.get_loc(map_name=map_name)
- log.debug(loc)
+ loc = self.get_loc(map_name=map_name) if self.DEBUG else (0, 0)
log.info(loc)
com_num = abs(loc[1] - set_loc[1])
if com_num > 16:
@@ -590,65 +542,6 @@ def move_com(self, com, sleep_time=1):
pass
self.keyboard.release(com)
- def path_move(self, path: List):
- '''
- 说明:
- 根据路径移动
- 参数:
- :param path: 路径列表
- '''
- fast_com = path.pop(0)
- com_data = []
- for com in path:
- if com[0]-fast_com[0] >= 0:
- if com[0]-fast_com[0] > com[1]-fast_com[1]:
- # <
- if com_data:
- if list(com_data[-1].keys())[0] == "a":
- com_data[-1]["a"] += 1
- else:
- com_data.append({"a": 1})
- else:
- com_data.append({"a": 1})
- #self.move("a", 1, platform)
- else:
- # /
- if com_data:
- if list(com_data[-1].keys())[0] == "w":
- com_data[-1]["w"] += 1
- else:
- com_data.append({"w": 1})
- else:
- com_data.append({"w": 1})
- #self.move("w", 1, platform)
- else:
- if com[0]-fast_com[0] > com[1]-fast_com[1]:
- # >
- if com_data:
- if list(com_data[-1].keys())[0] == "d":
- com_data[-1]["d"] += 1
- else:
- com_data.append({"d": 1})
- else:
- com_data.append({"d": 1})
- #self.move("d", 1, platform)
- else:
- # \
- if com_data:
- if list(com_data[-1].keys())[0] == "s":
- com_data[-1]["s"] += 1
- else:
- com_data.append({"s": 1})
- else:
- com_data.append({"s": 1})
- #self.move("s", 1, platform)
- fast_com = com
- com = ''
- log.info(com_data)
- for com in com_data:
- move_com = list(com.keys())[0]
- self.move(move_com, com[move_com])
-
def scroll(self, clicks: float):
"""
说明：
@@ -704,10 +597,10 @@ def part_ocr(self,points = (0,0,0,0), debug=False, only_white=False):
img_fp = self.remove_non_white_pixels(img_fp)
if debug:
show_img(img_fp)
- cv.imwrite("H://xqtd//xl//test.png",img_fp)
+ #cv.imwrite("H://xqtd//xl//test.png",img_fp)
x, y = width/100*points[0], length/100*points[1]
out = self.ocr.ocr(img_fp)
- data = {i['text']: (int(left+x+(i['position'][2][0]+i['position'][0][0])/2),int(top+y+(i['position'][2][1]+i['position'][0][1])/2)) for i in out}
+ data = {i['text'].replace(" ", ""): (int(left+x+(i['position'][2][0]+i['position'][0][0])/2),int(top+y+(i['position'][2][1]+i['position'][0][1])/2)) for i in out}
log.debug(data)
return data
@@ -738,9 +631,9 @@ def part_ocr_other(self,points = (0,0,0,0), debug=False, left=False):
x, y = width/100*points[0], length/100*points[1]
out = self.ocr.ocr(img_fp)
if left:
- data = {i['text']: (int(game_left+x+i['position'][0][0]), int(game_top+y+i['position'][0][1])) for i in out}
+ data = {i['text'].replace(" ", ""): (int(game_left+x+i['position'][0][0]), int(game_top+y+i['position'][0][1])) for i in out}
else:
- data = {i['text']: (int(game_left+x+(i['position'][2][0]+i['position'][0][0])/2),int(game_top+y+(i['position'][2][1]+i['position'][0][1])/2)) for i in out}
+ data = {i['text'].replace(" ", ""): (int(game_left+x+(i['position'][2][0]+i['position'][0][0])/2),int(game_top+y+(i['position'][2][1]+i['position'][0][1])/2)) for i in out}
log.debug(data)
return data
@@ -878,23 +771,6 @@ def wait_join(self):
return endtime
time.sleep(0.1)
- def switch_window(self, dt=0.1):
- ws = gw.getWindowsWithTitle(self.title)
- time.sleep(dt)
- if len(ws) >= 1 :
- for w in ws:
- # 避免其他窗口也包含崩坏：星穹铁道，比如正好开着github脚本页面
- # log.debug(w.title)
- if w.title == self.title:
- #client.Dispatch("WScript.Shell").SendKeys('%')
- self.keyboard.press(Key.right)
- self.keyboard.release(Key.right)
- w.activate()
- break
- else:
- log.info(_('没找到窗口{title}').format(title=self.title))
- time.sleep(dt)
-
def open_map(self, open_key):
while True:
self.keyboard.press(open_key)
@@ -917,9 +793,13 @@ def teleport(self, key, value, threshold=0.95):
time.sleep(1) # 等待进入入画
log.info(_("等待入画结束"))
time.sleep(0.3) # 缓冲
- while True:
- end_str = str(self.part_ocr((0,95,100,100)))
- if any(substring in end_str for substring in self.end_list):
+ while True:
+ if (
+ self.compare_lists([0, 0, 222], self.get_pix_rgb(pos=(1435, 58))) and
+ self.compare_lists(self.get_pix_rgb(pos=(1435, 58)), [0, 0, 240]) and
+ self.compare_lists([20, 90, 80], self.get_pix_rgb(pos=(88, 979))) and
+ self.compare_lists(self.get_pix_rgb(pos=(88, 979)), [25, 100, 90])
+ ):
log.info(_("完成入画"))
break
time.sleep(1.0) # 缓冲
@@ -949,62 +829,41 @@ def get_loc(self, map_name: str="", map_id: int=None):
返回:
(x, y)
"""
- if self.DEBUG:
- map_name2id = {
- "收容舱段": {
- "收容舱段-1": 1,
- "收容舱段-2": 6,
- },
- "城郊雪原": {
- "城郊雪原-1": 7,
- "城郊雪原-2": 7
- },
- "边缘道路": {
- "边缘道路-1": 51,
- "边缘道路-2": 8
- },
- "工造司": {
- "工造司-1": 9,
- "工造司-2": 9,
- "工造司-3": 9,
- "工造司-4": 9,
- "工造司-5": 9,
- "工造司-6": 9,
- },
- "丹鼎司": {
- "丹鼎司-1": 2,
- "丹鼎司-2": 3,
- "丹鼎司-3": 3,
- "丹鼎司-4": 3,
- "丹鼎司-5": 4,
- "丹鼎司-6": 4,
- },
- "鳞渊境":{
- "鳞渊境-1": 5,
- }
+ map_name2id = {
+ "铁卫禁区": {
+ "铁卫禁区-1": 7,
+ },
+ "丹鼎司": {
+ "丹鼎司-1": 2,
+ "丹鼎司-2": 3,
+ "丹鼎司-3": 3,
+ "丹鼎司-4": 3,
+ "丹鼎司-5": 4,
+ "丹鼎司-6": 4,
}
- map_id = map_name2id.get(map_name.split("-")[0], {}).get(map_name, None)
- if not map_id:
- return (0, 0)
- img = cv.imread(f"./picture/maps/{map_id}.png")
- template = self.take_screenshot((4,8,10,20))[0]
- #img = img[self.pos[1]-100:img.shape[0]] [124, 103, 102]
- max_scale_percent, max_val, max_loc, length, width = self.find_best_match(img, template, [100,150,5])
- #max_val, max_loc = match_scaled(img, template,2.09)
- #log.info(max_scale_percent)
- #log.info(max_val)
- '''
- if max_scale_percent in [102, 103]:
- max_loc = (max_loc[0] + int(width/2)+17, max_loc[1] + int(length/2))
- else:
- max_loc = (max_loc[0] + int(width/2)+10, max_loc[1] + int(length/2))
- '''
- max_loc = (max_loc[0] + width//2 + 6, max_loc[1] + length//2 + 1)
- cv.rectangle(img, max_loc, (max_loc[0] + 5, max_loc[1] + 5), (0, 255, 0), 2)
- show_img(img, not_close=1)
- #max_loc = (max_loc[0], max_loc[1] + self.pos[1]-100)
- self.pos = max_loc
- return max_loc
+ }
+ map_id = map_name2id.get(map_name.split("-")[0], {}).get(map_name, None)
+ if not map_id:
+ return (0, 0)
+ img = cv.imread(f"./picture/maps/{map_id}.png")
+ template = self.take_screenshot((2.194802494802495, 4.509276437847866, 12.445738045738045, 23.283858998144712))[0]
+ #img = img[self.pos[1]-100:img.shape[0]]
+ max_scale_percent, max_val, max_loc, length, width = self.find_best_match(img, template, [100, 105, 124, 125])
+ #max_val, max_loc = match_scaled(img, template,2.09)
+ #log.info(max_scale_percent)
+ #log.info(max_val)
+ '''
+ if max_scale_percent in [102, 103]:
+ max_loc = (max_loc[0] + int(width/2)+17, max_loc[1] + int(length/2))
+ else:
+ max_loc = (max_loc[0] + int(width/2)+10, max_loc[1] + int(length/2))
+ '''
+ max_loc = (max_loc[0] + width//2 + 6, max_loc[1] + length//2 + 1)
+ cv.rectangle(img, max_loc, (max_loc[0] + 5, max_loc[1] + 5), (0, 255, 0), 2)
+ show_img(img, not_close=1)
+ #max_loc = (max_loc[0], max_loc[1] + self.pos[1]-100)
+ self.pos = max_loc
+ return max_loc
def change_team(self):
"""
diff --git a/utils/commission.py b/utils/commission.py
index af86349d..0c6f5234 100644
--- a/utils/commission.py
+++ b/utils/commission.py
@@ -7,11 +7,14 @@
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
'''
-from utils.calculated import calculated
-from utils.log import log, _
-from pynput.keyboard import Key
import time
+from pynput.keyboard import Key
+
+from utils.calculated import calculated
+from utils.log import _, log
+
+
def get_percentile(rect, shape):
#获取长方形的相对坐标
x1,y1,x2,y2 = rect
diff --git a/utils/config.py b/utils/config.py
index e5d837e1..69047800 100644
--- a/utils/config.py
+++ b/utils/config.py
@@ -1,15 +1,15 @@
-import os
-import sys
-from typing import Any, get_type_hints, Union
-import orjson
import gettext
import inspect
-
+import os
+import sys
from pathlib import Path
+from typing import Any, Union, get_type_hints
+
+import orjson
from orjson import JSONDecodeError
-from .log import log
from .exceptions import TypeError
+from .log import log
CONFIG_FILE_NAME = "config.json"
@@ -66,8 +66,13 @@ def modify_json_file(filename: str, key, value):
# 先读，再写
data, file_path = read_json_file(filename, path=True)
data[key] = value
- with open(file_path, "wb") as f:
- f.write(orjson.dumps(data, option=orjson.OPT_PASSTHROUGH_DATETIME | orjson.OPT_SERIALIZE_NUMPY | orjson.OPT_INDENT_2))
+ try:
+ with open(file_path, "wb") as f:
+ f.write(orjson.dumps(data, option=orjson.OPT_PASSTHROUGH_DATETIME | orjson.OPT_SERIALIZE_NUMPY | orjson.OPT_INDENT_2))
+ except PermissionError as e:
+ import time
+ time.sleep(1)
+ modify_json_file(filename, key, value)
def get_file(path, exclude=[], exclude_file=None, get_path=False, only_place=False) -> list[str]:
@@ -244,7 +249,7 @@ class SRAData(metaclass=SRADataMeta):
rawgithub_proxy: str = ""
"""rawgithub代理"""
apigithub_proxy: str = ""
- """apigithub代理"""
+ """api代理"""
webhook_url: str = ""
"""webhook地址"""
start: bool = False
@@ -285,7 +290,7 @@ class SRAData(metaclass=SRADataMeta):
"""切换队伍的队伍编号"""
stop: bool = False
"""是否停止"""
- github_source: str = "Starry-Wind"
+ github_source: str = "Night-stars-1"
"""github仓库源"""
def __init__(self) -> None:
diff --git a/utils/cv_tools.py b/utils/cv_tools.py
index b9418a0b..1a3a8c2c 100644
--- a/utils/cv_tools.py
+++ b/utils/cv_tools.py
@@ -2,20 +2,21 @@
Author: Night-stars-1
Date: 2023-05-17 21:45:43
LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2023-07-26 16:29:08
+LastEditTime: 2023-09-08 21:09:08
Description: 一些cv工具
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
'''
import time
+
import cv2 as cv
import numpy as np
-import pygetwindow as gw
-
-from PIL import ImageGrab, Image
+import pywinctl as pwc # 跨平台支持
+from PIL import Image, ImageGrab
+from .config import _, sra_config_obj
from .log import log
-from .config import sra_config_obj, _
+
def show_img(img, scale=1, title='Image', not_close=False):
# cv.namedWindow('image', cv.WINDOW_NORMAL)
@@ -35,13 +36,14 @@ def show_imgs(imgs, title='Image'):
class CV_Tools:
def __init__(self, title=_("崩坏：星穹铁道")):
- self.window = gw.getWindowsWithTitle(title)
+ self.window = pwc.getWindowsWithTitle(title)
if not self.window:
raise Exception(_("你游戏没开，我真服了"))
self.window = self.window[0]
+ self.window.activate() # 将游戏调至前台
self.hwnd = self.window._hWnd
- def take_screenshot(self,points=(0,0,0,0)):
+ def take_screenshot(self,points=(0,0,0,0),sleep = 3):
"""
说明:
返回RGB图像
@@ -57,15 +59,20 @@ def take_screenshot(self,points=(0,0,0,0)):
else:
left, top, right, bottom = self.window.left+left_border, self.window.top+up_border, self.window.right-left_border, self.window.bottom-left_border
# log.info(f"{left}, {top}, {right}, {bottom}")
- game_img = ImageGrab.grab((left, top, right, bottom), all_screens=True)
- # game_img.save(f"logs/image/image_grab_{int(time.time())}.png", "PNG")
- game_width, game_length = game_img.size
- if points != (0,0,0,0):
- #points = (points[0], points[1]+5, points[2], points[3]+5)
- game_img = game_img.crop((game_width/100*points[0], game_length/100*points[1], game_width/100*points[2], game_length/100*points[3]))
- screenshot = np.array(game_img)
- screenshot = cv.cvtColor(screenshot, cv.COLOR_BGR2RGB)
- return (screenshot, left, top, right, bottom, game_width, game_length)
+ try:
+ game_img = ImageGrab.grab((left, top, right, bottom), all_screens=True)
+ # game_img.save(f"logs/image/image_grab_{int(time.time())}.png", "PNG")
+ game_width, game_length = game_img.size
+ if points != (0,0,0,0):
+ #points = (points[0], points[1]+5, points[2], points[3]+5)
+ game_img = game_img.crop((game_width/100*points[0], game_length/100*points[1], game_width/100*points[2], game_length/100*points[3]))
+ screenshot = np.array(game_img)
+ screenshot = cv.cvtColor(screenshot, cv.COLOR_BGR2RGB)
+ return (screenshot, left, top, right, bottom, game_width, game_length)
+ except OSError as e:
+ log.error("截图失败，是不是游戏最小化了？")
+ time.sleep(sleep)
+ return self.take_screenshot(points,sleep = min(sleep*2,600))
def match_scaled(self, img, template, scale, mask=False):
# 返回最大相似度，中心点x、y
@@ -88,14 +95,37 @@ def match_scaled(self, img, template, scale, mask=False):
return max_val, (int(x), int(y))
def mask_by_saturation(self, image):
+ # 将图像转换为灰度图
+ gray_image = cv.cvtColor(image, cv.IMREAD_COLOR)
+ gray_image = cv.cvtColor(gray_image, cv.COLOR_BGR2GRAY)
+ # 使用HoughCircles检测圆形
+ circles = cv.HoughCircles(gray_image, cv.HOUGH_GRADIENT, dp=1, minDist=50, param1=50, param2=30, minRadius=90, maxRadius=110)
+ # 如果找到了圆形
+ if circles is not None and len(circles) == 1:
+ circles = np.uint16(np.around(circles))
+ circle = circles[0, :][0]
+ center = (circle[0], circle[1])
+ radius = circle[2] - 5
+ # 在原始图像上绘制圆
+ height, width = image.shape[:2]
+ # 创建一个空白的黑色掩码
+ mask2 = np.zeros((height, width), dtype=np.uint8)
+ cv.circle(mask2, center, radius, 255, -1)
+ image = cv.bitwise_and(image, image, mask=mask2)
# 将图像转换为HSV色彩空间
hsv_image = cv.cvtColor(image,cv.COLOR_BGR2HSV)
+ #show_img(hsv_image)
# 获取饱和度通道
+ hue_channel = hsv_image[:, :, 0]
+ image_hue_channel = image[:, :, 0]
saturation_channel = hsv_image[:, :, 1]
+ value_channel = hsv_image[:, :, 2]
# 创建一个全透明的遮罩图像
mask = np.zeros_like(saturation_channel)
# 根据饱和度进行遮罩
- mask[saturation_channel < 25] = 255
+ mask[(saturation_channel < 25) & (image_hue_channel != 0)] = 255
+ #mask[(saturation_channel < 200) & (value_channel < 200) & ((hue_channel < 95) | (hue_channel > 105)) & (image_hue_channel != 0)] = 255
+ #mask[((hue_channel > 120) | (hue_channel < 100)) & (saturation_channel < 25) & (value_channel < 110) | ((saturation_channel <= 60) & (value_channel < 90)) | ((saturation_channel > 60) & (value_channel > 100) & (value_channel < 125))] = 255
return mask
def find_best_match(self, img, template, scale_range=(140, 170, 1)):
@@ -115,17 +145,17 @@ def find_best_match(self, img, template, scale_range=(140, 170, 1)):
width = 0
max_scale_percent = 0
# range(scale_range[0], scale_range[1],scale_range[2])
- for scale_percent in range(scale_range[0], scale_range[1],scale_range[2]):
+ for scale_percent in scale_range:
resized_template = cv.resize(template, (0,0), fx=scale_percent/100.0, fy=scale_percent/100.0)
mask = self.mask_by_saturation(resized_template)
- res = cv.matchTemplate(img, resized_template, cv.TM_CCORR_NORMED, mask=mask)
+ res = cv.matchTemplate(img, resized_template, cv.TM_CCOEFF_NORMED, mask=mask)
min_val, max_val, min_loc, max_loc = cv.minMaxLoc(res)
- log.info(f'正在匹配 {scale_percent}，相似度{max_val}')
+ #log.info(f'正在匹配 {scale_percent}，相似度{max_val}')
if max_val > max_corr:
max_scale_percent = scale_percent
length, width, __ = resized_template.shape
max_corr = max_val
- #if max_val > 10.95:
+ #if max_val > 0.95:
# break
return max_scale_percent, max_corr, max_loc, length, width
diff --git a/utils/exceptions.py b/utils/exceptions.py
index ae3ada4c..871d94fc 100644
--- a/utils/exceptions.py
+++ b/utils/exceptions.py
@@ -8,9 +8,11 @@
Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
'''
-from .log import log
import traceback
+from .log import log
+
+
class Exception(Exception):
def __init__(self, message):
diff --git a/utils/get_angle.py b/utils/get_angle.py
index d0800334..8a785e77 100644
--- a/utils/get_angle.py
+++ b/utils/get_angle.py
@@ -2,21 +2,21 @@
Author: Xe-No
Date: 2023-5-15 19:18:30
LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2023-07-24 19:31:39
+LastEditTime: 2023-08-01 20:07:58
Description:
Copyright (c) 2023 by Xe-No, All Rights Reserved.
'''
import time
+
import cv2 as cv
import numpy as np
-import pygetwindow as gw
-
-from PIL import ImageGrab, Image
+from PIL import Image, ImageGrab
-from .config import sra_config_obj, _
+from .config import _, sra_config_obj
from .cv_tools import CV_Tools, show_img
+
class Point(CV_Tools):
def __init__(self, title=_("崩坏：星穹铁道")):
super().__init__(title)
@@ -46,7 +46,7 @@ def get_angle(self):
w,h = [30,30]
# self.take_screenshot()[0] [y:y+h, x:x+w]
img = np.array(self.take_screenshot()[0])[y:y+h, x:x+w]
- #img = cv.cvtColor(img, cv.COLOR_RGB2BGR) # pyautogui截取的图为RGB
+ #img = cv.cvtColor(img, cv.COLOR_RGB2BGR)
hsv = cv.cvtColor(img, cv.COLOR_BGR2HSV)
# 定义青色掩膜
lower_cyan = np.array([78, 180, 180]) # 使用较高饱和度下界，过滤掉摄像头圆弧
@@ -54,9 +54,11 @@ def get_angle(self):
# lower_blue = np.array([100, 50, 50])
# upper_blue = np.array([130, 255, 255])
cyan_mask = cv.inRange(hsv, lower_cyan, upper_cyan)
+ show_img(cyan_mask, not_close=2000)
# 查找轮廓
contours, hierarchy = cv.findContours(cyan_mask, cv.RETR_EXTERNAL, cv.CHAIN_APPROX_SIMPLE)
# 暴力断定只有一个青色箭头，获取箭头顶点
+ print(len(contours))
if len(contours) != 1:
return None
contour = contours[0]
diff --git a/utils/map.py b/utils/map.py
index 20b99e17..625bac59 100644
--- a/utils/map.py
+++ b/utils/map.py
@@ -1,13 +1,15 @@
-import time
import threading
+import time
from pynput import keyboard
from .calculated import *
-from .config import get_file, sra_config_obj, read_json_file, read_maps, insert_key, CONFIG_FILE_NAME, _
-from .log import log, fight_log, set_log
+from .config import (CONFIG_FILE_NAME, _, get_file, insert_key, read_json_file,
+ read_maps, sra_config_obj)
+from .log import fight_log, log, set_log
from .requests import webhook_and_log
+
class Map:
def __init__(self,title = _("崩坏：星穹铁道")):
"""
@@ -42,7 +44,6 @@ def on_press(key):
with keyboard.Listener(on_press=on_press) as listener: # 创建按键监听线程
listener.join() # 等待按键监听线程结束
-
def map_init(self):
# 进行地图初始化，把地图缩小,需要缩小5次
target = cv.imread(f'./picture/pc/contraction.jpg')
@@ -66,18 +67,19 @@ def start_map(self, map, map_name):
# 开始寻路
log.info(_("开始寻路"))
for map_index, map in enumerate(map_data["map"]):
+ # map: 导航数据
self.calculated.monthly_pass()
log.info(_("执行{map_filename}文件:{map_index}/{map_data2} {map}").format(map_filename=map_filename,map_index=map_index+1,map_data2=len(map_data['map']),map=map))
key = list(map.keys())[0]
value = map[key]
- if key in ["w", "s", "a", "d"]:
+ if key in ["w", "s", "a", "d"]: # 移动
pos = self.calculated.move(key, value, map_name)
if self.DEBUG:
map_data["map"][map_index]["pos"] = pos
log.debug(map_data["map"])
- elif key == "f":
+ elif key == "f": # 交互
self.calculated.teleport(key, value)
- elif key == "mouse_move":
+ elif key == "mouse_move": # 移动鼠标
self.calculated.mouse_move(value)
elif key == "fighting":
if value == 1: # 进战斗
@@ -167,6 +169,7 @@ def start_map(self:Map, start, check:bool=False):
self.map_init()
else:
if "orientation" in key:
+ # 避免在目标星球时仍然选择星球
map_data = {
"map_1": "空间站",
"map_2": "雅利洛",
@@ -177,12 +180,13 @@ def start_map(self:Map, start, check:bool=False):
continue
else:
time.sleep(value)
- if check and "point" in key and map.split("_")[-1] != "1":
+ # TODO 地图选择改为检测状态
+ if check and "point" in key and map.split("_")[-1] != "1": # 捡漏时选择地图
self.calculated.click_target("picture\\orientation_1.jpg", 0.98, map=planet_number)
self.calculated.click_target("picture\\orientation_{num}.png".format(num=str(int(key.split("map_")[-1][0])+1)), 0.98, map=planet_number)
self.calculated.click_target(key.split("_point")[0], 0.98)
self.calculated.click_target(key, 0.98)
- elif not check and wrong_map and "point" in key and map.split("_")[-1] != "1":
+ elif not check and wrong_map and "point" in key and map.split("_")[-1] != "1": # 开始运行时选择地图
self.calculated.click_target("picture\\orientation_1.jpg", 0.98, map=planet_number)
self.calculated.click_target("picture\\orientation_{num}.png".format(num=str(int(key.split("map_")[-1][0])+1)), 0.98, map=planet_number)
self.calculated.click_target(key.split("_point")[0], 0.98)
diff --git a/utils/record_v7.2.py b/utils/record_v7.2.py
index 629df34f..a62f0fad 100644
--- a/utils/record_v7.2.py
+++ b/utils/record_v7.2.py
@@ -2,26 +2,26 @@
Author: AlisaCat
Date: 2023-05-07 21:45:43
LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2023-07-23 22:50:35
+LastEditTime: 2023-08-01 21:35:31
Description: wasd移动，x是进战斗，鼠标左键是打障碍物等，不要用鼠标移动视角，用方向键左右来移动视角（脚本运行后方向键左右会映射成鼠标）
F9停止录制并保存
Copyright (c) 2023 by AlisaCat, All Rights Reserved.
'''
-import os
import builtins
+import os
import time
from collections import defaultdict
from datetime import datetime
+
+import cv2 as cv
+import numpy as np
+import orjson
+import pyautogui # 缩放纠正
+import pywinctl as pwc # 跨平台支持
import win32api
import win32con
-import orjson
-import numpy as np
-import cv2 as cv
-import pyautogui # 缩放纠正
-import pygetwindow as gw
from PIL import ImageGrab
-from pynput import keyboard
-from pynput import mouse
+from pynput import keyboard, mouse
from pynput.mouse import Controller as mouseController
@@ -55,7 +55,7 @@ def timestamped_print(*args, **kwargs):
mouse_move_pos_list = []
-mouse_val = 100 # 每次视角移动距离
+mouse_val = 200 # 每次视角移动距离
save_name = datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
@@ -146,7 +146,7 @@ def take_screenshot(points=(0,0,0,0)):
borderless = read_json_file("config.json").get("borderless", False)
left_border = read_json_file("config.json").get("left_border", 11)
up_border = read_json_file("config.json").get("up_border", 56)
- window = gw.getWindowsWithTitle("崩坏：星穹铁道")[0]
+ window = pwc.getWindowsWithTitle("崩坏：星穹铁道")[0]
#points = (points[0]*1.5/scaling,points[1]*1.5/scaling,points[2]*1.5/scaling,points[3]*1.5/scaling)
if borderless:
left, top, right, bottom = window.left, window.top, window.right, window.bottom
diff --git a/utils/requests.py b/utils/requests.py
index 904449be..409cdbe8 100644
--- a/utils/requests.py
+++ b/utils/requests.py
@@ -7,16 +7,16 @@
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
'''
-import httpx
+from pathlib import Path
+from typing import Any, Dict, Optional, Tuple, Union
+
import flet as ft
+import httpx
import tqdm.asyncio
-
from httpx_socks import AsyncProxyTransport
-from pathlib import Path
-from typing import Dict, Optional, Any, Union, Tuple
+from .config import CONFIG_FILE_NAME, _, sra_config_obj
from .log import log
-from .config import sra_config_obj, CONFIG_FILE_NAME, _
proxies=sra_config_obj.proxies
transport = AsyncProxyTransport.from_url(proxies) if proxies else None
diff --git a/utils/simulated_universe.py b/utils/simulated_universe.py
index 937d6ba4..5afebd4f 100644
--- a/utils/simulated_universe.py
+++ b/utils/simulated_universe.py
@@ -7,27 +7,30 @@
Copyright (c) 2023 by Night-stars-1, All Rights Reserved.
'''
+import math
import os
import re
-import math
-import cn2an
-import questionary
-import pygetwindow as gw
-
from copy import deepcopy
-from xpinyin import Pinyin
-from questionary import Validator, ValidationError
+from threading import Thread
from typing import List
+
+import cn2an
+import pywinctl as pwc # 跨平台支持
+import questionary
from pynput.keyboard import Controller as KeyboardController
-from threading import Thread
-#from ultralytics.nn.tasks import atpicturet_load_weights
+from questionary import ValidationError, Validator
+from xpinyin import Pinyin
+#from .yolo import predict
+from .adb import ADB
from .calculated import *
-from .config import get_file, read_json_file, modify_json_file, CONFIG_FILE_NAME, _
+from .config import (CONFIG_FILE_NAME, _, get_file, modify_json_file,
+ read_json_file)
from .log import log
from .requests import webhook_and_log
-#from .yolo import predict
-from .adb import ADB
+
+#from ultralytics.nn.tasks import atpicturet_load_weights
+
class Simulated_Universe:
def __init__(self, title = _("崩坏：星穹铁道")):
@@ -36,7 +39,7 @@ def __init__(self, title = _("崩坏：星穹铁道")):
:param platform: 运行设备
"""
self.open_map = read_json_file(CONFIG_FILE_NAME).get("open_map", "m")
- self.window = gw.getWindowsWithTitle(_('崩坏：星穹铁道'))[0]
+ self.window = pwc.getWindowsWithTitle(_('崩坏：星穹铁道'))[0]
self.hwnd = self.window._hWnd
self.map_list = []
self.map_list_map = {}
diff --git a/utils/update_file.py b/utils/update_file.py
index cf41f639..16af63a9 100644
--- a/utils/update_file.py
+++ b/utils/update_file.py
@@ -8,22 +8,23 @@
Copyright (c) 2023 by AlisaCat, All Rights Reserved.
"""
-import os
-import time
-import shutil
import asyncio
import hashlib
-import flet as ft
-
+import os
+import shutil
+import time
from pathlib import Path
+from typing import Any, Dict, List, Optional, Tuple, Union
+from zipfile import BadZipFile, ZipFile
+
+import flet as ft
from tqdm import tqdm as tq
-from zipfile import ZipFile, BadZipFile
-from typing import Dict, Optional, Any, Union, Tuple, List
+from .config import (CONFIG_FILE_NAME, _, get_file, normalize_file_path,
+ sra_config_obj)
+from .exceptions import Exception
from .log import log
from .requests import *
-from .exceptions import Exception
-from .config import normalize_file_path, sra_config_obj, get_file, CONFIG_FILE_NAME, _
tmp_dir = "tmp"
@@ -211,13 +212,13 @@ async def is_latest(self, type: str, version: str, is_log: bool = True):
:param version: 版本验证地址/仓库分支名称 map
"""
raw_proxy = sra_config_obj.rawgithub_proxy
- url_version = f"{raw_proxy}https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/{version}/version.json" if "http" in raw_proxy or raw_proxy == "" else f"https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/{version}/version.json".replace("raw.githubusercontent.com", raw_proxy)
log.info(_("[资源文件更新]正在检查远程版本是否有更新...")) if is_log else None
local_version = sra_config_obj.get_config(f"{type}_version") # read_json_file(CONFIG_FILE_NAME).get(f"{type}_version", "0")
if type == "star":
return await self.is_sra_latest(type, version, is_log)
for index, __ in enumerate(range(3)):
try:
+ url_version = f"{raw_proxy}https://raw.githubusercontent.com/Night-stars-1/Auto_Star_Rail_MAP/main/version.json" if "http" in raw_proxy or raw_proxy == "" else f"https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/{version}/version.json".replace("raw.githubusercontent.com", raw_proxy)
remote_version = await get(url_version, timeout=2)
remote_version = remote_version.json()["version"]
break
@@ -275,8 +276,10 @@ async def update_file(self,
url_proxy = sra_config_obj.github_proxy
raw_proxy = sra_config_obj.rawgithub_proxy
url_zip = url_proxy+url_zip if "http" in url_proxy or url_proxy == "" else url_zip.replace("github.com", url_proxy)
- url_list = f"{raw_proxy}https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/{version}/{type}_list.json" if "http" in raw_proxy or raw_proxy == "" else f"https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/{version}/{type}_list.json".replace("raw.githubusercontent.com", raw_proxy)
-
+ if type == "star":
+ url_list = f"{raw_proxy}https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/main/{type}_list.json" if "http" in raw_proxy or raw_proxy == "" else f"https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant/main/{type}_list.json".replace("raw.githubusercontent.com", raw_proxy)
+ else:
+ url_list = f"{raw_proxy}https://raw.githubusercontent.com/Night-stars-1/Auto_Star_Rail_MAP/main/{type}_list.json" if "http" in raw_proxy or raw_proxy == "" else f"https://raw.githubusercontent.com/{self.github_source}/StarRailAssistant_MAP/main/{type}_list.json".replace("raw.githubusercontent.com", raw_proxy)
#tmp_zip = os.path.join(tmp_dir, f"{type}.zip")
tmp_zip = Path() / tmp_dir / f"{type}.zip"
if not os.path.exists(tmp_dir):
diff --git a/version.json b/version.json
index 4990da43..3318a057 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20231001231335"}
\ No newline at end of file
+{"version": "20231001231335"}