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

刷版本号！（不是

Browse Source
This commit is contained in:
shenjack 2024-08-04 01:44:40 +08:00
parent 9e923e6e14
commit dea70c2a75
Signed by: shenjack
GPG Key ID: 7B1134A979775551
7 changed files with 27 additions and 607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Difficult_Rocket/__init__.py
View File

@ -10,9 +10,9 @@ from typing import TYPE_CHECKING
from Difficult_Rocket.api.types import Options, Version
sdk_version = Version("0.9.1.0") # SDK 版本
sdk_version = Version("0.9.2.0") # SDK 版本
build_version = Version("3.0.0.0") # 编译文件版本(与游戏本体无关)
api_version = Version("0.1.2.2") # API 版本
api_version = Version("0.1.2.3") # API 版本
__version__ = sdk_version
if TYPE_CHECKING:

6
Difficult_Rocket/client/__init__.py
View File

@ -336,8 +336,14 @@ class ClientWindow(Window):
"""
def add_sub_screen(self, title: str, sub_screen: Type[BaseScreen]):
"""添加一个页面, 指定页面的名字"""
self.screen_list[title] = sub_screen(self)
def add_sub_screen_without_name(self, sub_screen: Type[BaseScreen]):
"""添加一个页面, 但直接使用页面的名字作为键
添加自: 0.9.2.0"""
self.screen_list[sub_screen.name] = sub_screen(self)
def remove_sub_screen(self, title: str) -> BaseScreen:
"""
去除一个页面, 返回被去掉的页面

468
Difficult_Rocket/gui/widget/layout.py
View File

@ -1,468 +0,0 @@
# -------------------------------
# Difficult Rocket
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
from typing import Optional, Tuple
# from libs import pyglet
import pyglet
from pyglet.text import Label
from pyglet.gui import widgets
from pyglet.window import mouse
# from pyglet.sprite import Sprite
from pyglet.shapes import Rectangle, BorderedRectangle
# from pyglet.image import AbstractImage
from pyglet.graphics import Batch, Group
from Difficult_Rocket.api.types import Options, FontData
# from Difficult_Rocket import DR_status
RGBA = Tuple[int, int, int, int]
class BaseButtonTheme:
"""
按钮的风格
"""
name = "BaseButtonTheme"
def __init__(
self, x: int, y: int, width: int, height: int, batch: Batch, group: Group
):
self.batch = batch
self.group = group
self.x = x
self.y = y
self.width = width
self.height = height
self.enable = False
def on_enable(self, x: int, y: int, button):
"""
当按钮被启用的时候
:param x:
:param y:
:param button:
:return:
"""
def on_disable(self, button):
"""
当按钮被禁用的时候
:param button:
:return:
"""
def on_update(self, button) -> None:
"""
当按钮被更新的时候
:param button:
:return:
"""
class MinecraftWikiButtonTheme(BaseButtonTheme):
"""
直接绘制按钮的风格
"""
name = "MinecraftWikiButtonTheme"
def __init__(
self,
x: int,
y: int,
width: int,
height: int,
batch: Batch,
group: Group,
theme: dict = None,
):
super().__init__(x, y, width, height, batch, group)
self.batch = batch
self.group = group
a = (72, 73, 74, 255)
b = (109, 109, 110, 255)
c = (88, 91, 92, 255)
d = (124, 124, 125, 255) # 左下和右上两个重叠点的颜色.... 画吗？
e = (49, 50, 51, 255)
touch_a = (49, 50, 51, 255)
touch_b = (90, 91, 92, 255)
touch_c = (71, 72, 72, 255)
touch_d = (106, 107, 108, 255) # 同上
pad = 2 # 边框宽度 2 px
list_pad = 4 # 下巴 4px
if theme is None:
theme = {}
pop_out = theme.get("pop_out", False)
if pop_out:
# 主背景
self.back_ground = Rectangle(
x=x + (pad * 2),
y=y + (pad * 2) + list_pad,
width=width - (pad * 4),
height=height - (pad * 4) - list_pad,
color=a,
batch=batch,
group=Group(order=3, parent=group),
)
# 左上方向的覆盖
self.cover_back = Rectangle(
x=x + pad,
y=y + pad + list_pad,
width=width - (pad * 2),
height=height - (pad * 2) - list_pad,
color=b,
batch=batch,
group=Group(order=1, parent=group),
)
# 右下方向的覆盖
self.cover_back2 = Rectangle(
x=x + (pad * 2),
y=y + pad + list_pad,
width=width - (pad * 3),
height=height - (pad * 3) - list_pad,
color=c,
batch=batch,
group=Group(order=2, parent=group),
)
else:
# 主背景
self.back_ground = Rectangle(
x=x + (pad * 2),
y=y + (pad * 2) + list_pad,
width=width - (pad * 4),
height=height - (pad * 4) - list_pad,
color=c,
batch=batch,
group=Group(order=3, parent=group),
)
# 左上方向的覆盖
self.cover_back = Rectangle(
x=x + pad,
y=y + pad + list_pad,
width=width - (pad * 2),
height=height - (pad * 2) - list_pad,
color=a,
batch=batch,
group=Group(order=2, parent=group),
)
# 右下方向的覆盖
self.cover_back2 = Rectangle(
x=x + pad,
y=y + (pad * 2) + list_pad,
width=width - (pad * 3),
height=height - (pad * 3) - list_pad,
color=b,
batch=batch,
group=Group(order=1, parent=group),
)
# 下巴的框
self.list_back = BorderedRectangle(
x=x,
y=y,
width=width,
height=height,
border=pad,
border_color=(0, 0, 0, 255),
color=e,
batch=batch,
group=Group(order=0, parent=group),
)
self.a = a
self.b = b
self.c = c
self.d = d
self.e = e
self.touch_a = touch_a
self.touch_b = touch_b
self.touch_c = touch_c
self.touch_d = touch_d
self.pad = pad
self.list_pad = list_pad
self.pop_out = pop_out
self.drag_list = theme.get("drag_list", False)
def on_enable(self, x: int, y: int, button):
if self.pop_out:
self.back_ground.color = self.touch_a
self.cover_back.color = self.touch_b
self.cover_back2.color = self.touch_c
else:
self.back_ground.color = self.touch_c
self.cover_back.color = self.touch_a
self.cover_back2.color = self.touch_b
if self.drag_list:
button.text_label.y = (
self.y
+ (self.height - button.font_height) // 2
+ (button.font_height * 0.2)
+ (self.list_pad // 2)
)
self.back_ground.y = self.y + (self.pad * 2)
self.back_ground.height = self.height - (self.pad * 4)
self.cover_back.y = self.y + self.pad
self.cover_back.height = self.height - (self.pad * 2)
self.cover_back2.y = self.y + self.pad
self.cover_back2.height = self.height - (self.pad * 3)
else:
button.text_label.y = (
self.y
+ (self.height - button.font_height) // 2
+ (button.font_height * 0.2)
+ self.list_pad
)
self.enable = True
def on_disable(self, button) -> None:
if self.pop_out:
self.back_ground.color = self.a
self.cover_back.color = self.b
self.cover_back2.color = self.c
else:
self.back_ground.color = self.c
self.cover_back.color = self.a
self.cover_back2.color = self.b
if self.drag_list:
self.back_ground.y = self.y + (self.pad * 2) + self.list_pad
self.back_ground.height = self.height - (self.pad * 4) - self.list_pad
self.cover_back.y = self.y + self.pad + self.list_pad
self.cover_back.height = self.height - (self.pad * 2) - self.list_pad
self.cover_back2.y = self.y + self.pad + self.list_pad
self.cover_back2.height = self.height - (self.pad * 3) - self.list_pad
button.text_label.y = (
self.y
+ (self.height - button.font_height) // 2
+ (button.font_height * 0.2)
+ self.list_pad
)
self.enable = False
def on_update(self, button) -> None:
super().on_update(button)
if self.enable and self.drag_list:
button.text_label.y = (
self.y
+ (self.height - button.font_height) // 2
+ (button.font_height * 0.2)
+ self.list_pad // 2
)
self.back_ground.position = self.x + (self.pad * 2), self.y + (self.pad * 2)
self.back_ground.height = self.height - (self.pad * 4)
self.cover_back.position = self.x + self.pad, self.y + self.pad
self.cover_back.height = self.height - (self.pad * 2)
self.cover_back2.position = self.x + self.pad, self.y + self.pad
self.cover_back2.height = self.height - (self.pad * 3)
else:
button.text_label.y = (
self.y
+ (self.height - button.font_height) // 2
+ (button.font_height * 0.2)
+ self.list_pad
)
self.back_ground.position = (
self.x + (self.pad * 2),
self.y + (self.pad * 2) + self.list_pad,
)
self.back_ground.height = self.height - (self.pad * 4) - self.list_pad
self.cover_back.position = (
self.x + self.pad,
self.y + self.pad + self.list_pad,
)
self.cover_back.height = self.height - (self.pad * 2) - self.list_pad
self.cover_back2.position = (
self.x + self.pad,
self.y + self.pad + self.list_pad,
)
self.cover_back2.height = self.height - (self.pad * 3) - self.list_pad
self.back_ground.position = (
self.x + (self.pad * 2),
self.y + (self.pad * 2) + self.list_pad,
)
self.back_ground.height = self.height - (self.pad * 4) - self.list_pad
class ButtonThemeOptions(Options):
"""基于 Options 写的 ButtonTheme"""
name = "ButtonTheme"
untouched_color: RGBA = (39, 73, 114, 255)
touched_color: RGBA = (66, 150, 250, 255)
hit_color: RGBA = (15, 135, 250, 255)
font_theme: FontData = FontData()
def __str__(self):
return self.as_markdown()
class PressTextButton(widgets.WidgetBase):
"""
自带 字符 + 材质 的按钮，就不用单独做材质了
"""
def __init__(
self,
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[type(BaseButtonTheme)] = None,
dict_theme: Optional[dict] = None,
):
super().__init__(x, y, width, height)
self.main_batch = batch or Batch()
self.user_batch = batch is not None
self.front_group = Group(order=10, parent=group)
self.back_ground_group = Group(order=5, parent=group)
self.pressed = False
self.theme = theme or ButtonThemeOptions()
if dict_theme is None:
dict_theme = {}
self.dict_theme = dict_theme
self.untouched_color = self.theme.untouched_color
self.touched_color = self.theme.touched_color
self.hit_color = self.theme.hit_color
# from ImGui
self.text = text
self.text_label = Label(
font_name=self.theme.font_theme.font_name,
font_size=self.theme.font_theme.font_size,
batch=self.main_batch,
group=self.front_group,
x=self._x,
y=self._y + 4,
width=self._width,
height=self._height,
)
self.font = pyglet.font.load(
self.theme.font_theme.font_name,
self.theme.font_theme.font_size,
bold=self.theme.font_theme.bold,
italic=self.theme.font_theme.italic,
stretch=self.theme.font_theme.stretch,
)
self.font_height = self.font.ascent - self.font.descent
if draw_theme is None:
self.back_rec = Rectangle(
x=self._x,
y=self._y,
width=self._width,
height=self._height,
color=self.untouched_color, # ImGui color
batch=self.main_batch,
group=self.back_ground_group,
)
self.draw_theme = False
else:
self.draw_theme = draw_theme(
x=self._x,
y=self._y,
width=self._width,
height=self._height,
batch=self.main_batch,
group=self.back_ground_group,
theme=self.dict_theme,
)
self.draw_theme.on_update(self)
self.value = text # 重新分配一下高度和宽度的位置
@property
def value(self):
return self.text
@value.setter
def value(self, value):
self.text = value
self.text_label.text = value
text_width = self.text_label.content_width
self.text_label.x = self._x + (self.width - text_width) // 2
self.text_label.y = (
self._y + (self.height - self.font_height) // 2 + (self.font_height * 0.2)
) # 修正一下位置
@property
def batch(self) -> Batch:
return self.main_batch
@batch.setter
def batch(self, value: Batch):
assert isinstance(value, Batch), "batch must be a pyglet.graphics.Batch"
self.main_batch = value
self.text_label.batch = value
self.back_rec.batch = value
self.user_batch = True
def __contains__(self, point):
if self.draw_theme:
x, y = self.x, self.y
return x < point[0] < x + self._width and y < point[1] < y + self._height
return point in self.back_rec
def on_draw(self):
if not self.user_batch:
self.main_batch.draw()
def on_mouse_motion(self, x, y, dx, dy):
if (x, y) in self:
if self.draw_theme:
...
else:
self.back_rec.color = self.touched_color
else:
self.pressed = False
if self.draw_theme:
self.draw_theme.on_disable(self)
else:
self.back_rec.color = self.untouched_color
def on_mouse_press(self, x, y, buttons, modifiers) -> bool:
if (x, y) in self:
if buttons == mouse.LEFT:
if self.draw_theme:
self.draw_theme.on_enable(x, y, self)
else:
self.back_rec.color = self.hit_color
self.dispatch_event("on_press", x, y)
self.pressed = True
return True
else:
self.pressed = False
if self.draw_theme:
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):
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 _update_position(self):
self.text_label.position = self._x, self._y, 0
self.back_rec.position = self._x, self._y
self.back_rec.width = self._width
self.back_rec.height = self._height
PressTextButton.register_event_type("on_press")
PressTextButton.register_event_type("on_release")

49
Difficult_Rocket/gui/widget/theme/__init__.py
View File

@ -1,49 +0,0 @@
# -------------------------------
# Difficult Rocket
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
from typing import Optional, Tuple, TYPE_CHECKING
from pyglet.graphics import Batch, Group
class BaseTheme(dict):
"""
Base class of themes
"""
theme_name = "BaseTheme"
def __init__(self, **kwargs):
super().__init__(**kwargs)
for k, v in kwargs.items():
if hasattr(self, k):
setattr(self, k, v)
if TYPE_CHECKING:
def init(self, batch: Batch, group: Group, **kwargs) -> None:
"""
Init theme
:param batch: batch
:param group: group
:param kwargs: options
:return: None
"""
class FontTheme(BaseTheme):
"""
Base class of font themes
"""
theme_name = "FontTheme"
font_name: Optional[str] = "Times New Roman"
font_size: Optional[int] = 12
bold: Optional[bool] = False
italic: Optional[bool] = False
stretch: Optional[bool] = False
color: Optional[Tuple[int, int, int, int]] = (255, 255, 255, 255)
align: Optional[str] = "center"

49
Difficult_Rocket/gui/widget/theme/button.py
View File

@ -1,49 +0,0 @@
# -------------------------------
# Difficult Rocket
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------
from typing import Tuple
from pyglet.graphics import Batch, Group
from Difficult_Rocket.gui.widget.theme import BaseTheme, FontTheme
_RGBA = Tuple[int, int, int, int]
class ButtonBaseTheme(BaseTheme):
"""
Base theme of button
inherit from BaseTheme and dict
按钮的基础主题
继承了 BaseTheme 和 dict
"""
theme_name = "Button Base Theme"
def init(self, batch: Batch, group: Group, **kwargs) -> None:
"""
Init theme
:param batch: batch
:param group: group
:param kwargs: options
:return: None
"""
self.batch = batch
self.group = group
self.font_theme = FontTheme(**kwargs)
class BlockTheme(ButtonBaseTheme):
"""
button theme: Block like button
"""
theme_name = "Block Theme(button)"
main_color: _RGBA = (39, 73, 114, 255)
touch_color: _RGBA = (66, 150, 250, 255)
hit_color: _RGBA = (15, 135, 250, 255)
font_theme: FontTheme = FontTheme()

31
mods/dr_game/menu.py
View File

@ -49,40 +49,21 @@ class Menu(BaseScreen):
width=150,
height=30,
text="进入编辑器aaaa",
toggle_mode=True,
toggle_mode=False,
auto_release=True,
batch=self.main_batch,
group=self.main_group,
)
def on_release(x, y):
print("on_release", x, y)
...
# from .sr1_ship import SR1ShipEditor
# main_window.remove_sub_screen("DR_game_menu")
# main_window.add_sub_screen("SR1_ship", SR1ShipEditor)
# logger.info("added SR1_ship screen", tag="dr_game")
from .sr1_ship import SR1ShipEditor, SR1ShipSelecter
main_window.remove_sub_screen("DR_game_menu")
main_window.add_sub_screen(SR1ShipEditor.name, SR1ShipEditor)
main_window.add_sub_screen(SR1ShipSelecter.name, SR1ShipSelecter)
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.enter_ship_editor_button)
# def on_mouse_press(
# self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
# ):
# if (x, y) in self.wiki_shape1:
# self.wiki_shape1.pop_out = not self.wiki_shape1.pop_out
# if self.wiki_shape1.pop_out:
# self.wiki_shape1.colors = OreuiButtonStyles.game1_normal.value
# else:
# self.wiki_shape1.colors = OreuiButtonStyles.game1_press.value
# if (x, y) in self.wiki_shape2:
# self.wiki_shape2.pop_out = not self.wiki_shape2.pop_out
# def on_mouse_motion(self, x: int, y: int, dx: int, dy: int, window: ClientWindow):
# self.wiki_shape1.highlight = (x, y) in self.wiki_shape1
# self.wiki_shape2.highlight = (x, y) in self.wiki_shape2
# def on_draw(self, dt: float, window: ClientWindow): # TODO: wait for pyglet 2.1
def on_draw(self, window: ClientWindow):
self.main_batch.draw()

27
mods/dr_game/sr1_ship.py
View File

@ -523,22 +523,21 @@ class SR1ShipEditor(BaseScreen):
gl.glScissor(0, 0, self.window_pointer.width, self.window_pointer.height)
gl.glDisable(gl.GL_SCISSOR_TEST)
# def on_draw(self, dt: float, window): # TODO: wait for pyglet 2.1
def on_draw(self, window: ClientWindow):
if self.status.draw_call:
self.render_ship()
# if self.status.draw_call:
# self.render_ship()
if not self.status.draw_done:
try:
assert isinstance(
self.gen_draw, Generator
), f"self.gen_graw is not a Generator, but a {type(self.gen_draw)}"
next(self.gen_draw)
except (GeneratorExit, StopIteration):
self.status.draw_done = True
self.logger.info(sr_tr().sr1.ship.ship.render.done())
except TypeError:
pass
# if not self.status.draw_done:
# try:
# assert isinstance(
# self.gen_draw, Generator
# ), f"self.gen_graw is not a Generator, but a {type(self.gen_draw)}"
# next(self.gen_draw)
# except (GeneratorExit, StopIteration):
# self.status.draw_done = True
# self.logger.info(sr_tr().sr1.ship.ship.render.done())
# except TypeError:
# pass
self.debug_label.draw()