Merge branch 'main' of github.com:MaaAssistantArknights/MAABH3

tools/CombatGenerator/README.md

@@ -1,14 +1,39 @@
 # CombatGenerator
 
+## 环境
+
+需要 `python` 环境
+
+## 依赖
+
+### ⚠️在.tools/CombatGenerator目录下执行所有命令
+
+(如果已经安装过pipx和pdm可以跳过直接使用pdm install)
+
+```shell
+python -m pip install pipx
+pipx ensurepath
+```
+
+重启终端
+
+```shell
+pipx install pdm
+pdm install
+```
+
 ## 使用
 
-    cd path/to/CombatGenerator
-    pip install pipx
-    pipx ensurepath
-    pipx install pdm
-    pdm install
+输入文件需预先保存到 `.tools/CombatGenerator/data/` 路径下,
+产物如果没有使用可选参数将会使用默认值保存在 `.tools/CombatGenerator/data/output.json` 路径下
+
+打开cmd, 执行以下命令
 
-重启终端后，直接运行`CombatGenerator`下`__init__.py`即可。
+```shell
+.venv\Scripts\Activate.ps1
+cd src/combatgenerator
+pdm run python __init__.py
+```
 
 ## 可选参数
 
@@ -28,7 +53,7 @@
 
 例如我想使用反序列器，传入路径为F:/1.json, 输出路径为F:/2.json
 
-    python __init__.py -r -i F:/1.json -o F:/2.json
+    pdm run python __init__.py -r -i F:/1.json -o F:/2.json
 
 ## input说明
 

tools/CropRoi/.gitignore

@@ -0,0 +1,163 @@
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+.pdm-python
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+

tools/CropRoi/README.md

@@ -0,0 +1,36 @@
+# 截图工具
+
+## 环境
+
+需要 `python` 环境
+
+## 依赖
+
+在./tools/CropRoi下执行以下命令
+
+(如果已经安装过pipx和pdm可以跳过直接使用pdm install)
+
+```shell
+python -m pip install pipx
+pipx ensurepath
+```
+
+重启终端
+
+```shell
+pipx install pdm
+pdm install
+```
+
+## 使用
+
+截图需预先保存到 `./src/` 路径下, 产物将会保存在 `./dst/` 路径下
+
+打开cmd, 执行以下命令
+
+```shell
+.venv\Scripts\Activate.ps1
+pdm run python main.py
+```
+
+在弹出窗口中使用鼠标左键画框, `s` 键保存, `q` 键退出

tools/CropRoi/pyproject.toml

@@ -0,0 +1,12 @@
+
+[project]
+# PEP 621 project metadata
+# See https://www.python.org/dev/peps/pep-0621/
+dependencies = [
+    "opencv-python>=4.5.3",
+]
+requires-python = ">=3.11"
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"

tools/CropRoi/requirements.txt

@@ -1 +1,5 @@
-opencv-python~=4.5.3
+# This file is @generated by PDM.
+# Please do not edit it manually.
+
+numpy==1.26.2
+opencv-python==4.8.1.78