From ff9d31aa475e4a60f3ab2719ae5b80e03548b398 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Tue, 2 Jul 2024 00:16:16 +0800 Subject: [PATCH] fmt + ? --- .../src/src/sr1_parse/data_structure/ship.rs | 9 ++++----- mods/dr_game/menu.py | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_parse/data_structure/ship.rs b/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_parse/data_structure/ship.rs index 1392efe..04520b1 100644 --- a/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_parse/data_structure/ship.rs +++ b/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_parse/data_structure/ship.rs @@ -413,10 +413,9 @@ pub fn py_assert_ship(path: String) -> bool { if !(founds.0 && founds.1 && founds.2) { println!( "warning: {}{}{} not found", - if founds.0 { "" } else { "version " }, - if founds.1 { "" } else { "liftedOff " }, - if founds.2 { "" } else { "touchingGround " } - + if founds.0 { "" } else { "version " }, + if founds.1 { "" } else { "liftedOff " }, + if founds.2 { "" } else { "touchingGround " } ); return false; } @@ -425,7 +424,7 @@ pub fn py_assert_ship(path: String) -> bool { x => { println!("ERROR while using xml to parse the file!\n{:?}\n----------", x); return false; - }, + } } true } diff --git a/mods/dr_game/menu.py b/mods/dr_game/menu.py index 0cb5ed0..a8da01d 100644 --- a/mods/dr_game/menu.py +++ b/mods/dr_game/menu.py @@ -17,6 +17,8 @@ from Difficult_Rocket.gui.widget.button import ( from lib_not_dr import loggers +from pyglet.text import Label + # from . import DR_mod_runtime logger = loggers.config.get_logger_from_old("client.dr_game_menu", "client") @@ -91,6 +93,19 @@ class Menu(BaseScreen): # batch=self.main_batch, # group=self.main_group, # ) + + # 16、20、24、32、40、48 64 + # self.test_label = Label( + # x=20, y=200, + # font_name="Segoe Fluent Icons", + # font_size=32, + # text="\uE003 \uE005 \uE0A2 + # \uE88B \uE88C \uE88D \uE985 \uE97E \uF7B5 + # \uE971 \uE972 \uE973 \uE974", + # batch=self.main_batch, + # group=self.main_group, + # ) + self.enter_ship_editor_button = PressTextButton( x=100, y=100,