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

改了一个bug

Browse Source
This commit is contained in:
ssssssssboom 2024-06-03 20:45:27 +08:00
parent d216939171
commit 85a84cc1df
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
mods/dr_game/sr1_ship.py
View File

@ -808,31 +808,22 @@ class PressSelectShipButton(PressTextButton):
self.parent_window = parent_window self.parent_window = parent_window
def on_mouse_release(self, x, y, buttons, modifiers): def on_mouse_release(self, x, y, buttons, modifiers):
logger.info(self.parent_window.ships_buttons_begin_y,self.parent_window.ships_buttons_end_y,x,y) if self.pressed and (x, y) in self:
logger.info(y >= self.parent_window.ships_buttons_begin_y and y <= self.parent_window.ships_buttons_end_y) if self.draw_theme:
if ( self.draw_theme.on_disable(self)
self.parent_window.show_ships_buttons else:
and x >= self.parent_window.ships_buttons_begin_x self.back_rec.color = self.touched_color
and x <= self.parent_window.ships_buttons_end_x self.pressed = False
and y >= self.parent_window.ships_buttons_begin_y
and y <= self.parent_window.ships_buttons_end_y
):
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
root = Tk() # 创建一个Tkinter.Tk()实例 root = Tk() # 创建一个Tkinter.Tk()实例
root.withdraw() # 将Tkinter.Tk()实例隐藏 root.withdraw() # 将Tkinter.Tk()实例隐藏
file_name = filedialog.askopenfilename( file_name = filedialog.askopenfilename(
title="选择一个飞船存档", title="选择一个飞船存档",
initialdir="./", # 打开当前程序工作目录 initialdir="./", # 打开当前程序工作目录
) )
self.path_var = file_name self.path_var = file_name
self.parent_window.begin_ship_render_from_path(file_name) self.parent_window.begin_ship_render_from_path(file_name)
logger.info("加载飞船from " + self.path_var) logger.info("加载飞船from " + self.path_var)
def get_ship_path(self): def get_ship_path(self):
logger.info("加载飞船from " + self.path_var) logger.info("加载飞船from " + self.path_var)
@ -870,12 +861,19 @@ class PressOpenShipButton(PressTextButton):
return self.y return self.y
def on_mouse_release(self, x, y, buttons, modifiers): def on_mouse_release(self, x, y, buttons, modifiers):
if self.pressed and (x, y) in self: if (
if self.draw_theme: self.parent_window.show_ships_buttons
self.draw_theme.on_disable(self) and x >= self.parent_window.ships_buttons_begin_x
else: and x <= self.parent_window.ships_buttons_end_x
self.back_rec.color = self.touched_color and y >= self.parent_window.ships_buttons_begin_y
self.pressed = False and y <= self.parent_window.ships_buttons_end_y
):
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
self.parent_window.begin_ship_render_from_path(self.ship_path) self.parent_window.begin_ship_render_from_path(self.ship_path)
logger.info("加载飞船from " + self.ship_path) logger.info("加载飞船from " + self.ship_path)