diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3894d4..7293104 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,13 +22,13 @@ jobs: # 安装依赖 - name: Install dependencies run: | - python -m pip install --upgrade pip pip install pyautogui pip install opencv-python - pip install pillow + pip install pygetwindow + pip install pyqt6 pip install pyinstaller # Build - - run: cd src && sh cmd_deploy.sh + - run: sh deploy.sh # Release - name: Create Release uses: ncipollo/release-action@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d55034..40f8717 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ -## [v0.5.0-beta.1](https://github.com/pcdd-group/LangrisserHelper/releases/tag/v0.5.0-beta.1) (2023-11-21) +## 2023-11-26 ### Features * 新增奖励内容截图功能 +* 新增扫荡金币功能 ### Bug Fixes @@ -11,6 +12,7 @@ ### Others +* 操作完成后回复窗口原尺寸 * 更换 logo * 重构 pyautogui_utils.click_gui() * 优化 reward.py \ No newline at end of file diff --git a/cmd_deploy.sh b/cmd_deploy.sh deleted file mode 100644 index ff70f20..0000000 --- a/cmd_deploy.sh +++ /dev/null @@ -1,28 +0,0 @@ -mkdir -p tmp -cp start_cmd.py ../assets/logo.ico tmp -cd tmp || exit - -# 使用Pyinstaller将.py打包成.exe,并且指定图标 -pyinstaller -F --icon=logo.ico start_cmd.py - -# 进入根目录 -cd ../.. -# 删除旧的打包目录 -rm -rf dist -# 创建新的打包目录 -mkdir -p dist/LangrisserHelper/src dist/LangrisserHelper/assets - -# 入口文件拷贝 -cp src/tmp/dist/start_cmd.exe dist/LangrisserHelper/src -# 示例图片拷贝 -cp -r assets/img dist/LangrisserHelper/assets - -cd dist || exit -# 打包目录 -tar cvf LangrisserHelper.tar.gz LangrisserHelper - -# 删除临时文件 -rm -rf ../src/tmp - -echo "打包完毕!" -pwd \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index 31f0c8a..790ef8d 100644 --- a/deploy.sh +++ b/deploy.sh @@ -6,12 +6,14 @@ cp -r assets dist cd dist -mkdir Langrisser-Helper +mkdir LangrisserHelper -cp -r assets Langrisser-Helper -cp app.exe Langrisser-Helper +cp -r assets LangrisserHelper +cp app.exe LangrisserHelper # 打包目录 -tar cvf Langrisser-Helper.tar.gz Langrisser-Helper +tar cvf LangrisserHelper.tar.gz LangrisserHelper -rm -rf Langrisser-Helper \ No newline at end of file +rm -rf LangrisserHelper + +echo "打包完毕!" \ No newline at end of file