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

fmt + ?

Browse Source
This commit is contained in:
shenjack 2024-07-02 00:16:16 +08:00
parent 42e2a0211f
commit ff9d31aa47
Signed by: shenjack
GPG Key ID: 7B1134A979775551
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mods/dr_game/Difficult_Rocket_rs/src/src/sr1_parse/data_structure/ship.rs
View File

@ -413,10 +413,9 @@ pub fn py_assert_ship(path: String) -> bool {
if !(founds.0 && founds.1 && founds.2) { if !(founds.0 && founds.1 && founds.2) {
println!( println!(
"warning: {}{}{} not found", "warning: {}{}{} not found",
if founds.0 { "" } else { "version " }, if founds.0 { "" } else { "version " },
if founds.1 { "" } else { "liftedOff " }, if founds.1 { "" } else { "liftedOff " },
if founds.2 { "" } else { "touchingGround " } if founds.2 { "" } else { "touchingGround " }
); );
return false; return false;
} }
@ -425,7 +424,7 @@ pub fn py_assert_ship(path: String) -> bool {
x => { x => {
println!("ERROR while using xml to parse the file!\n{:?}\n----------", x); println!("ERROR while using xml to parse the file!\n{:?}\n----------", x);
return false; return false;
}, }
} }
true true
} }

15
mods/dr_game/menu.py
View File

@ -17,6 +17,8 @@ from Difficult_Rocket.gui.widget.button import (
from lib_not_dr import loggers from lib_not_dr import loggers
from pyglet.text import Label
# from . import DR_mod_runtime # from . import DR_mod_runtime
logger = loggers.config.get_logger_from_old("client.dr_game_menu", "client") logger = loggers.config.get_logger_from_old("client.dr_game_menu", "client")
@ -91,6 +93,19 @@ class Menu(BaseScreen):
# batch=self.main_batch, # batch=self.main_batch,
# group=self.main_group, # 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( self.enter_ship_editor_button = PressTextButton(
x=100, x=100,
y=100, y=100,