DR_Team/Difficult-Rocket
DR_Team/Difficult-Rocket
6
2
Fork 0
Code Issues Pull Requests Projects Releases 25 Wiki Activity

fix typing

Browse Source
This commit is contained in:
shenjack 2025-02-10 17:36:35 +08:00
parent b4a770809f
commit a88f5a3f44
Signed by: shenjack
GPG Key ID: 7B1134A979775551
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Difficult_Rocket/client/__init__.py
View File

@ -62,7 +62,7 @@ class ClientOption(Options):
background_color: List[float] = [21 / 255, 22 / 255, 23 / 255, 0.0] background_color: List[float] = [21 / 255, 22 / 255, 23 / 255, 0.0]
caption: str = "Difficult Rocket v{DR_version}" caption: str = "Difficult Rocket v{DR_version}"
def load_file(self) -> None: def load_file(self):
file = DR_runtime.main_config file = DR_runtime.main_config
self.fps = int(file["runtime"]["fps"]) self.fps = int(file["runtime"]["fps"])
self.width = int(file["window"]["width"]) self.width = int(file["window"]["width"])
@ -76,6 +76,7 @@ class ClientOption(Options):
alpha = file["window"]["background_color"][3] alpha = file["window"]["background_color"][3]
self.background_color = [*color, alpha] self.background_color = [*color, alpha]
self.caption = DR_runtime.format(self.caption) self.caption = DR_runtime.format(self.caption)
return True
class Client: class Client:
@ -398,7 +399,7 @@ class ClientWindow(Window):
def get_sub_screen(self, title: str) -> BaseScreen | None: def get_sub_screen(self, title: str) -> BaseScreen | None:
"""获取一个页面 """获取一个页面
添加自: 0.9.2.0""" 添加自: 0.9.2.0"""
self.screen_list.setdefault(title, None) self.screen_list.setdefault(title, None) # type: ignore
return self.screen_list.get(title) return self.screen_list.get(title)
def remove_sub_screen(self, title: str) -> BaseScreen | None: def remove_sub_screen(self, title: str) -> BaseScreen | None:

14
mods/dr_game/sr1_ship.py
View File

@ -118,7 +118,7 @@ class SR1ShipSelecter(BaseScreen):
if not file.is_file: if not file.is_file:
continue continue
# 尝试加载一下 # 尝试加载一下
if assert_ship(str(file)): if assert_ship(str(file)): # type: ignore
logger.info( logger.info(
sr_tr().sr1.ship.ship.valid().format(file), tag="ship explorer" sr_tr().sr1.ship.ship.valid().format(file), tag="ship explorer"
) )
@ -293,7 +293,7 @@ class SR1ShipEditor(BaseScreen):
# Optional data # Optional data
self.textures: SR1Textures = SR1Textures() self.textures: SR1Textures = SR1Textures()
self.gen_draw: Generator | None = None self.gen_draw: Generator | None = None
self.rust_ship: SR1Ship_rs | None = None self.rust_ship: SR1Ship_rs | None = None # type: ignore
self.ship_name: str | None = None self.ship_name: str | None = None
# List/Dict data # List/Dict data
@ -303,7 +303,7 @@ class SR1ShipEditor(BaseScreen):
if DR_mod_runtime.use_DR_rust: if DR_mod_runtime.use_DR_rust:
self.rust_parts = None self.rust_parts = None
self.part_list_rs = SR1PartList_rs( self.part_list_rs = SR1PartList_rs( # type: ignore
"assets/builtin/PartList.xml", "builtin_part_list" "assets/builtin/PartList.xml", "builtin_part_list"
) )
@ -342,7 +342,7 @@ class SR1ShipEditor(BaseScreen):
logger.info(sr_tr().sr1.ship.xml.loading().format(file_path), tag="load_xml") logger.info(sr_tr().sr1.ship.xml.loading().format(file_path), tag="load_xml")
self.ship_name = file_path.stem self.ship_name = file_path.stem
if DR_mod_runtime.use_DR_rust: if DR_mod_runtime.use_DR_rust:
self.rust_ship = SR1Ship_rs( self.rust_ship = SR1Ship_rs( # type: ignore
str(file_path), self.part_list_rs, "a_new_ship" str(file_path), self.part_list_rs, "a_new_ship"
) )
logger.info(sr_tr().sr1.ship.xml.load_done(), tag="load_xml") logger.info(sr_tr().sr1.ship.xml.load_done(), tag="load_xml")
@ -556,7 +556,7 @@ class SR1ShipEditor(BaseScreen):
explorer = window.get_sub_screen(SR1ShipSelecter.name) explorer = window.get_sub_screen(SR1ShipSelecter.name)
if explorer is not None: if explorer is not None:
explorer.draw_batch_(window) explorer.draw_batch(window)
def on_draw(self, window: ClientWindow): def on_draw(self, window: ClientWindow):
if self.status.draw_call: if self.status.draw_call:
@ -584,7 +584,7 @@ class SR1ShipEditor(BaseScreen):
self.height = height self.height = height
def on_mouse_scroll( def on_mouse_scroll(
self, x: int, y: int, scroll_x: int, scroll_y: int, window: ClientWindow self, x: int, y: int, scroll_x: float, scroll_y: float, window: ClientWindow
): ):
if self.status.focus: if self.status.focus:
mouse_dx = x - (self.width / 2) + self.dx mouse_dx = x - (self.width / 2) + self.dx
@ -748,7 +748,7 @@ class SR1ShipEditor(BaseScreen):
self.dx += dx self.dx += dx
self.dy += dy self.dy += dy
def on_file_drop(self, x: int, y: int, paths: list[str], window: ClientWindow): def on_file_drop(self, x: int, y: int, paths: list[str], window: ClientWindow): # type: ignore
if len(paths) == 1: if len(paths) == 1:
# only file/path # only file/path
self.load_xml(Path(paths[0])) self.load_xml(Path(paths[0]))