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

费劲.png

Browse Source
This commit is contained in:
shenjack-5600u 2024-06-05 07:42:57 +08:00
parent 85a84cc1df
commit d6179422d5
Signed by: shenjack
GPG Key ID: FDF9864E11C7E79F
4 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Difficult_Rocket/gui/widget/button.py
View File

@ -477,7 +477,6 @@ class PressTextButton(widgets.WidgetBase):
self.draw_theme.on_disable(self)
else:
self.back_rec.color = self.untouched_color
self.dispatch_event("on_release", x, y)
return False
def on_mouse_release(self, x, y, buttons, modifiers):
@ -487,6 +486,7 @@ class PressTextButton(widgets.WidgetBase):
else:
self.back_rec.color = self.touched_color
self.pressed = False
self.dispatch_event("on_release", self, x, y)
def _update_position(self):
self.text_label.position = self._x, self._y, 0

2
mods/dr_game/Difficult_Rocket_rs/src/setup.py
View File

@ -12,7 +12,7 @@ package_path = "Difficult_Rocket_rs"
setup(
name="Difficult_Rocket_rs",
version="0.3.1",
version="0.3.5",
author="shenjackyuanjie",
author_email="3695888@qq.com",
rust_extensions=[

2
mods/dr_game/Difficult_Rocket_rs/src/src/sr1_parse.rs
View File

@ -728,7 +728,7 @@ impl SR1Ship {
};
}
fn write_parts(parts: &Vec<SR1PartData>, writer: &mut Writer<Cursor<Vec<u8>>>, save_status: &SaveStatus) {
fn write_parts(parts: &[SR1PartData], writer: &mut Writer<Cursor<Vec<u8>>>, save_status: &SaveStatus) {
writer.write_event(Event::Start(BytesStart::new("Parts"))).unwrap();
for part in parts.iter() {
let mut part_attr = BytesStart::new("Part");

75
mods/dr_game/menu.py
View File

@ -93,8 +93,7 @@ class Menu(BaseScreen):
# batch=self.main_batch,
# group=self.main_group,
# )
self.enter_ship_editor_button = PressEnterShipEditorButton(
window=main_window,
self.enter_ship_editor_button = PressTextButton(
x=100,
y=100,
width=150,
@ -102,8 +101,18 @@ class Menu(BaseScreen):
text="进入编辑器",
batch=self.main_batch,
group=self.main_group,
draw_theme=MinecraftWikiButtonTheme
draw_theme=MinecraftWikiButtonTheme,
dict_theme={"pop_out": True}
)
def on_release(button: PressTextButton, x, y):
logger.info("on_mouse_release", x, y, button, tag="dr_game")
from .sr1_ship import SR1ShipRender
main_window.remove_sub_screen("DR_game_menu")
main_window.add_sub_screen("SR1_ship", SR1ShipRender)
logger.info("added SR1_ship screen", tag="dr_game")
self.enter_ship_editor_button.set_handler("on_release", on_release)
# main_window.push_handlers(self.wiki_button1)
# main_window.push_handlers(self.wiki_button2)
# main_window.push_handlers(self.wiki_button3)
@ -115,37 +124,37 @@ class Menu(BaseScreen):
self.main_batch.draw()
class PressEnterShipEditorButton(PressTextButton):
def __init__(
self,
window: ClientWindow,
x: int,
y: int,
width: int,
height: int,
text: str,
batch: Optional[Batch] = None,
group: Optional[Group] = None,
theme: Optional[ButtonThemeOptions] = None,
draw_theme: Optional[BaseButtonTheme] = None,
dict_theme: Optional[dict] = None,
):
super().__init__(
x, y, width, height, text, batch, group, theme, draw_theme, dict_theme
)
self.window = window
# class PressEnterShipEditorButton(PressTextButton):
# def __init__(
# self,
# window: ClientWindow,
# x: int,
# y: int,
# width: int,
# height: int,
# text: str,
# batch: Optional[Batch] = None,
# group: Optional[Group] = None,
# theme: Optional[ButtonThemeOptions] = None,
# draw_theme: Optional[BaseButtonTheme] = None,
# dict_theme: Optional[dict] = None,
# ):
# super().__init__(
# x, y, width, height, text, batch, group, theme, draw_theme, dict_theme
# )
# self.window = window
def on_mouse_release(self, x, y, buttons, modifiers):
if self.pressed and (x, y) in self:
if self.draw_theme:
self.draw_theme.on_disable(self)
else:
self.back_rec.color = self.touched_color
self.pressed = False
# def on_mouse_release(self, x, y, buttons, modifiers):
# if self.pressed and (x, y) in self:
# if self.draw_theme:
# self.draw_theme.on_disable(self)
# else:
# self.back_rec.color = self.touched_color
# self.pressed = False
from .sr1_ship import SR1ShipRender
# from .sr1_ship import SR1ShipRender
self.window.remove_sub_screen("DR_game_menu")
self.window.add_sub_screen("SR1_ship", SR1ShipRender)
logger.info("added SR1_ship screen", tag="dr_game")
# self.window.remove_sub_screen("DR_game_menu")
# self.window.add_sub_screen("SR1_ship", SR1ShipRender)
# logger.info("added SR1_ship screen", tag="dr_game")