update 更新点小东西

Difficult_Rocket/client/__init__.py

@@ -24,7 +24,7 @@ from Difficult_Rocket import Options
 from Difficult_Rocket.command import line, tree
 from Difficult_Rocket.utils import new_thread
 from Difficult_Rocket.utils.translate import tr
-from Difficult_Rocket.guis.widgets import InputBox
+from Difficult_Rocket.client.guis.widgets import InputBox
 # from Difficult_Rocket.client.screen import DRScreen
 from Difficult_Rocket.utils import tools, translate
 from Difficult_Rocket.client.fps.fps_log import FpsLogger

Difficult_Rocket/client/guis/format/__init__.py

@@ -0,0 +1,5 @@
+#  -------------------------------
+#  Difficult Rocket
+#  Copyright © 2021-2022 by shenjackyuanjie 3695888@qq.com
+#  All rights reserved
+#  -------------------------------

Difficult_Rocket/client/guis/format/html.py

@@ -208,8 +208,8 @@ class SingleTextStyle:
 # [\u4e00-\u9fa5] 中文字符
 default_fonts_config = [
     {
-        'match': re.compile(r'.'),  # 匹配的字符  匹配选项是re.compile()
-        'shown': re.compile(r'.'),  # 匹配到的字符中显示的部分  匹配选项是re.compile()
+        'match': re.compile(r''),  # 匹配的字符  匹配选项是re.compile()
+        'shown': re.compile(r''),  # 匹配到的字符中显示的部分  匹配选项是re.compile()
         'style': SingleTextStyle(font_name=translate.鸿蒙简体, font_size=15, bold=False, italic=False, show=True, color='white'),
     },
     {

Difficult_Rocket/client/guis/widgets.py

@@ -11,8 +11,8 @@ github: @shenjackyuanjie
 gitee:  @shenjackyuanjie
 """
 
-from utils import translate
-from Difficult_Rocket.guis.format import html
+from Difficult_Rocket.utils import translate
+from Difficult_Rocket.client.guis.format import html
 from Difficult_Rocket import DR_option
 
 # from libs import pyglet

Difficult_Rocket/client/screen.py

@@ -4,7 +4,7 @@
 #  All rights reserved
 #  -------------------------------
 
-import ctypes
+# import ctypes
 
 from Difficult_Rocket.client import ClientWindow
 from Difficult_Rocket.command.tree import CommandTree

Difficult_Rocket/client/window.py

@@ -0,0 +1,5 @@
+#  -------------------------------
+#  Difficult Rocket
+#  Copyright © 2021-2022 by shenjackyuanjie 3695888@qq.com
+#  All rights reserved
+#  -------------------------------

Difficult_Rocket/guis/format/html.jl

@@ -1,19 +0,0 @@
-#=
-html:
-- Julia version: 1.7.2
-- Author: shenjack
-- Date: 2022-04-26
-=#
-
-using PyCall
-
-include("../../utils/translate.jl")
-
-struct default_style
-    font_name::String
-    font_size::UInt8
-    bold::Bool
-    italic::Bool
-end
-
-default_style = default_style(fonts.HOS)

configs/main.toml

@@ -8,8 +8,8 @@ fonts_folder = "libs/fonts"
 
 [window]
 style = "None"
-width = 956
-height = 569
+width = 763
+height = 448
 visible = true
 caption = "Difficult Rocket {version}"
 resizable = true

configs/textures.toml

@@ -0,0 +1,27 @@
+[Runtime]
+
+[Parts]
+battery = "Battery.png"
+beam = "Beam.png"
+cover_bottom = "CoverBottom.png"
+nose_cone = "NoseCone.png"
+
+[Editor]
+[[runtime]]
+"toolbar.dark" = "ToolbarDark.png"
+"toolbar.light" = "ToolbarLight.png"
+"button_side.dark" = "ButtonDarkSide.png"
+"button_side.light" = "ButtonLightSide.png"
+
+[[toggle_button]]
+stage = "ToolbarIconStaging.png"
+add_part = "ToolbarIconAddPart.png"
+menu = "ToolbarIconMenu.png"
+
+[[push_button]]
+zoom = "ToolbarIconZoom.png"
+"zoom.in" = "ToolbarIconZoomIn.png"
+"zoom.out" = "ToolbarIconZoomOut.png"
+play = "ToolbarIconPlay.png"
+rotate = "RotateButton.png"
+trash_can = "TrashCan.png"

test/gui/format/html_format.py

@@ -18,8 +18,7 @@ os.chdir('..')
 os.chdir('..')
 os.chdir('..')
 
-
-from Difficult_Rocket.guis.format import html
+from client.guis.format import html
 
 try_texts = [
     '明天天气很好',