Merge pull request #41 from shenjackyuanjie/feature/assets

Feature/assets

.github/workflows/get_info.py

@@ -19,10 +19,10 @@ if sys.argv == [__file__]:  # 没有输入参数，直接输出默认信息并
     print(sys.version)
     from Difficult_Rocket.utils import tools
     # 重置窗口信息
-    config_file = tools.load_file('./configs/main.toml')
+    config_file = tools.load_file('./config/main.toml')
     config_file['window']['width'] = 1024
     config_file['window']['height'] = 768
-    rtoml.dump(config_file, open('./configs/main.toml', 'w'))
+    rtoml.dump(config_file, open('./config/main.toml', 'w'))
 
 elif os.path.abspath(os.curdir) in sys.path and '-env' in sys.argv:
     with open('./.github/workflows/env.ps1', encoding='utf-8', mode='w') as env_file:

.github/workflows/nuitka.yml

@@ -7,7 +7,6 @@ on:
   push:
     paths:
       - "Difficult_Rocket/**"  # 本体修改
-      - "configs/**"  # 配置修改
       - "libs/pyglet/**"  # pyglet 修改
       - ".github/workflows/**"  # workflow 修改
       - "nuitka_build.py"  # 构建脚本修改
@@ -15,7 +14,6 @@ on:
   pull_request:
     paths:
       - "Difficult_Rocket/**"  # 本体修改
-      - "configs/**"  # 配置修改
       - "libs/pyglet/**"  # pyglet 修改
       - ".github/workflows/**"  # workflow 修改
       - "nuitka_build.py"  # 构建脚本修改

Difficult_Rocket/__init__.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 from Difficult_Rocket.api.types import Options, Version
 
-sdk_version = Version("0.8.5.2")  # SDK 版本
+sdk_version = Version("0.8.6.0")  # SDK 版本
 build_version = Version("2.1.3.0")  # 编译文件版本(与游戏本体无关)
 Api_version = Version("0.1.1.0")  # API 版本
 __version__ = sdk_version
@@ -76,7 +76,7 @@ DR_status = _DR_status()
 
 
 def load_logging():
-    with open('./configs/logger.toml') as f:
+    with open('./config/logger.toml') as f:
         import rtoml
         logger_config = rtoml.load(f)
     log_path = logger_config['handlers']['file']['filename']

Difficult_Rocket/client/__init__.py

@@ -59,7 +59,7 @@ class ClientOption(Options):
     caption: str = "Difficult Rocket v{DR_version}"
 
     def load_file(self) -> None:
-        file: dict = tools.load_file('./configs/main.toml')
+        file: dict = tools.load_file('./config/main.toml')
         self.fps = int(file['runtime']['fps'])
         self.width = int(file['window']['width'])
         self.height = int(file['window']['height'])
@@ -215,9 +215,9 @@ class ClientWindow(Window):
         self.net_mode = net_mode
         self.run_input = False
         self.command_list: List[str] = []
-        # configs
-        self.main_config = tools.load_file('./configs/main.toml')
-        self.game_config = tools.load_file('./configs/game.config')
+        # config
+        self.main_config = tools.load_file('./config/main.toml')
+        self.game_config = tools.load_file('./config/game.config')
         # FPS
         self.FPS = Decimal(int(self.main_config['runtime']['fps']))
         self.SPF = Decimal('1') / self.FPS
@@ -250,7 +250,7 @@ class ClientWindow(Window):
         self.count = 0
 
     def setup(self):
-        self.set_icon(pyglet.image.load('./textures/icon.png'))
+        self.set_icon(pyglet.image.load('assets/textures/icon.png'))
         self.load_fonts()
         self.screen_list['DR_debug'] = DRDEBUGScreen(self)
         self.game.dispatch_mod_event('on_client_start', game=self.game, client=self)
@@ -262,7 +262,7 @@ class ClientWindow(Window):
         pyglet_load_fonts_folder(fonts_folder_path)
 
     def start_game(self) -> None:
-        self.set_icon(pyglet.image.load('./textures/icon.png'))
+        self.set_icon(pyglet.image.load('assets/textures/icon.png'))
         try:
             pyglet.app.event_loop.run(1 / self.main_config['runtime']['fps'])
         except KeyboardInterrupt:
@@ -275,11 +275,11 @@ class ClientWindow(Window):
     @new_thread('window save_info')
     def save_info(self):
         self.logger.info(tr().client.config.save.start())
-        config_file: dict = tools.load_file('./configs/main.toml')
+        config_file: dict = tools.load_file('./config/main.toml')
         config_file['window']['width'] = self.width
         config_file['window']['height'] = self.height
         config_file['runtime']['language'] = DR_runtime.language
-        rtoml.dump(config_file, open('./configs/main.toml', 'w'))
+        rtoml.dump(config_file, open('./config/main.toml', 'w'))
         self.logger.info(tr().client.config.save.done())
 
     """
@@ -373,7 +373,7 @@ class ClientWindow(Window):
                 tr._language = lang
                 self.logger.info(tr().language_set_to())
             except LanguageNotFound:
-                self.logger.info(tr().language_available().format(os.listdir('./configs/lang')))
+                self.logger.info(tr().language_available().format(os.listdir('./config/lang')))
             self.save_info()
         elif command.find('mods'):
             if command.find('list'):

Difficult_Rocket/crash/__init__.py

@@ -77,7 +77,7 @@ def create_crash_report(info: Optional[str] = None) -> None:
     crash_info = crash_info_handler(info)
     if 'crash_report' not in os.listdir('./'):
         os.mkdir('./crash_report')
-    date_time = time.strftime('%Y-%m-%d %H-%M-%S', time.gmtime(time.time()))
+    date_time = time.strftime('%Y-%m-%d %H-%M-%S', time.localtime())
     filename = f'crash-{date_time}.md'
     cache_stream = io.StringIO()
     try:
@@ -92,7 +92,7 @@ def create_crash_report(info: Optional[str] = None) -> None:
 
 def write_cache(cache_stream, crash_info):
     # 开头信息
-    cache_stream.write(Head_message.format(now_time=time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(time.time()))))
+    cache_stream.write(Head_message.format(now_time=time.strftime('%Y/%m/%d %H:%M:%S', time.localtime())))
     # 崩溃信息
     cache_stream.write(crash_info)
 

Difficult_Rocket/runtime.py

@@ -37,7 +37,7 @@ class _DR_runtime(Options):
 
     def load_file(self) -> bool:
         with contextlib.suppress(FileNotFoundError):
-            with open('./configs/main.toml', 'r', encoding='utf-8') as f:
+            with open('./config/main.toml', 'r', encoding='utf-8') as f:
                 import rtoml
                 config_file = rtoml.load(f)
                 self.language = config_file['runtime']['language']

Difficult_Rocket/server/__init__.py

@@ -36,7 +36,7 @@ class Server:
         # os.set
         self.process_name = 'server process'
         # config
-        self.config = tools.load_file('configs/main.toml')
+        self.config = tools.load_file('config/main.toml')
         # self.dev = Dev
         # self.net_mode = net_mode
         self.logger.info(tr().server.setup.use_time().format(time.time() - start_time))

Difficult_Rocket/utils/tools.py

@@ -30,7 +30,7 @@ from Difficult_Rocket.exception.unsupport import NoMoreJson5
 # logger
 tools_logger = logging.getLogger('tools')
 """
-file configs
+file config
 """
 
 file_error = {FileNotFoundError: 'no {filetype} file was founded!:\n file name: {filename}\n file_type: {filetype}\n stack: {stack}',
@@ -99,7 +99,7 @@ def save_dict_file(file_name: str,
 
 
 # main config
-main_config_file = load_file('./configs/main.toml')
+main_config_file = load_file('./config/main.toml')
 
 
 def get_At(name, in_xml, need_type=str):

Difficult_Rocket/utils/translate.py

@@ -165,7 +165,7 @@ class Tr:
         :param lang_path: 语言文件夹路径
         """
         self.language_name = language if language is not None else DR_runtime.language
-        self.language_path = lang_path if lang_path is not None else Path('configs/lang')
+        self.language_path = lang_path if lang_path is not None else Path('assets/lang')
         self.translates: Dict[str, Union[str, Dict]] = tools.load_file(self.language_path / f'{self.language_name}.toml')
         self.default_translate: Dict = tools.load_file(f'{self.language_path}/{DR_status.default_language}.toml')
         self.default_config = config.set('source', self) if config is not None else TranslateConfig(source=self)

README.md

@@ -20,7 +20,7 @@
 [关于版本号的说明](./docs/src/version.md)
 
 [![Generic badge](https://img.shields.io/badge/Release-0.8.5.1-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases)
-[![Generic badge](https://img.shields.io/badge/Pre_Release-0.8.5.1-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases)
+[![Generic badge](https://img.shields.io/badge/Pre_Release-0.8.6.0-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases)
 [![Generic badge](https://img.shields.io/badge/Devloping-0.8.6-blue.svg)](https://github.com/shenjackyuanjie/Difficult-Rocket/releases)
 
 [![language badge](https://stats.deeptrain.net/repo/shenjackyuanjie/Difficult-Rocket?theme=dark)](https://stats.deeptrain.net/repo/shenjackyuanjie/Difficult-Rocket?theme=dark)
@@ -94,7 +94,7 @@ viztracer >= 0.15.6; platform_python_implementation != "PyPy"
 vizplugins >= 0.1.3; platform_python_implementation != "PyPy"
 
 # for compile
-nuitka >= 1.6.6
+nuitka >= 1.7.5
 ordered-set >= 4.1.0
 imageio >= 2.31.0; (platform_python_implementation == "PyPy" and python_version < "3.10") or platform_python_implementation == "CPython"
 wheel >= 0.40.0