From c219da2e5ba83c1ea33374bccdca9ccc4b6cb361 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 19 Feb 2023 21:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84print?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Difficult_Rocket/__init__.py | 2 +- Difficult_Rocket/client/render/sr1_ship.py | 14 -------------- README.md | 4 ++-- docs/README-en.md | 4 ++-- docs/src/update_logs.md | 6 +++++- pyproject.toml | 2 +- 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Difficult_Rocket/__init__.py b/Difficult_Rocket/__init__.py index db2f6d7..5d59f41 100644 --- a/Difficult_Rocket/__init__.py +++ b/Difficult_Rocket/__init__.py @@ -22,7 +22,7 @@ from Difficult_Rocket.api.types import Options from libs.MCDR.version import Version -game_version = Version("0.7.1.0") # 游戏版本 +game_version = Version("0.7.1.1") # 游戏版本 build_version = Version("1.1.0.0") # 编译文件版本(与游戏本体无关) DR_rust_version = Version("0.2.5.0") # DR 的 Rust 编写部分的版本 __version__ = game_version diff --git a/Difficult_Rocket/client/render/sr1_ship.py b/Difficult_Rocket/client/render/sr1_ship.py index 774f3b9..320d45d 100644 --- a/Difficult_Rocket/client/render/sr1_ship.py +++ b/Difficult_Rocket/client/render/sr1_ship.py @@ -264,9 +264,7 @@ class SR1ShipRender(BaseScreen): zoom_d = 1 else: zoom_d = ((2 ** scroll_y) - 1) * 0.5 + 1 - print(f"1: {self.camera_rs.zoom=} {self.camera_rs.dx} {self.camera_rs.dy} {scroll_y=}") # 缩放的变换量 - print(f'{self.camera_rs.zoom * zoom_d=}') if self.camera_rs.zoom == 10: if scroll_y >= 0: self.camera_rs.dx += mouse_dx_d * 0.5 @@ -284,19 +282,7 @@ class SR1ShipRender(BaseScreen): self.camera_rs.zoom = 10 self.camera_rs.dx += mouse_dx_d self.camera_rs.dy += mouse_dy_d - # if self.camera_rs.zoom / (0.5 ** (scroll_y * 0.5)) <= 10: - # self.camera_rs.zoom = self.camera_rs.zoom / zoom_d - # self.camera_rs.dx -= (mouse_dx - self.camera_rs.dx) * (1 - zoom_d) - # self.camera_rs.dy -= (mouse_dy - self.camera_rs.dy) * (1 - zoom_d) - # elif self.camera_rs.zoom == 10: - # self.camera_rs.dx -= mouse_dx * (0.1 ** scroll_y) - # self.camera_rs.dy -= mouse_dy * (0.1 ** scroll_y) - # else: - # self.camera_rs.zoom = 10 - # self.camera_rs.dx -= (mouse_dx - self.camera_rs.dx) * zoom_d - # self.camera_rs.dy -= (mouse_dy - self.camera_rs.dy) * zoom_d - print(f"{self.camera_rs.zoom=} {self.camera_rs.dx} {self.camera_rs.dy} {scroll_y=}") self.debug_mouse_line.x2, self.debug_mouse_line.y2 = x, y self.debug_mouse_delta_line.x2 = (mouse_dx - self.camera_rs.dx) * (1 - (0.5 ** scroll_y)) + ( self.window_pointer.width / 2) diff --git a/README.md b/README.md index 20c5b4e..2ee4ce1 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ ## 版本 -[![Generic badge](https://img.shields.io/badge/Release-0.7.1.0-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) -[![Generic badge](https://img.shields.io/badge/Pre_Release-0.7.1.0-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) +[![Generic badge](https://img.shields.io/badge/Release-0.7.1.1-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) +[![Generic badge](https://img.shields.io/badge/Pre_Release-0.7.1.1-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) [![Generic badge](https://img.shields.io/badge/Devloping-0.7.2-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) ## English README please look [here](./docs/README-en.md) diff --git a/docs/README-en.md b/docs/README-en.md index ff1cad8..da02c08 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -17,8 +17,8 @@ ## Version -[![Generic badge](https://img.shields.io/badge/Release-0.7.1.0-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) -[![Generic badge](https://img.shields.io/badge/Pre_Release-0.7.1.0-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) +[![Generic badge](https://img.shields.io/badge/Release-0.7.1.1-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) +[![Generic badge](https://img.shields.io/badge/Pre_Release-0.7.1.1-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) [![Generic badge](https://img.shields.io/badge/Devloping-0.7.2-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases) ## 中文README请移步 [这里](../README.md) diff --git a/docs/src/update_logs.md b/docs/src/update_logs.md index 6847d80..8532d5f 100644 --- a/docs/src/update_logs.md +++ b/docs/src/update_logs.md @@ -10,13 +10,17 @@ ## Readme First! ##### most badge can be clicked and jump [![Generic badge](https://img.shields.io/badge/SemVer-2.0.0-blue.svg)](https://Semver.org/) -![Generic badge](https://img.shields.io/badge/Version-0.7.1.0-yellow.svg) +![Generic badge](https://img.shields.io/badge/Version-0.7.1.1-yellow.svg) - [![Readme-github](https://img.shields.io/badge/Readme-Github-blue.svg?style=flat-square&logo=Github)](https://github.com/shenjackyuanjie/Difficult-Rocket) - [![Readme-gitee](https://img.shields.io/badge/Readme-Gitee-blue.svg?style=flat-square&logo=Gitee)](https://gitee.com/shenjackyuanjie/Difficult-Rocket) - [![Readme-gitee](https://img.shields.io/badge/Readme-中文(点我!)-blue.svg?style=flat-square)](../../README.md) - Using [SemVer 2.0.0](https://semver.org/) to manage version +## 20230219 V 0.7.1.1 + +### 删除了多余的 print + ## 20230219 V 0.7.1.0 ### 命令 diff --git a/pyproject.toml b/pyproject.toml index 2d36fab..2568c1c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "pdm.pep517.api" [project] name = "difficult-rocket" -version = "0.7.1.0" +version = "0.7.1.1" description = "A rocket game" authors = [ {name = "shenjackyuanjie", email = "3695888@qq.com"}