From 5ef109b9af00dc3c73e93da0e0d12adda958665d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E7=91=97=E6=9D=B0?= <3695888@qq.com> Date: Thu, 4 Feb 2021 19:05:09 +0800 Subject: [PATCH] reee --- bin/client.py | 3 --- bin/configs.py | 7 +++++-- sys_value/basic_config.json5 | 6 +++++- sys_value/parts.json5 | 12 ++++++++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/bin/client.py b/bin/client.py index e87bffe..997ef0c 100644 --- a/bin/client.py +++ b/bin/client.py @@ -25,9 +25,6 @@ class RenderThread(mp.Process, pyglet.window.Window): def __init__(self, dev_list, dev_dic, logger, net_mode='local'): """ - rua! 用 中 文 - __init__ 内定义的变量都是必须用传入变量定义的 - 其他的都放在setup里了 :param dev_list: 共享内存 :param dev_dic: 共享内存 :param logger: logger diff --git a/bin/configs.py b/bin/configs.py index 4f129c8..bf45c51 100644 --- a/bin/configs.py +++ b/bin/configs.py @@ -4,18 +4,21 @@ mail: 3695888@qq.com """ # import re -import bin import time import json5 import decimal +try: + import tools +except ModuleNotFoundError: + from bin import tools def __basic_number(int_num=0, float_num=1, unit1=None, unit2=None) -> list: if unit1 is None: unit1 = [] if unit2 is None: unit2 = [] - if bin.tools.is_decimal(float_num): # is decimal class? + if tools.is_decimal(float_num): # is decimal class? return [int_num, float_num, unit1, unit2] # is just return else: return [int_num, decimal.Decimal(str(float_num)), unit1, unit2] # no create a decimal class diff --git a/sys_value/basic_config.json5 b/sys_value/basic_config.json5 index 524c5be..9bea746 100644 --- a/sys_value/basic_config.json5 +++ b/sys_value/basic_config.json5 @@ -25,5 +25,9 @@ 'kg' ] ] - } + }, + 'defaut ship': + [ + + ] } \ No newline at end of file diff --git a/sys_value/parts.json5 b/sys_value/parts.json5 index eb2b486..8ec2327 100644 --- a/sys_value/parts.json5 +++ b/sys_value/parts.json5 @@ -23,7 +23,7 @@ [ 'float', 'float' - ], + ] // 贴图偏移量 // 指的是部件的碰撞箱左上角到贴图左上角的距离 ], @@ -51,7 +51,15 @@ 0.1 ], [ - 'parts/Beam' + 'parts/Beam.png', + [ + 0.0, + 0.0 + ] + ], + [ + 3.0, + 2.0 ] ] } \ No newline at end of file