Skip to content

Commit

Permalink
删除了多余的print
Browse files Browse the repository at this point in the history
  • Loading branch information
shenjackyuanjie committed Feb 19, 2023
1 parent 00d4194 commit c219da2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Difficult_Rocket/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

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
Expand Down
16 changes: 1 addition & 15 deletions Difficult_Rocket/client/render/sr1_ship.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,7 @@ def on_mouse_scroll(self, x: int, y: int, scroll_x: int, scroll_y: int):
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
Expand All @@ -284,19 +282,7 @@ def on_mouse_scroll(self, x: int, y: int, scroll_x: int, scroll_y: int):
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)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions docs/README-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion docs/src/update_logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

### 命令
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down

0 comments on commit c219da2

Please sign in to comment.