Update DR rs and DR sdk

config/main.toml

@@ -7,8 +7,8 @@ fonts_folder = "assets/fonts"
 
 [window]
 style = "None"
-width = 1112
-height = 793
+width = 1312
+height = 915
 visible = true
 gui_scale = 1
 caption = "Difficult Rocket v{DR_version}"

docs/src/change_log/dr_game.md

@@ -1,9 +1,17 @@
-
 # DR game/DR rs 更新日志
 
 - 最新版本号
   - DR game: 0.3.3.0
-  - DR rs: 0.2.22.0
+  - DR rs: 0.2.23.0
+
+## 20231101 DR rs 0.2.23.0
+
+### Dependency
+
+- Update `DR rs` dependency
+  - `quick-xml`: `0.30.0` -> `0.31.0`
+  - `serde`: `1.0.186` -> `1.0.190`
+  - `xml-rs`: `0.8.16` -> `0.8.19`
 
 ## 20230825 DR rs 0.2.22.0
 

docs/src/change_log/dr_sdk.md

@@ -1,4 +1,3 @@
-
 # DR SDK 更新日志
 
 - 最新版本号
@@ -14,6 +13,20 @@
   - 不再同时维护两份代码
   - No longer maintain two sets of code at the same time
 
+### Fix
+
+- 如果没有 DR_game 的情况下, 退出时会 join 控制台线程
+  - 通过检测线程是否是守护线程来判断是否 join
+  - If there is no DR_game, join the console thread when exiting
+    - Determine whether to join by detecting whether the thread is a daemon thread
+
+### Dependency
+
+- 更新了所有的依赖版本号
+  - 去看 `requirements.txt` 吧
+- Updated all dependency version numbers
+  - Go see `requirements.txt`
+
 ## DR sdk 0.8.7.2
 
 ### Add

mods/dr_game/Difficult_Rocket_rs/src/Cargo.lock

@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "difficult_rocket_rs"
-version = "0.2.22"
+version = "0.2.23"
 dependencies = [
  "pyo3",
  "quick-xml",
@@ -415,9 +415,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
 dependencies = [
  "memchr",
  "serde",
@@ -497,9 +497,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.186"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
@@ -518,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.186"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -708,6 +708,6 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"

mods/dr_game/Difficult_Rocket_rs/src/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "difficult_rocket_rs"
-version = "0.2.22"
+version = "0.2.23"
 edition = "2021"
 license-file = '../../LICENSE'
 authors = [
@@ -22,15 +22,15 @@ opt-level = "s"
 # codegen-units = 1
 
 [dependencies.quick-xml]
-version = "0.30.0"
+version = "0.31.0"
 features = ["serialize"]
 
 [dependencies.serde]
-version = "1.0.186"
+version = "1.0.190"
 features = ["derive"]
 
 [dependencies.xml-rs]
-version = "0.8.16"
+version = "0.8.19"
 
 [dependencies.serde-xml-rs]
 version = "0.6.0"

mods/dr_game/__init__.py

@@ -16,7 +16,7 @@ from Difficult_Rocket.api.mod import ModInfo
 from Difficult_Rocket.client import ClientWindow
 from Difficult_Rocket.api.types import Options, Version
 
-DR_rust_version = Version("0.2.22.0")  # DR_mod 的 Rust 编写部分的兼容版本
+DR_rust_version = Version("0.2.23.0")  # DR_mod 的 Rust 编写部分的兼容版本
 
 logger = logging.getLogger('client.dr_game')
 

requirement-build.txt

@@ -4,23 +4,22 @@
 
 # for images
 # not for pypy >= 3.10
-pillow >= 10.0.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
+pillow >= 10.0.1; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
 
 # for sys info
-psutil >= 5.9.5
+psutil >= 5.9.6
 
 # for files
 rtoml >= 0.9.0
-tomlkit >= 0.11.8
+tomlkit >= 0.12.1
 defusedxml >= 0.7.1
 
 # for report error
-objprint >= 0.2.2
+objprint >= 0.2.3
 
 # for compile
-nuitka >= 1.8.2
-ordered-set >= 4.1.0
-imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
-wheel >= 0.40.0
-setuptools >= 67.8.0
-setuptools-rust >= 1.6.0
+nuitka >= 1.8.5
+imageio >= 2.31.6; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
+wheel >= 0.41.3
+setuptools >= 68.2.2
+setuptools-rust >= 1.8.1

requirement-dev.txt

@@ -5,25 +5,24 @@
 
 # for images
 # not for pypy >= 3.10
-pillow >= 10.0.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
+pillow >= 10.0.1; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
 
 # for sys info
-psutil >= 5.9.5
+psutil >= 5.9.6
 
 # for files
 rtoml >= 0.9.0
-tomlkit >= 0.11.8
+tomlkit >= 0.12.1
 defusedxml >= 0.7.1
 
 # for debug
-objprint >= 0.2.2
-viztracer >= 0.15.6; platform_python_implementation != "PyPy"
+objprint >= 0.2.3
+viztracer >= 0.16.0; platform_python_implementation != "PyPy"
 vizplugins >= 0.1.3; platform_python_implementation != "PyPy"
 
 # for compile
-nuitka >= 1.8.2
-ordered-set >= 4.1.0
-imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
-wheel >= 0.40.0
-setuptools >= 67.8.0
-setuptools-rust >= 1.6.0
+nuitka >= 1.8.5
+imageio >= 2.31.6; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
+wheel >= 0.41.3
+setuptools >= 68.2.2
+setuptools-rust >= 1.8.1

requirement.txt

@@ -3,15 +3,15 @@
 
 # for images
 # not for pypy >= 3.10
-pillow >= 10.0.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
+pillow >= 10.0.1; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
 
 # for sys info
-psutil >= 5.9.5
+psutil >= 5.9.6
 
 # for files
 rtoml >= 0.9.0
-tomlkit >= 0.11.8
+tomlkit >= 0.12.1
 defusedxml >= 0.7.1
 
 # for report error
-objprint >= 0.2.2
+objprint >= 0.2.3