Compare commits

...

3 Commits

Author SHA1 Message Date
6865578237
bump version of dr rs 2023-07-21 08:29:17 +08:00
b02f0f3852
Merge pull request #45 from shenjackyuanjie/dr_game/dr_rs_requirement
update dr_rs dependecy
2023-07-21 08:07:11 +08:00
b2af672f96
update dr_rs dependecy 2023-07-21 08:06:24 +08:00
8 changed files with 45 additions and 33 deletions

View File

@ -3,7 +3,20 @@
- 最新版本号
- DR game: 0.3.1.3
- DR rs: 0.2.15.2
- DR rs: 0.2.16.0
## 20230721 DR rs 0.2.16.0
### Dependencies
in [#45](https://github.com/shenjackyuanjie/Difficult-Rocket/pull/45)
- `pyo3`
- `0.19.0` -> `0.19.1`
- `xml-rs`
- `0.8.14` -> `0.8.16`
- `serde`
- `1.0.164` -> `1.0.173`
## DR game 0.3.1.2 / 0.3.1.3

View File

@ -116,7 +116,7 @@ dependencies = [
[[package]]
name = "difficult_rocket_rs"
version = "0.2.5"
version = "0.2.15"
dependencies = [
"pyo3",
"quick-xml",
@ -348,9 +348,9 @@ dependencies = [
[[package]]
name = "pyo3"
version = "0.19.0"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cffef52f74ec3b1a1baf295d9b8fcc3070327aefc39a6d00656b13c1d0b8885c"
checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59"
dependencies = [
"cfg-if",
"indoc",
@ -365,9 +365,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
version = "0.19.0"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "713eccf888fb05f1a96eb78c0dbc51907fee42b3377272dc902eb38985f418d5"
checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0"
dependencies = [
"once_cell",
"target-lexicon",
@ -375,9 +375,9 @@ dependencies = [
[[package]]
name = "pyo3-ffi"
version = "0.19.0"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b2ecbdcfb01cbbf56e179ce969a048fd7305a66d4cdf3303e0da09d69afe4c3"
checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4"
dependencies = [
"libc",
"pyo3-build-config",
@ -385,9 +385,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
version = "0.19.0"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b78fdc0899f2ea781c463679b20cb08af9247febc8d052de941951024cd8aea0"
checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@ -397,9 +397,9 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
version = "0.19.0"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60da7b84f1227c3e2fe7593505de274dcf4c8928b4e0a1c23d551a14e4e80a0f"
checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b"
dependencies = [
"proc-macro2",
"quote",
@ -490,9 +490,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.164"
version = "1.0.173"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
checksum = "e91f70896d6720bc714a4a57d22fc91f1db634680e65c8efe13323f1fa38d53f"
dependencies = [
"serde_derive",
]
@ -511,13 +511,13 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.164"
version = "1.0.173"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
checksum = "a6250dde8342e0232232be9ca3db7aa40aceb5a3e5dd9bddbc00d99a007cde49"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.26",
]
[[package]]
@ -573,9 +573,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.22"
version = "2.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
dependencies = [
"proc-macro2",
"quote",
@ -605,7 +605,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.26",
]
[[package]]
@ -701,6 +701,6 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "xml-rs"
version = "0.8.14"
version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"

View File

@ -1,6 +1,6 @@
[package]
name = "difficult_rocket_rs"
version = "0.2.5"
version = "0.2.15"
edition = "2021"
license-file = '../../LICENSE'
@ -23,11 +23,11 @@ version = "0.29.0"
features = ["serialize"]
[dependencies.serde]
version = "1.0.164"
version = "1.0.173"
features = ["derive"]
[dependencies.xml-rs]
version = "0.8.14"
version = "0.8.16"
[dependencies.serde-xml-rs]
version = "0.6.0"
@ -37,5 +37,5 @@ version = "0.17.2"
features = ["simd-stable"]
[dependencies.pyo3]
version = "0.19.0"
version = "0.19.1"
features = ["extension-module"]

View File

@ -12,7 +12,7 @@ package_path = 'Difficult_Rocket_rs'
setup(
name='Difficult_Rocket_rs',
version="0.2.15.1",
version="0.2.16.0",
author='shenjackyuanjie',
author_email='3695888@qq.com',
rust_extensions=[RustExtension(target="Difficult_Rocket_rs.Difficult_Rocket_rs",

View File

@ -24,7 +24,7 @@ enum LoadState {
}
#[pyfunction]
fn get_version_str() -> String { "0.2.15.2".to_string() }
fn get_version_str() -> String { "0.2.16.0".to_string() }
#[pyfunction]
fn test_call(py_obj: &PyAny) -> PyResult<bool> {

View File

@ -759,7 +759,6 @@ pub mod sr1 {
part.flip_y && !save_status.save_default,
("flippedY", bool_to_i8(part.flip_y).to_string().as_str())
);
// part_attr.push_attribute(("activated", bool_to_i8(part.active).to_string().as_str()));
option_push_attr!(
part_attr,
part.active && !save_status.save_default,

View File

@ -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.15.2") # DR_mod 的 Rust 编写部分的兼容版本
DR_rust_version = Version("0.2.16.0") # DR_mod 的 Rust 编写部分的兼容版本
logger = logging.getLogger('client.dr_game')

View File

@ -114,9 +114,9 @@ class SR1ShipRender(BaseScreen):
# Optional data
self.gen_draw: Optional[Generator] = None
self.textures: Union[SR1Textures, None] = None
self.xml_name: Optional[str] = None
self.xml_doc: Optional[ElementTree] = None
self.xml_root: Optional[Element] = None
self.xml_name: Optional[str] = None # 准备移除, 更换为基于 rust 的 xml 解析
self.xml_doc: Optional[ElementTree] = None # 准备移除, 更换为基于 rust 的 xml 解析
self.xml_root: Optional[Element] = None # 准备移除, 更换为基于 rust 的 xml 解析
self.rust_ship: Optional[SR1Ship_rs] = None
# List/Dict data