升级CI到python 3.12 (#21)

Signed-off-by: Zhou Qiankang <wszqkzqk@qq.com>

.github/workflows/build-pr.yml

@@ -0,0 +1,142 @@
+name: "Build for PR"
+
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+
+jobs:
+  windows:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python_version:
+            - "3.12"
+    name: Windows Python ${{ matrix.python_version }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Use Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: 🧳 Install dependencies
+        run: |
+          echo y | pip install --no-python-version-warning --disable-pip-version-check pyinstaller
+          echo y | pip install --no-python-version-warning --disable-pip-version-check nuitka
+          echo y | pip install --no-python-version-warning --disable-pip-version-check zstandard
+          echo y | pip install --no-python-version-warning --disable-pip-version-check pygame
+          echo y | pip install --no-python-version-warning --disable-pip-version-check ordered-set
+
+      # 使用pyinstaller构建
+      - name: Build pypvz with pyinstaller
+        run: |
+          pyinstaller -F pypvz.py `
+                  -n pypvz-with-python${{ matrix.python_version }}-pyinstaller-x64.exe `
+                  --distpath ./out `
+                  --noconsole `
+                  --add-data="resources;./resources" `
+                  --add-data="pypvz-exec-logo.png;./pypvz-exec-logo.png" `
+                  -i ./pypvz.ico
+
+      - name: Release the version built by pyinstaller
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          tag: Dev.Version.Built.with.Pyinstaller
+          artifacts: ./out/*pyinstaller*.exe
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      # 使用Nuitka构建
+      - name: Show nuitka version
+        run: |
+          Get-ChildItem env:
+          python -m nuitka --version
+
+      - name: Build pypvz with Nuitka
+        run: |
+          echo y | python -m nuitka --standalone `
+                  --onefile `
+                  --show-progress `
+                  --show-memory `
+                  --output-dir=out `
+                  --windows-icon-from-ico=pypvz.ico `
+                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libogg-0.dll=libogg-0.dll `
+                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libopus-0.dll=libopus-0.dll `
+                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libopusfile-0.dll=libopusfile-0.dll `
+                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libjpeg-9.dll=libjpeg-9.dll `
+                  --include-data-dir=resources=resources `
+                  --windows-disable-console `
+                  -o pypvz-with-python${{ matrix.python_version }}-nuitka-windows-x64.exe `
+                  pypvz.py
+
+      - name: Release the version built by nuitka
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          tag: Dev
+          artifacts: ./out/*nuitka*.exe
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python_version:
+            - "3.12"
+    name: Ubuntu Python ${{ matrix.python_version }}
+    steps:
+      - name: 🛎️ Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: 🐍 Use Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: 🧳 Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install patchelf gdb ccache libfuse2 zstd tar
+          python -m pip install --no-python-version-warning --disable-pip-version-check zstandard appdirs ordered-set tqdm Jinja2
+          python -m pip install --no-python-version-warning --disable-pip-version-check nuitka
+          python -m pip install --no-python-version-warning --disable-pip-version-check pygame
+
+      # 使用Nuitka构建
+      - name: Show nuitka version
+        run: |
+          env
+          python -m nuitka --version
+
+      - name: Build pypvz with Nuitka
+        run: |
+          yes | python -m nuitka \
+                --onefile \
+                --standalone \
+                --include-data-dir=resources=resources \
+                --linux-onefile-icon=pypvz.png \
+                --static-libpython=no \
+                --remove-output \
+                -o pypvz-with-python${{ matrix.python_version }}-linux-x86_64.bin \
+                pypvz.py
+
+      - name: Release the version built by nuitka
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          tag: Dev
+          artifacts: ./pypvz*-x86_64.*
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -5,7 +5,6 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  pull_request:
   push:
     branches:
       - master
@@ -17,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         python_version:
-            - '3.10'
+            - "3.12"
     name: Windows Python ${{ matrix.python_version }}
     steps:
       - uses: actions/checkout@v2
@@ -40,7 +39,7 @@ jobs:
       # 使用pyinstaller构建
       - name: Build pypvz with pyinstaller
         run: |
-          pyinstaller -F main.py `
+          pyinstaller -F pypvz.py `
                   -n pypvz-with-python${{ matrix.python_version }}-pyinstaller-x64.exe `
                   --distpath ./out `
                   --noconsole `
@@ -70,22 +69,15 @@ jobs:
                   --show-memory `
                   --output-dir=out `
                   --windows-icon-from-ico=pypvz.ico `
-                  --include-data-dir=resources=resources `
                   --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libogg-0.dll=libogg-0.dll `
                   --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libopus-0.dll=libopus-0.dll `
                   --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libopusfile-0.dll=libopusfile-0.dll `
-                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libvorbisfile-3.dll=libvorbisfile-3.dll `
-                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libvorbis-0.dll=libvorbis-0.dll `
+                  --include-data-file=c:\hostedtoolcache\windows\python\${{ matrix.python_version }}*\x64\lib\site-packages\pygame\libjpeg-9.dll=libjpeg-9.dll `
+                  --include-data-dir=resources=resources `
                   --windows-disable-console `
-                  -o ./out/pypvz-with-python${{ matrix.python_version }}-nuitka-msvc-x64.exe `
-                  main.py
+                  -o pypvz-with-python${{ matrix.python_version }}-nuitka-windows-x64.exe `
+                  pypvz.py
 
-      # artifact压缩包处上传包含exe和运行环境的文件夹
-      - name: "Upload binaries"
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifact-python-${{ matrix.python_version }}
-          path: ./out/*.dist
 
       - name: Release the version built by nuitka
         uses: ncipollo/release-action@v1
@@ -94,3 +86,56 @@ jobs:
           tag: Latest
           artifacts: ./out/*nuitka*.exe
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python_version:
+            - "3.12"
+    name: Ubuntu Python ${{ matrix.python_version }}
+    steps:
+      - name: 🛎️ Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: 🐍 Use Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: 🧳 Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install patchelf gdb ccache libfuse2 zstd tar
+          python -m pip install --no-python-version-warning --disable-pip-version-check zstandard appdirs ordered-set tqdm Jinja2
+          python -m pip install --no-python-version-warning --disable-pip-version-check nuitka
+          python -m pip install --no-python-version-warning --disable-pip-version-check pygame
+
+      # 使用Nuitka构建
+      - name: Show nuitka version
+        run: |
+          env
+          python -m nuitka --version
+
+      - name: Build pypvz with Nuitka
+        run: |
+          yes | python -m nuitka \
+                --onefile \
+                --standalone \
+                --include-data-dir=resources=resources \
+                --linux-onefile-icon=pypvz.png \
+                --static-libpython=no \
+                --remove-output \
+                -o pypvz-with-python${{ matrix.python_version }}-linux-x86_64.bin \
+                pypvz.py
+
+      - name: Release the version built by nuitka
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          tag: Latest
+          artifacts: ./pypvz*-x86_64.*
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,9 +1,14 @@
 # 忽略构建内容
 out/
-build/
+test-build/
+release/
 # 忽略调试内容
 .vscode/
+# 忽略 Pycharm 项目文件
+.idea/
 __pycache__/
 */__pycache__/
 # 忽略测试文件
-test.py
+test*.py
+# uv 管理的虚拟环境
+.venv

.python-version

@@ -0,0 +1 @@
+3.12

README.md

@@ -4,36 +4,65 @@
 
 **本项目为个人python语言学习的练习项目，仅供个人学习和研究使用，不得用于其他用途。如果这个游戏侵犯了版权，请联系我删除**
 
-* 已有的植物：向日葵，豌豆射手，坚果墙，寒冰射手，樱桃炸弹，双发射手，三线射手，大嘴花，小喷菇，土豆雷，地刺，胆小菇，倭瓜，火爆辣椒，阳光菇，寒冰菇，魅惑菇，火炬树桩，睡莲，杨桃，咖啡豆，海蘑菇，高坚果，缠绕水草，毁灭菇，墓碑吞噬者，大喷菇，大蒜
+* 已有的植物：向日葵，豌豆射手，坚果墙，寒冰射手，樱桃炸弹，双发射手，三线射手，大嘴花，小喷菇，土豆雷，地刺，胆小菇，倭瓜，火爆辣椒，阳光菇，寒冰菇，魅惑菇，火炬树桩，睡莲，杨桃，咖啡豆，海蘑菇，高坚果，缠绕水草，毁灭菇，墓碑吞噬者，大喷菇，大蒜，南瓜头
 * 已有的僵尸：普通僵尸，旗帜僵尸，路障僵尸，铁桶僵尸，读报僵尸，橄榄球僵尸，鸭子救生圈僵尸，铁门僵尸，撑杆跳僵尸，冰车僵尸，潜水僵尸
 * 使用JSON文件记录关卡信息数据
+  * 在0.8.18.0及以后直接用python记录关卡的不可变数据，JSON目前仅用于用户存档
 * 支持选择植物卡片
-* 支持白昼模式，夜晚模式，泳池模式，传送带模式和坚果保龄球模式
+* 支持白昼模式，夜晚模式，泳池模式，浓雾模式（暂时没有加入雾），传送带模式和坚果保龄球模式
 * 支持背景音乐播放
+  * 支持调节音量
 * 支持音效
+  * 支持与背景音乐一起调节音量
 * 支持全屏模式
   * 按`F`键进入全屏模式，按`U`键恢复至窗口模式
 * 支持用小铲子移除植物
 * 支持分波生成僵尸
 * 支持“关卡进程”进度条显示
 * 夜晚模式支持墓碑以及从墓碑生成僵尸
-  * 含有泳池的模式也支持在最后一波时从泳池中自动冒出僵尸
+* 含有泳池的模式支持在最后一波时从泳池中自动冒出僵尸
+* 支持保存进度
+  * Windows下默认进度文件的保存路径为`~\AppData\Roaming\pypvz\userdata.json`
+  * 其他操作系统为`~/.config/pypvz/userdata.json`
+  * 存档为JSON文件，如果出现因存档损坏而造成程序无法启动，可以手动编辑修复或者删除该文件重试
+    * 0.8.12.0版本后理论上不可能因为存档损坏而无法启动，如果有，请在[issues](https://github.com/wszqkzqk/pypvz/issues)中报告bug
+      * 仍然有可能因为升级后变量名不同而丢失存档的进度信息，这种情况手动编辑恢复即可
+* 支持错误日志记录
+  * Windows下默认日志文件的保存路径为`~\AppData\Roaming\pypvz\run.log`
+  * 其他操作系统为`~/.config/pypvz/run.log`
+* 支持自定义游戏速度倍率
+  * 保存在游戏存档文件中，可以通过修改`game rate`值更改速度倍率
+* 游戏完成成就显示
+  * 任意一游戏模式全部完成显示银向日葵奖杯
+  * 所有模式全部完成显示金向日葵奖杯
+  * 光标移动到向日葵奖杯上是显示当前各个模式通关次数
+* 含有游戏帮助界面 QwQ
 
-## 环境要求
+## 环境安装
 
-* `Python` >= 3.7，最好使用最新版
-* `Python-Pygame` >= 1.9，最好使用最新版
+建议使用 [uv](https://docs.astral.sh/uv/) 安装依赖：
+
+```bash
+git clone https://github.com/wszqkzqk/pypvz.git
+cd pypvz
+uv sync
+```
+
+或者参考：
+
+* `Python3` （建议 >= 3.10，最好使用最新版）
+* `Python-Pygame` （建议 >= 2.0，最好使用最新版）
 
 ## 开始游戏
 
 ### 使用仓库源代码
 
-先克隆仓库内容，再运行`main.py`：
+先克隆仓库内容，再运行`pypvz.py`：
 
 ```shell
 git clone https://github.com/wszqkzqk/pypvz.git
 cd pypvz
-python main.py
+python pypvz.py
 ```
 
 ### 使用Windows可执行文件
@@ -42,45 +71,50 @@ python main.py
 - 可以在仓库的[`Releases`](https://github.com/wszqkzqk/pypvz/releases)页面中[下载最新版（点击跳转）](https://github.com/wszqkzqk/pypvz/releases/latest)（推荐）：
   - 使用GCC编译
   - 程序包含名称、版本等信息
-  - 得到的验证最多（相对）
+  - 得到的验证最多
   - 并非每次提交都会更新，更新可能不及时
 - 也可以直接下载GitHub Workflow[自动利用Nuitka构建的版本（点击跳转）](https://github.com/wszqkzqk/pypvz/releases/tag/Latest)（推荐）：
   - 使用MSVC编译
-  - 每次提交均会更新，保证更新及时
-  - 未进行任何测试，存在bug的概率高于前者
-  - 可看作本软件的测试版
+  - 每次合并提交到主分支时更新
+  - 得到的验证较多
+  - 服务器构建，编译环境更纯粹，冗余更少，体积更小
 - 还可以下载GitHub Workflow[自动利用Pyinstaller构建的版本（点击跳转）](https://github.com/wszqkzqk/pypvz/releases/tag/Current.Version.Built.with.Pyinstaller)：
   - 在程序闪退时有报错窗口弹出
   - 程序性能较差，不推荐
-  - 其他特性同GitHub Workflow自动利用Nuitka构建的版本
 - 均仅支持64位操作系统
 - 不依赖python、pygame等外部环境，开箱即用
 
+### 使用Linux可执行文件
+
+由于Linux几乎都标配了Python环境，因此本程序不太重视Linux下可执行的单文件的维护，因此没有手动构建版，只能下载自动构建的软件包。可以在仓库的[`Releases`](https://github.com/wszqkzqk/pypvz/releases)页面中[下载最新版（点击跳转）](https://github.com/wszqkzqk/pypvz/releases/latest)。
+
 ## 方法
 
 * 使用鼠标收集阳光,种植植物
-* 你可以通过更改`source/constants.py`中的`START_LEVEL_NUM`的数值来更改冒险模式的起始关卡，更改`START_LITTLE_GAME_NUM`的数值来更改小游戏的起始关卡：
+* 对于已经存在存档的用户，可以在`~\AppData\Roaming\pypvz\userdata.json`（Windows）或`~/.config/pypvz/userdata.json`（其他操作系统）中修改当前关卡：
   * 冒险模式：
-    * 1和2：白昼模式
-    * 3：夜晚模式
-    * 4和5：泳池模式
-    * 6: 浓雾模式（暂时没有雾）
+    * 白昼模式——单行草皮：1
+    * 白昼模式——三行草皮：2
+    * 白昼模式：3~5
+    * 夜晚模式：6~8
+    * 泳池模式：9~11
+    * 浓雾模式（暂时没有雾）：12
   * 小游戏模式：
-    * 1：坚果保龄球模式
-    * 2：传送带模式（白天）
-    * 3：传送带模式（黑夜）
-    * 4：传送带模式（泳池）
+    * 坚果保龄球：1
+    * 传送带模式（白天）：2
+    * 传送带模式（黑夜）：3
+    * 传送带模式（泳池）：4
+    * 坚果保龄球(II)：5
   * 目前暂时按照以上设定，未与原版相符
-* 可以通过修改`source/constants.py`中的`GAME_RATE`来调节游戏速度倍率
-* **注意：目前单文件发布版本不支持自定义调整关卡和速度倍率**
+* 可以通过修改存档JSON文件中的`game rate`值来调节游戏速度倍率
 
 ## Windows单文件封装
 
 ### 使用Nuitka进行构建
 
 编译依赖：
-- `Python` >= 3.7，最好使用最新版
-- `Python-Pygame` >= 1.9，最好使用最新版
+- `Python3` （建议 >= 3.10，最好使用最新版）
+- `Python-Pygame` （建议 >= 2.0，最好使用最新版）
 - `Nuitka`
 - `MinGW-w64`（或其他C编译器）
 - `ccache`
@@ -95,14 +129,14 @@ python main.py
   - 对于`opus`编码，需要添加`libogg-0.dll`，`libopus-0.dll`和`libopusfile-0.dll`
 - 以添加`opus`和`vorbis`编码的背景音乐支持为例，编译需执行以下命令：
 
-``` powershell
+``` cmd
 git clone https://github.com/wszqkzqk/pypvz.git
 cd pypvz
 nuitka --mingw64 --standalone `
         --onefile `
         --show-progress `
         --show-memory `
-        --output-dir=out `
+        --output-dir=release `
         --windows-icon-from-ico=pypvz.ico `
         --include-data-dir=resources=resources `
         --include-data-file=C:\Users\17265\AppData\Local\Programs\Python\Python310\Lib\site-packages\pygame\libogg-0.dll=libogg-0.dll `
@@ -110,24 +144,67 @@ nuitka --mingw64 --standalone `
         --include-data-file=C:\Users\17265\AppData\Local\Programs\Python\Python310\Lib\site-packages\pygame\libopusfile-0.dll=libopusfile-0.dll `
         --include-data-file=C:\Users\17265\AppData\Local\Programs\Python\Python310\Lib\site-packages\pygame\libvorbisfile-3.dll=libvorbisfile-3.dll `
         --include-data-file=C:\Users\17265\AppData\Local\Programs\Python\Python310\Lib\site-packages\pygame\libvorbis-0.dll=libvorbis-0.dll `
+        --lto=yes `
         --windows-disable-console `
         --windows-product-name=pypvz `
-        --windows-company-name=null `
+        --windows-company-name=wszqkzqk.dev `
         --windows-file-description="pypvz" `
-        --windows-product-version=0.6.9.0 `
-        main.py
+        --windows-product-version=0.8.2.0 `
+        pypvz.py
 ```
 
-* 其中`C:\Users\17265\AppData\Local\Programs\Python\Python310\Lib\site-packages\pygame\xxx.dll`应当替换为`xxx.dll`实际所在路径
+* 其中`C:\Users\17265\AppData\Local\Programs\Python\Python310\Lib\site-packages\pygame\xxx.dll`应当替换为`xxx.dll`实际所在路径，`--output-dir=`后应当跟实际需要输出的路径，绝对路径或者相对路径均可
 * 由于仅复制了`opus`与`vorbis`的解码器，故要求所有背景音乐都要以opus或vorbis编码
 * `--windows-product-version=`表示版本号信息，所跟内容格式必须为`x.x.x.x`
+* 建议开启`--lto=yes`选项优化链接，如果编译失败可以关闭此选项
 
-可执行文件生成路径为`./out/main.exe`
+可执行文件生成路径为`./release/pypvz.exe`
+
+如果只需要在本地生成编译文件测试，则只需要执行：
+
+``` cmd
+nuitka --mingw64 `
+    --follow-imports `
+    --show-progress `
+    --output-dir=test-build `
+    --windows-icon-from-ico=pypvz.ico `
+    --windows-product-name=pypvz `
+    --windows-company-name=wszqkzqk.dev `
+    --windows-file-description=pypvz `
+    --windows-disable-console `
+    --windows-product-version=0.8.2.0 `
+    pypvz.py
+```
+
+这样生成的程序只能在具有相同python环境的机器上运行
 
 ### 使用pyinstaller进行构建
 
+- 由于pyinstaller构建的程序运行效率显著较nuitka构建的程序低下，并且程序体积也往往比nuitka构建的程序大，因此本项目并不推荐使用pyinstaller构建
+- 但是因为pyinstaller直接封装了所导入的库中的全部内容，使用pyinstaller构建时不需要手动添加媒体解码库
+- pyinstaller并没有涉及python源代码优化、C源代码生成以及C源代码编译链接过程，因此编译速度显著快于nuitka
+
+编译依赖：
+- `Python3` （建议 >= 3.10，最好使用最新版）
+- `Python-Pygame` （建议 >= 2.0，最好使用最新版）
+- `Pyinstaller`
+
+编译参考命令：
+``` cmd
+pyinstaller -F pypvz.py `
+                  --distpath ./release `
+                  --noconsole `
+                  --add-data="resources;./resources" `
+                  --add-data="pypvz-exec-logo.png;./pypvz-exec-logo.png" `
+                  -i ./pypvz.ico
+```
+
+可执行文件生成路径为`./release/pypvz.exe`
+
 ### 使用Github Workflow进行自动构建
 
+直接复制本项目下的`.github/workflows`下的文件，进行少许改动即可满足大多数需求
+
 ## 已知bug
 
 以下问题囿于个人目前的能力与精力，没有修复：
@@ -135,6 +212,8 @@ nuitka --mingw64 --standalone `
   * 这个想不到很好的实现方法，可能会想一种替代方案
 * 魅惑的僵尸未用红色滤镜标识
   * 这个可能会作为一种“特性”
+* 南瓜头显示不正常
+* 墓碑吞噬者吞噬墓碑过程中被吞噬的墓碑顶端不会消失
 
 **欢迎提供[Pull requests](https://github.com/wszqkzqk/pypvz/pulls)或修复方法建议，也欢迎在这里反馈新的bug()**
 
@@ -143,10 +222,12 @@ nuitka --mingw64 --standalone `
 * 增加关卡进程进度条
   * 该功能自0.5.4已实现
 * 增加保存数据文件以存储用户进度的功能
+  * 该功能自0.8.0.0已实现
 * 增加调整音量的功能
   * `pg.mixer.music.set_volume()`
   * 可以用`音量+`、`音量-`按钮实现
   * 注意字体颜色渲染
+  * 该功能自0.8.14.0已实现
 * 关卡开始前增加预览界面
 * 增加解锁与选关功能
   * 目前的设想与原版不同，在完成两轮冒险模式（初始冒险模式 + 戴夫选关的冒险模式）后可以自主选关~~（当然现在只是画饼）~~
@@ -219,21 +300,39 @@ nuitka --mingw64 --standalone `
 * 增加部分音效
   * 如爆炸、打击等
   * 自0.6.9已部分实现
+* 增加关卡前的本关僵尸预览
+* 鼠标移动到植物上时显示部分信息，类似图鉴功能
 
 ## 截屏
 
-![截屏1](/demo/demo1.webp)
-![截屏2](/demo/demo2.webp)
-![截屏3](/demo/demo3.webp)
-![截屏4](/demo/demo4.webp)
-![截屏5](/demo/demo5.webp)
-![截屏6](/demo/demo6.webp)
-![截屏7](/demo/demo7.webp)
-![截屏8](/demo/demo8.webp)
-![截屏9](/demo/demo9.webp)
-![截屏10](/demo/demo10.webp)
-![截屏11](/demo/demo11.webp)
-![截屏12](/demo/demo12.webp)
-![截屏13](/demo/demo13.webp)
-![截屏14](/demo/demo14.webp)
-![截屏15](/demo/demo15.webp)
+![截屏1](/screenshots/screenshot-1.webp)
+![截屏2](/screenshots/screenshot-2.webp)
+![截屏3](/screenshots/screenshot-3.webp)
+![截屏4](/screenshots/screenshot-4.webp)
+![截屏5](/screenshots/screenshot-5.webp)
+![截屏6](/screenshots/screenshot-6.webp)
+![截屏7](/screenshots/screenshot-7.webp)
+![截屏8](/screenshots/screenshot-8.webp)
+![截屏9](/screenshots/screenshot-9.webp)
+![截屏10](/screenshots/screenshot-10.webp)
+![截屏11](/screenshots/screenshot-11.webp)
+![截屏12](/screenshots/screenshot-12.webp)
+![截屏13](/screenshots/screenshot-13.webp)
+![截屏14](/screenshots/screenshot-14.webp)
+![截屏15](/screenshots/screenshot-15.webp)
+![截屏16](/screenshots/screenshot-16.webp)
+![截屏17](/screenshots/screenshot-17.webp)
+![截屏18](/screenshots/screenshot-18.webp)
+![截屏19](/screenshots/screenshot-19.webp)
+![截屏20](/screenshots/screenshot-20.webp)
+![截屏21](/screenshots/screenshot-21.webp)
+![截屏22](/screenshots/screenshot-22.webp)
+![截屏23](/screenshots/screenshot-23.webp)
+
+## 关于日志与反馈
+
+对于闪退情况，Linux用户与Windows下的python源代码运行用户可以直接在终端中复制出崩溃日志进行反馈。
+
+Windows单文件封装版本无法通过终端显示日志，需要在日志文件中寻找崩溃原因
+* Windows默认日志文件路径为`~\AppData\Roaming\pypvz\run.log`
+* 其他操作系统为`~/.config/pypvz/run.log`，但一般可以在终端中显示时用终端中的输出即可

git-pull.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-cd `dirname $0`; pwd
-git pull git@github.com:wszqkzqk/pypvz.git

main.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-import pygame as pg
-from source import tool
-from source import constants as c
-from source.state import mainmenu, screen, level
-
-if __name__=='__main__':
-    # 控制状态机运行
-    game = tool.Control()
-    state_dict = {  c.MAIN_MENU: mainmenu.Menu(),
-                    c.GAME_VICTORY: screen.GameVictoryScreen(),
-                    c.GAME_LOSE: screen.GameLoseScreen(),
-                    c.LEVEL: level.Level()
-                    }
-    game.setup_states(state_dict, c.MAIN_MENU)
-    game.run()

pyproject.toml

@@ -0,0 +1,12 @@
+[project]
+name = "pypvz"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "blue>=0.9.1",
+    "pygame>=2.6.1",
+    "setuptools>=80.9.0",
+    "wheel>=0.45.1",
+]

pypvz.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+import logging
+import os
+import traceback
+from logging.handlers import RotatingFileHandler
+
+import pygame as pg
+
+# 由于在后续本地模块中存在对pygame的调用，在此处必须完成pygame的初始化
+os.environ[
+    'SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR'
+] = '0'   # 设置临时环境变量以避免Linux下禁用x11合成器
+pg.init()
+
+from source import constants as c
+from source import tool
+from source.state import level, mainmenu, screen
+
+if __name__ == '__main__':
+    # 日志设置
+    if not os.path.exists(os.path.dirname(c.USERLOG_PATH)):
+        os.makedirs(os.path.dirname(c.USERLOG_PATH))
+    logger = logging.getLogger('main')
+    formatter = logging.Formatter('%(asctime)s - %(levelname)s: %(message)s')
+    fileHandler = RotatingFileHandler(
+        c.USERLOG_PATH, 'a', 1_000_000, 0, 'utf-8'
+    )
+    # 设置日志文件权限，Unix为644，Windows为可读写；Python的os.chmod与Unix chmod相同，但要显式说明8进制
+    os.chmod(c.USERLOG_PATH, 0o644)
+    fileHandler.setFormatter(formatter)
+    streamHandler = logging.StreamHandler()
+    streamHandler.setFormatter(formatter)
+    logger.addHandler(fileHandler)
+    logger.addHandler(streamHandler)
+
+    try:
+        # 控制状态机运行
+        game = tool.Control()
+        state_dict = {
+            c.MAIN_MENU: mainmenu.Menu(),
+            c.GAME_VICTORY: screen.GameVictoryScreen(),
+            c.GAME_LOSE: screen.GameLoseScreen(),
+            c.LEVEL: level.Level(),
+            c.AWARD_SCREEN: screen.AwardScreen(),
+            c.HELP_SCREEN: screen.HelpScreen(),
+        }
+        game.setup_states(state_dict, c.MAIN_MENU)
+        game.run()
+    except:
+        print()   # 将日志输出与上文内容分隔开，增加可读性
+        logger.error(f'\n{traceback.format_exc()}')

resources/data/entity/plant.json

@@ -1,15 +0,0 @@
-{
-    "plant_image_rect":{
-        "PeaNormal":{"x":28, "y":0, "width":28, "height":34},
-        "PeaIce":{"x":26, "y":0, "width":30, "height":34},
-        "Chomper":{"x":0, "y":0, "width":100, "height":114},
-        "PuffShroom":{"x":0, "y":28, "width":35, "height":38},
-        "PuffShroomSleep":{"x":1, "y":0, "width":39, "height":65},
-        "BulletMushRoom":{"x":0, "y":1, "width":55, "height":21},
-        "BulletSeaShroom":{"x":0, "y":1, "width":55, "height":21},
-        "PotatoMine":{"x":0, "y":0, "width":75, "height":55},
-        "Squash":{"x":10, "y":140, "width":80, "height":86},
-        "SquashAim":{"x":10, "y":140, "width":80, "height":86},
-        "Spikeweed":{"x":3, "y":0, "width":80, "height":35}
-    }
-}

resources/data/entity/zombie.json

@@ -1,38 +0,0 @@
-{
-    "zombie_image_rect":{
-        "Zombie":{"x":62, "width":90},
-        "ZombieAttack":{"x":62, "width":90},
-        "ZombieLostHead":{"x":62, "width":90},
-        "ZombieLostHeadAttack":{"x":62, "width":90},
-        "ZombieDie":{"x":0, "width":164},
-        "BoomDie":{"x":68, "width":80},
-        "ConeheadZombie":{"x":80, "width":80},
-        "ConeheadZombieAttack":{"x":79, "width":87},
-        "BucketheadZombie":{"x":54, "width":90},
-        "BucketheadZombieAttack":{"x":46, "width":90},
-        "FlagZombie":{"x":56, "width":110},
-        "FlagZombieAttack":{"x":60, "width":100},
-        "FlagZombieLostHead":{"x":55, "width":110},
-        "FlagZombieLostHeadAttack":{"x":55, "width":110},
-        "NewspaperZombie":{"x":48, "width":92},
-        "NewspaperZombieAttack":{"x":48, "width":92},
-        "NewspaperZombieNoPaper":{"x":40, "width":98},
-        "NewspaperZombieNoPaperAttack":{"x":48, "width":92},
-        "NewspaperZombieLostHead":{"x":44, "width":96},
-        "NewspaperZombieLostHeadAttack":{"x":48, "width":92},
-        "NewspaperZombieDie":{"x":0, "width":100},
-        "DukyTubeZombie":{"x":55, "width":105},
-        "DukyTubeZombieAttack":{"x":55, "width":105},
-        "DukyTubeZombieDie":{"x":55, "width":105},
-        "DukyTubeZombieLostHead":{"x":55, "width":105},
-        "DukyTubeZombieSwim":{"x":55, "width":105},
-        "ConeheadDukyTubeZombie":{"x":55, "width":105},
-        "ConeheadDukyTubeZombieAttack":{"x":55, "width":105},
-        "ConeheadDukyTubeZombieSwim":{"x":55, "width":105},
-        "BucketheadDukyTubeZombie":{"x":55, "width":105},
-        "BucketheadDukyTubeZombieAttack":{"x":55, "width":105},
-        "BucketheadDukyTubeZombieSwim":{"x":55, "width":105},
-        "ScreenDoorZombie":{"x":41, "width":100},
-        "ScreenDoorZombieAttack":{"x":41, "width":100}
-    }
-}

resources/data/map/level_0.json

@@ -1,23 +0,0 @@
-{
-    "background_type":2,
-    "init_sun_value":5000,
-    "shovel":1,
-    "spawn_zombies":"list",
-    "zombie_list":[
-        {"time":0, "map_y":5, "name":"Zomboni"},
-        {"time":1000, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":2000, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":3100, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":4500, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":5000, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":6000, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":7000, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":8000, "map_y":4, "name":"ScreenDoorZombie"},
-        {"time":0, "map_y":1, "name":"NewspaperZombie"},
-        {"time":0, "map_y":0, "name":"PoleVaultingZombie"},
-        {"time":6000, "map_y":0, "name":"FootballZombie"},
-        {"time":0, "map_y":3, "name":"ConeheadDuckyTubeZombie"},
-        {"time":0, "map_y":2, "name":"SnorkelZombie"},
-        {"time":90000, "map_y":2, "name":"ConeheadDuckyTubeZombie"}
-    ]
-}

resources/data/map/level_1.json

@@ -1,8 +0,0 @@
-{
-    "background_type": 0,
-    "init_sun_value": 50,
-    "shovel": 1,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie"],
-    "num_flags":2
-}

resources/data/map/level_2.json

@@ -1,8 +0,0 @@
-{
-    "background_type":0,
-    "init_sun_value":50,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie", "ConeheadZombie", "PoleVaultingZombie"],
-    "num_flags":3
-}

resources/data/map/level_3.json

@@ -1,9 +0,0 @@
-{
-    "background_type":1,
-    "init_sun_value":50,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "ScreenDoorZombie"],
-    "inevitable_zombie_list":{"20":["BucketheadZombie"]},
-    "num_flags":3
-}

resources/data/map/level_4.json

@@ -1,9 +0,0 @@
-{
-    "background_type":2,
-    "init_sun_value":50,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "FootballZombie"],
-    "inevitable_zombie_list":{"20":["BucketheadZombie"], "30":["FootballZombie"]},
-    "num_flags":4
-}

resources/data/map/level_5.json

@@ -1,9 +0,0 @@
-{
-    "background_type":2,
-    "init_sun_value":50,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie", "Zomboni"],
-    "inevitable_zombie_list":{"30":["Zomboni"]},
-    "num_flags":3
-}

resources/data/map/level_6.json

@@ -1,9 +0,0 @@
-{
-    "background_type":3,
-    "init_sun_value":50,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "FootballZombie"],
-    "inevitable_zombie_list":{"20":["BucketheadZombie"], "30":["FootballZombie"]},
-    "num_flags":4
-}

resources/data/map/littleGame_1.json

@@ -1,12 +0,0 @@
-{
-    "background_type":6,
-    "choosebar_type":2,
-    "shovel":0,
-    "spawn_zombies":"auto",
-    "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "NewspaperZombie", "PoleVaultingZombie"],
-    "num_flags":4,
-    "inevitable_zombie_list":{"20":["BucketheadZombie"]},
-    "card_pool":[   "WallNutBowling",
-                    "RedWallNutBowling"
-                    ]
-}

resources/data/map/littleGame_2.json

@@ -1,17 +0,0 @@
-{
-    "background_type":0,
-    "choosebar_type":1,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "num_flags":3,
-    "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "PoleVaultingZombie"],
-    "inevitable_zombie_list":{"20":["BucketheadZombie"]},
-    "card_pool":[   "Peashooter",
-                    "SnowPea",
-                    "WallNut",
-                    "CherryBomb",
-                    "RepeaterPea",
-                    "Chomper",
-                    "PotatoMine"
-                    ]
-}

resources/data/map/littleGame_3.json

@@ -1,19 +0,0 @@
-{
-    "background_type":1,
-    "choosebar_type":1,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "num_flags":3,
-    "included_zombies":["Zombie", "ConeheadZombie",
-                        "BucketheadZombie", "NewspaperZombie",
-                        "FootballZombie", "ScreenDoorZombie"],
-    "inevitable_zombie_list":{"30":["FootballZombie"]},
-    "card_pool":[   "PuffShroom",
-                    "ScaredyShroom",
-                    "IceShroom",
-                    "HypnoShroom",
-                    "DoomShroom",
-                    "GraveBuster",
-                    "FumeShroom"
-                    ]
-}

resources/data/map/littleGame_4.json

@@ -1,20 +0,0 @@
-{
-    "background_type":2,
-    "choosebar_type":1,
-    "shovel":1,
-    "spawn_zombies":"auto",
-    "num_flags":4,
-    "included_zombies":["Zombie", "ConeheadZombie",
-                        "BucketheadZombie", "SnorkelZombie",
-                        "Zomboni"],
-    "inevitable_zombie_list":{"30":["BucketheadZombie"]},
-    "card_pool":[   "Lilypad", "Lilypad",
-                    "TorchWood",
-                    "TallNut",
-                    "TangleKlep",
-                    "Spikeweed",
-                    "Squash",
-                    "Jalapeno",
-                    "Threepeater", "Threepeater", "Threepeater", "Threepeater", "Threepeater"
-                    ]
-}