From d57da4c7ff3a47ded126c29bb7b060ce4ea0cf6f Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 00:06:17 +0800 Subject: [PATCH 1/8] go for it! --- .github/workflows/get_info.py | 4 ++-- .github/workflows/nuitka.yml | 2 -- Difficult_Rocket/__init__.py | 2 +- Difficult_Rocket/client/__init__.py | 14 +++++++------- Difficult_Rocket/runtime.py | 2 +- Difficult_Rocket/server/__init__.py | 2 +- Difficult_Rocket/utils/tools.py | 4 ++-- Difficult_Rocket/utils/translate.py | 2 +- {configs => assets/builtin}/PartList.xml | 0 {configs => assets/builtin}/dock1.xml | 0 {configs => assets/builtin}/none_ship.xml | 0 {configs => assets}/lang/en-us.toml | 0 {configs => assets}/lang/zh-CN.toml | 0 {textures => assets/textures}/Atmospheres.png | Bin {textures => assets/textures}/BackButton.PNG | Bin {textures => assets/textures}/CommonGui.png | Bin {textures => assets/textures}/CommonGui.xml | 0 {textures => assets/textures}/DefaultShip.xml | 0 {textures => assets/textures}/Editor.json5 | 0 {textures => assets/textures}/Editor.png | Bin {textures => assets/textures}/Editor.xml | 0 .../textures}/Editor/ButtonDarkSide.png | Bin .../textures}/Editor/ButtonLightSide.png | Bin .../textures}/Editor/DeleteButton.png | Bin .../textures}/Editor/DuplicateButton.png | Bin .../textures}/Editor/MirrorButton.png | Bin .../textures}/Editor/PartButton.png | Bin .../textures}/Editor/PartGroupHeader.png | Bin .../textures}/Editor/RotateButton.png | Bin .../textures}/Editor/ToolbarDark.png | Bin .../textures}/Editor/ToolbarIconAddPart.png | Bin .../textures}/Editor/ToolbarIconMenu.png | Bin .../textures}/Editor/ToolbarIconPlay.png | Bin .../textures}/Editor/ToolbarIconStaging.png | Bin .../textures}/Editor/ToolbarIconZoom.png | Bin .../textures}/Editor/ToolbarIconZoomIn.png | Bin .../textures}/Editor/ToolbarIconZoomOut.png | Bin .../textures}/Editor/ToolbarLight.png | Bin {textures => assets/textures}/Editor/TrashCan.png | Bin {textures => assets/textures}/EmptyShip.xml | 0 {textures => assets/textures}/File-Icon-320.png | Bin {textures => assets/textures}/File-Icon-64.png | Bin {textures => assets/textures}/Flame.png | Bin {textures => assets/textures}/Flame.xml | 0 {textures => assets/textures}/Header.png | Bin {textures => assets/textures}/Inputs.xml | 0 .../textures}/LevelAdvancedDocking.xml | 0 .../textures}/LevelLandingTraining.xml | 0 .../textures}/LevelOptimumTrajectory.xml | 0 .../textures}/LevelOrbitTraining.xml | 0 .../textures}/LevelSatelliteRecovery.xml | 0 .../textures}/LevelSimpleDocking.xml | 0 .../textures}/LevelSmearthLanding.xml | 0 {textures => assets/textures}/Menu.png | Bin {textures => assets/textures}/Menu.xml | 0 {textures => assets/textures}/PartList.xml | 0 .../textures}/PlanetCrustHalley.png | Bin .../textures}/PlanetCrustSmaturn.png | Bin .../textures}/PlanetCrustSmenus.png | Bin .../textures}/PlanetCrustSmeptune.png | Bin .../textures}/PlanetCrustSmercury.png | Bin .../textures}/PlanetCrustSmoon.png | Bin .../textures}/PlanetCrustSmupiter.png | Bin .../textures}/PlanetCrustSmuranus.png | Bin .../textures}/PlanetCrustTitan.png | Bin {textures => assets/textures}/PlanetSprites.png | Bin {textures => assets/textures}/PlanetSprites.xml | 0 {textures => assets/textures}/Runtime.json5 | 0 {textures => assets/textures}/Runtime.png | Bin {textures => assets/textures}/Runtime.xml | 0 .../textures}/SatelleteRendezvous.xml | 0 {textures => assets/textures}/ShipSprites.xml | 0 {textures => assets/textures}/SkinAngel.xml | 0 {textures => assets/textures}/SkinCartoon.xml | 0 {textures => assets/textures}/SkinGuardian.xml | 0 {textures => assets/textures}/SkinLava.xml | 0 {textures => assets/textures}/SkinPlatinum.xml | 0 {textures => assets/textures}/SmolarSystem.xml | 0 {textures => assets/textures}/Water.png | Bin .../textures}/back up/CommonGui.png | Bin {textures => assets/textures}/back up/Editor.png | Bin {textures => assets/textures}/back up/Menu.png | Bin {textures => assets/textures}/back up/Runtime.png | Bin .../textures}/back up/ShipSprites.png | Bin .../textures}/back up/SkinAngel.png | Bin .../textures}/back up/SkinCartoon.png | Bin .../textures}/back up/SkinGuardian.png | Bin .../textures}/back up/SkinIconAngel.png | Bin .../textures}/back up/SkinIconCartoon.png | Bin .../textures}/back up/SkinIconGuardian.png | Bin .../textures}/back up/SkinIconLava.png | Bin .../textures}/back up/SkinIconPlatinum.png | Bin .../textures}/back up/SkinLava.png | Bin .../textures}/back up/SkinPlatinum.png | Bin .../textures}/back_ground_space.png | Bin {textures => assets/textures}/earth_ground.png | Bin {textures => assets/textures}/explosion/1.png | Bin {textures => assets/textures}/explosion/10.png | Bin {textures => assets/textures}/explosion/2.png | Bin {textures => assets/textures}/explosion/3.png | Bin {textures => assets/textures}/explosion/4.png | Bin {textures => assets/textures}/explosion/5.png | Bin {textures => assets/textures}/explosion/6.png | Bin {textures => assets/textures}/explosion/7.png | Bin {textures => assets/textures}/explosion/8.png | Bin {textures => assets/textures}/explosion/9.png | Bin {textures => assets/textures}/hand.png | Bin {textures => assets/textures}/icon.ico | Bin {textures => assets/textures}/icon.png | Bin .../textures}/ion_engine_flame.png | Bin .../textures}/liquid_engine_flame.png | Bin {textures => assets/textures}/mars_ground.png | Bin {textures => assets/textures}/parts/Battery.png | Bin {textures => assets/textures}/parts/Beam.png | Bin .../textures}/parts/CoverBottom.png | Bin .../textures}/parts/CoverStretch.png | Bin {textures => assets/textures}/parts/CoverTop.png | Bin .../textures}/parts/DetacherRadial.png | Bin .../textures}/parts/DetacherVertical.png | Bin .../textures}/parts/DockingConnector.png | Bin .../textures}/parts/DockingPort.png | Bin {textures => assets/textures}/parts/EngineIon.png | Bin .../textures}/parts/EngineLarge.png | Bin .../textures}/parts/EngineMedium.png | Bin .../textures}/parts/EngineSmall.png | Bin .../textures}/parts/EngineTiny.png | Bin {textures => assets/textures}/parts/Fuselage.png | Bin .../textures}/parts/LanderLegJoint.png | Bin .../textures}/parts/LanderLegLower.png | Bin .../textures}/parts/LanderLegPreview.png | Bin .../textures}/parts/LanderLegUpper.png | Bin {textures => assets/textures}/parts/NoseCone.png | Bin {textures => assets/textures}/parts/Parachute.png | Bin .../textures}/parts/ParachuteCanister.png | Bin .../textures}/parts/ParachuteCanisterSide.png | Bin {textures => assets/textures}/parts/Pod.png | Bin {textures => assets/textures}/parts/Puffy750.png | Bin {textures => assets/textures}/parts/RcsBlock.png | Bin {textures => assets/textures}/parts/SideTank.png | Bin .../textures}/parts/SolarPanel.png | Bin .../textures}/parts/SolarPanelBase.png | Bin .../textures}/parts/SolidRocketBooster.png | Bin {textures => assets/textures}/parts/TankLarge.png | Bin .../textures}/parts/TankMedium.png | Bin {textures => assets/textures}/parts/TankSmall.png | Bin {textures => assets/textures}/parts/TankTiny.png | Bin {textures => assets/textures}/parts/Wheel.png | Bin {textures => assets/textures}/parts/Wing.png | Bin .../textures}/runtime/ActionButton.png | Bin .../textures}/runtime/ActionButtonSelected.png | Bin .../textures}/runtime/AltimeterControl.PNG | Bin {textures => assets/textures}/runtime/Button.png | Bin .../textures}/runtime/ButtonIconActivateStage.png | Bin .../textures}/runtime/ButtonIconMapView.png | Bin .../textures}/runtime/ButtonIconMenu.png | Bin .../textures}/runtime/ButtonPressed.png | Bin {textures => assets/textures}/runtime/DR-icon.png | Bin .../textures}/runtime/DialogBackground.png | Bin .../textures}/runtime/FastForward.png | Bin .../textures}/runtime/ForwardButton.png | Bin .../textures}/runtime/ForwardButtonBottomBar.PNG | Bin .../textures}/runtime/ForwardButtonPressed.png | Bin .../textures}/runtime/ForwardButtonTopBar.png | Bin .../textures}/runtime/FuelDrainIcon.png | Bin .../textures}/runtime/FuelFillIcon.png | Bin .../textures}/runtime/MarkerApoapsis.png | Bin .../textures}/runtime/MarkerClosest.png | Bin .../textures}/runtime/MarkerEncounter.png | Bin .../textures}/runtime/MarkerPeriapsis.png | Bin .../textures}/runtime/PathSegment.png | Bin .../textures}/runtime/PlayButton.png | Bin .../textures}/runtime/RotateButton.png | Bin .../textures}/runtime/RotateButtonPressed.png | Bin .../textures}/runtime/SmokeParticle.PNG | Bin .../textures}/runtime/StageControlBottom.PNG | Bin .../textures}/runtime/StageControlStretch.PNG | Bin .../textures}/runtime/StageControlTop.PNG | Bin .../textures}/runtime/SteerButton.png | Bin .../textures}/runtime/SteerButtonPressed.png | Bin .../textures}/runtime/StopButton.png | Bin .../textures}/runtime/ThrottleControl.png | Bin .../textures}/runtime/ThrottleLevel1.png | Bin .../textures}/runtime/ThrottleLevel10.png | Bin .../textures}/runtime/ThrottleLevel2.png | Bin .../textures}/runtime/ThrottleLevel3.png | Bin .../textures}/runtime/ThrottleLevel4.png | Bin .../textures}/runtime/ThrottleLevel5.png | Bin .../textures}/runtime/ThrottleLevel6.png | Bin .../textures}/runtime/ThrottleLevel7.png | Bin .../textures}/runtime/ThrottleLevel8.png | Bin .../textures}/runtime/ThrottleLevel9.png | Bin .../textures}/runtime/TimeControl.PNG | Bin .../textures}/runtime/ToolbarSide.PNG | Bin .../textures}/runtime/ToolbarStretch.PNG | Bin .../textures}/runtime/UnlockHeading.png | Bin .../textures}/runtime/WarpBarSide.PNG | Bin .../textures}/runtime/WarpBarStretch.png | Bin .../textures}/runtime/WarpButton.png | Bin .../textures}/runtime/WarpSpeedButton.png | Bin .../textures}/runtime/background.png | Bin .../textures}/runtime/background_ka1.jpg | Bin .../textures}/runtime/background_ka2.jpg | Bin .../textures}/soild_engine_flame.png | Bin {textures => assets/textures}/train.jpg | Bin {configs => config}/local_logger.toml | 0 {configs => config}/logger.toml | 0 {configs => config}/main.toml | 0 libs/utils/nuitka.py | 3 ++- mods/dr_game/Difficult_Rocket_rs/__init__.py | 11 +++++++---- .../dr_game/Difficult_Rocket_rs/src/src/python.rs | 4 ++-- .../Difficult_Rocket_rs/src/src/sr1_data.rs | 6 +++--- mods/dr_game/sr1_ship.py | 6 +++--- nuitka_build.py | 2 +- 213 files changed, 33 insertions(+), 31 deletions(-) rename {configs => assets/builtin}/PartList.xml (100%) rename {configs => assets/builtin}/dock1.xml (100%) rename {configs => assets/builtin}/none_ship.xml (100%) rename {configs => assets}/lang/en-us.toml (100%) rename {configs => assets}/lang/zh-CN.toml (100%) rename {textures => assets/textures}/Atmospheres.png (100%) rename {textures => assets/textures}/BackButton.PNG (100%) rename {textures => assets/textures}/CommonGui.png (100%) rename {textures => assets/textures}/CommonGui.xml (100%) rename {textures => assets/textures}/DefaultShip.xml (100%) rename {textures => assets/textures}/Editor.json5 (100%) rename {textures => assets/textures}/Editor.png (100%) rename {textures => assets/textures}/Editor.xml (100%) rename {textures => assets/textures}/Editor/ButtonDarkSide.png (100%) rename {textures => assets/textures}/Editor/ButtonLightSide.png (100%) rename {textures => assets/textures}/Editor/DeleteButton.png (100%) rename {textures => assets/textures}/Editor/DuplicateButton.png (100%) rename {textures => assets/textures}/Editor/MirrorButton.png (100%) rename {textures => assets/textures}/Editor/PartButton.png (100%) rename {textures => assets/textures}/Editor/PartGroupHeader.png (100%) rename {textures => assets/textures}/Editor/RotateButton.png (100%) rename {textures => assets/textures}/Editor/ToolbarDark.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconAddPart.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconMenu.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconPlay.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconStaging.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconZoom.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconZoomIn.png (100%) rename {textures => assets/textures}/Editor/ToolbarIconZoomOut.png (100%) rename {textures => assets/textures}/Editor/ToolbarLight.png (100%) rename {textures => assets/textures}/Editor/TrashCan.png (100%) rename {textures => assets/textures}/EmptyShip.xml (100%) rename {textures => assets/textures}/File-Icon-320.png (100%) rename {textures => assets/textures}/File-Icon-64.png (100%) rename {textures => assets/textures}/Flame.png (100%) rename {textures => assets/textures}/Flame.xml (100%) rename {textures => assets/textures}/Header.png (100%) rename {textures => assets/textures}/Inputs.xml (100%) rename {textures => assets/textures}/LevelAdvancedDocking.xml (100%) rename {textures => assets/textures}/LevelLandingTraining.xml (100%) rename {textures => assets/textures}/LevelOptimumTrajectory.xml (100%) rename {textures => assets/textures}/LevelOrbitTraining.xml (100%) rename {textures => assets/textures}/LevelSatelliteRecovery.xml (100%) rename {textures => assets/textures}/LevelSimpleDocking.xml (100%) rename {textures => assets/textures}/LevelSmearthLanding.xml (100%) rename {textures => assets/textures}/Menu.png (100%) rename {textures => assets/textures}/Menu.xml (100%) rename {textures => assets/textures}/PartList.xml (100%) rename {textures => assets/textures}/PlanetCrustHalley.png (100%) rename {textures => assets/textures}/PlanetCrustSmaturn.png (100%) rename {textures => assets/textures}/PlanetCrustSmenus.png (100%) rename {textures => assets/textures}/PlanetCrustSmeptune.png (100%) rename {textures => assets/textures}/PlanetCrustSmercury.png (100%) rename {textures => assets/textures}/PlanetCrustSmoon.png (100%) rename {textures => assets/textures}/PlanetCrustSmupiter.png (100%) rename {textures => assets/textures}/PlanetCrustSmuranus.png (100%) rename {textures => assets/textures}/PlanetCrustTitan.png (100%) rename {textures => assets/textures}/PlanetSprites.png (100%) rename {textures => assets/textures}/PlanetSprites.xml (100%) rename {textures => assets/textures}/Runtime.json5 (100%) rename {textures => assets/textures}/Runtime.png (100%) rename {textures => assets/textures}/Runtime.xml (100%) rename {textures => assets/textures}/SatelleteRendezvous.xml (100%) rename {textures => assets/textures}/ShipSprites.xml (100%) rename {textures => assets/textures}/SkinAngel.xml (100%) rename {textures => assets/textures}/SkinCartoon.xml (100%) rename {textures => assets/textures}/SkinGuardian.xml (100%) rename {textures => assets/textures}/SkinLava.xml (100%) rename {textures => assets/textures}/SkinPlatinum.xml (100%) rename {textures => assets/textures}/SmolarSystem.xml (100%) rename {textures => assets/textures}/Water.png (100%) rename {textures => assets/textures}/back up/CommonGui.png (100%) rename {textures => assets/textures}/back up/Editor.png (100%) rename {textures => assets/textures}/back up/Menu.png (100%) rename {textures => assets/textures}/back up/Runtime.png (100%) rename {textures => assets/textures}/back up/ShipSprites.png (100%) rename {textures => assets/textures}/back up/SkinAngel.png (100%) rename {textures => assets/textures}/back up/SkinCartoon.png (100%) rename {textures => assets/textures}/back up/SkinGuardian.png (100%) rename {textures => assets/textures}/back up/SkinIconAngel.png (100%) rename {textures => assets/textures}/back up/SkinIconCartoon.png (100%) rename {textures => assets/textures}/back up/SkinIconGuardian.png (100%) rename {textures => assets/textures}/back up/SkinIconLava.png (100%) rename {textures => assets/textures}/back up/SkinIconPlatinum.png (100%) rename {textures => assets/textures}/back up/SkinLava.png (100%) rename {textures => assets/textures}/back up/SkinPlatinum.png (100%) rename {textures => assets/textures}/back_ground_space.png (100%) rename {textures => assets/textures}/earth_ground.png (100%) rename {textures => assets/textures}/explosion/1.png (100%) rename {textures => assets/textures}/explosion/10.png (100%) rename {textures => assets/textures}/explosion/2.png (100%) rename {textures => assets/textures}/explosion/3.png (100%) rename {textures => assets/textures}/explosion/4.png (100%) rename {textures => assets/textures}/explosion/5.png (100%) rename {textures => assets/textures}/explosion/6.png (100%) rename {textures => assets/textures}/explosion/7.png (100%) rename {textures => assets/textures}/explosion/8.png (100%) rename {textures => assets/textures}/explosion/9.png (100%) rename {textures => assets/textures}/hand.png (100%) rename {textures => assets/textures}/icon.ico (100%) rename {textures => assets/textures}/icon.png (100%) rename {textures => assets/textures}/ion_engine_flame.png (100%) rename {textures => assets/textures}/liquid_engine_flame.png (100%) rename {textures => assets/textures}/mars_ground.png (100%) rename {textures => assets/textures}/parts/Battery.png (100%) rename {textures => assets/textures}/parts/Beam.png (100%) rename {textures => assets/textures}/parts/CoverBottom.png (100%) rename {textures => assets/textures}/parts/CoverStretch.png (100%) rename {textures => assets/textures}/parts/CoverTop.png (100%) rename {textures => assets/textures}/parts/DetacherRadial.png (100%) rename {textures => assets/textures}/parts/DetacherVertical.png (100%) rename {textures => assets/textures}/parts/DockingConnector.png (100%) rename {textures => assets/textures}/parts/DockingPort.png (100%) rename {textures => assets/textures}/parts/EngineIon.png (100%) rename {textures => assets/textures}/parts/EngineLarge.png (100%) rename {textures => assets/textures}/parts/EngineMedium.png (100%) rename {textures => assets/textures}/parts/EngineSmall.png (100%) rename {textures => assets/textures}/parts/EngineTiny.png (100%) rename {textures => assets/textures}/parts/Fuselage.png (100%) rename {textures => assets/textures}/parts/LanderLegJoint.png (100%) rename {textures => assets/textures}/parts/LanderLegLower.png (100%) rename {textures => assets/textures}/parts/LanderLegPreview.png (100%) rename {textures => assets/textures}/parts/LanderLegUpper.png (100%) rename {textures => assets/textures}/parts/NoseCone.png (100%) rename {textures => assets/textures}/parts/Parachute.png (100%) rename {textures => assets/textures}/parts/ParachuteCanister.png (100%) rename {textures => assets/textures}/parts/ParachuteCanisterSide.png (100%) rename {textures => assets/textures}/parts/Pod.png (100%) rename {textures => assets/textures}/parts/Puffy750.png (100%) rename {textures => assets/textures}/parts/RcsBlock.png (100%) rename {textures => assets/textures}/parts/SideTank.png (100%) rename {textures => assets/textures}/parts/SolarPanel.png (100%) rename {textures => assets/textures}/parts/SolarPanelBase.png (100%) rename {textures => assets/textures}/parts/SolidRocketBooster.png (100%) rename {textures => assets/textures}/parts/TankLarge.png (100%) rename {textures => assets/textures}/parts/TankMedium.png (100%) rename {textures => assets/textures}/parts/TankSmall.png (100%) rename {textures => assets/textures}/parts/TankTiny.png (100%) rename {textures => assets/textures}/parts/Wheel.png (100%) rename {textures => assets/textures}/parts/Wing.png (100%) rename {textures => assets/textures}/runtime/ActionButton.png (100%) rename {textures => assets/textures}/runtime/ActionButtonSelected.png (100%) rename {textures => assets/textures}/runtime/AltimeterControl.PNG (100%) rename {textures => assets/textures}/runtime/Button.png (100%) rename {textures => assets/textures}/runtime/ButtonIconActivateStage.png (100%) rename {textures => assets/textures}/runtime/ButtonIconMapView.png (100%) rename {textures => assets/textures}/runtime/ButtonIconMenu.png (100%) rename {textures => assets/textures}/runtime/ButtonPressed.png (100%) rename {textures => assets/textures}/runtime/DR-icon.png (100%) rename {textures => assets/textures}/runtime/DialogBackground.png (100%) rename {textures => assets/textures}/runtime/FastForward.png (100%) rename {textures => assets/textures}/runtime/ForwardButton.png (100%) rename {textures => assets/textures}/runtime/ForwardButtonBottomBar.PNG (100%) rename {textures => assets/textures}/runtime/ForwardButtonPressed.png (100%) rename {textures => assets/textures}/runtime/ForwardButtonTopBar.png (100%) rename {textures => assets/textures}/runtime/FuelDrainIcon.png (100%) rename {textures => assets/textures}/runtime/FuelFillIcon.png (100%) rename {textures => assets/textures}/runtime/MarkerApoapsis.png (100%) rename {textures => assets/textures}/runtime/MarkerClosest.png (100%) rename {textures => assets/textures}/runtime/MarkerEncounter.png (100%) rename {textures => assets/textures}/runtime/MarkerPeriapsis.png (100%) rename {textures => assets/textures}/runtime/PathSegment.png (100%) rename {textures => assets/textures}/runtime/PlayButton.png (100%) rename {textures => assets/textures}/runtime/RotateButton.png (100%) rename {textures => assets/textures}/runtime/RotateButtonPressed.png (100%) rename {textures => assets/textures}/runtime/SmokeParticle.PNG (100%) rename {textures => assets/textures}/runtime/StageControlBottom.PNG (100%) rename {textures => assets/textures}/runtime/StageControlStretch.PNG (100%) rename {textures => assets/textures}/runtime/StageControlTop.PNG (100%) rename {textures => assets/textures}/runtime/SteerButton.png (100%) rename {textures => assets/textures}/runtime/SteerButtonPressed.png (100%) rename {textures => assets/textures}/runtime/StopButton.png (100%) rename {textures => assets/textures}/runtime/ThrottleControl.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel1.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel10.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel2.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel3.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel4.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel5.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel6.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel7.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel8.png (100%) rename {textures => assets/textures}/runtime/ThrottleLevel9.png (100%) rename {textures => assets/textures}/runtime/TimeControl.PNG (100%) rename {textures => assets/textures}/runtime/ToolbarSide.PNG (100%) rename {textures => assets/textures}/runtime/ToolbarStretch.PNG (100%) rename {textures => assets/textures}/runtime/UnlockHeading.png (100%) rename {textures => assets/textures}/runtime/WarpBarSide.PNG (100%) rename {textures => assets/textures}/runtime/WarpBarStretch.png (100%) rename {textures => assets/textures}/runtime/WarpButton.png (100%) rename {textures => assets/textures}/runtime/WarpSpeedButton.png (100%) rename {textures => assets/textures}/runtime/background.png (100%) rename {textures => assets/textures}/runtime/background_ka1.jpg (100%) rename {textures => assets/textures}/runtime/background_ka2.jpg (100%) rename {textures => assets/textures}/soild_engine_flame.png (100%) rename {textures => assets/textures}/train.jpg (100%) rename {configs => config}/local_logger.toml (100%) rename {configs => config}/logger.toml (100%) rename {configs => config}/main.toml (100%) diff --git a/.github/workflows/get_info.py b/.github/workflows/get_info.py index d787827..a987a49 100644 --- a/.github/workflows/get_info.py +++ b/.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: diff --git a/.github/workflows/nuitka.yml b/.github/workflows/nuitka.yml index 1d60444..455f64e 100644 --- a/.github/workflows/nuitka.yml +++ b/.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" # 构建脚本修改 diff --git a/Difficult_Rocket/__init__.py b/Difficult_Rocket/__init__.py index f82f5b8..5ea8afc 100644 --- a/Difficult_Rocket/__init__.py +++ b/Difficult_Rocket/__init__.py @@ -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'] diff --git a/Difficult_Rocket/client/__init__.py b/Difficult_Rocket/client/__init__.py index 6edfb5e..f1175a9 100644 --- a/Difficult_Rocket/client/__init__.py +++ b/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 @@ -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'): diff --git a/Difficult_Rocket/runtime.py b/Difficult_Rocket/runtime.py index 9507ff1..a3ca854 100644 --- a/Difficult_Rocket/runtime.py +++ b/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'] diff --git a/Difficult_Rocket/server/__init__.py b/Difficult_Rocket/server/__init__.py index 935520d..dde9d0a 100644 --- a/Difficult_Rocket/server/__init__.py +++ b/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)) diff --git a/Difficult_Rocket/utils/tools.py b/Difficult_Rocket/utils/tools.py index e731e66..248c06d 100644 --- a/Difficult_Rocket/utils/tools.py +++ b/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): diff --git a/Difficult_Rocket/utils/translate.py b/Difficult_Rocket/utils/translate.py index 2f62848..cb19197 100644 --- a/Difficult_Rocket/utils/translate.py +++ b/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) diff --git a/configs/PartList.xml b/assets/builtin/PartList.xml similarity index 100% rename from configs/PartList.xml rename to assets/builtin/PartList.xml diff --git a/configs/dock1.xml b/assets/builtin/dock1.xml similarity index 100% rename from configs/dock1.xml rename to assets/builtin/dock1.xml diff --git a/configs/none_ship.xml b/assets/builtin/none_ship.xml similarity index 100% rename from configs/none_ship.xml rename to assets/builtin/none_ship.xml diff --git a/configs/lang/en-us.toml b/assets/lang/en-us.toml similarity index 100% rename from configs/lang/en-us.toml rename to assets/lang/en-us.toml diff --git a/configs/lang/zh-CN.toml b/assets/lang/zh-CN.toml similarity index 100% rename from configs/lang/zh-CN.toml rename to assets/lang/zh-CN.toml diff --git a/textures/Atmospheres.png b/assets/textures/Atmospheres.png similarity index 100% rename from textures/Atmospheres.png rename to assets/textures/Atmospheres.png diff --git a/textures/BackButton.PNG b/assets/textures/BackButton.PNG similarity index 100% rename from textures/BackButton.PNG rename to assets/textures/BackButton.PNG diff --git a/textures/CommonGui.png b/assets/textures/CommonGui.png similarity index 100% rename from textures/CommonGui.png rename to assets/textures/CommonGui.png diff --git a/textures/CommonGui.xml b/assets/textures/CommonGui.xml similarity index 100% rename from textures/CommonGui.xml rename to assets/textures/CommonGui.xml diff --git a/textures/DefaultShip.xml b/assets/textures/DefaultShip.xml similarity index 100% rename from textures/DefaultShip.xml rename to assets/textures/DefaultShip.xml diff --git a/textures/Editor.json5 b/assets/textures/Editor.json5 similarity index 100% rename from textures/Editor.json5 rename to assets/textures/Editor.json5 diff --git a/textures/Editor.png b/assets/textures/Editor.png similarity index 100% rename from textures/Editor.png rename to assets/textures/Editor.png diff --git a/textures/Editor.xml b/assets/textures/Editor.xml similarity index 100% rename from textures/Editor.xml rename to assets/textures/Editor.xml diff --git a/textures/Editor/ButtonDarkSide.png b/assets/textures/Editor/ButtonDarkSide.png similarity index 100% rename from textures/Editor/ButtonDarkSide.png rename to assets/textures/Editor/ButtonDarkSide.png diff --git a/textures/Editor/ButtonLightSide.png b/assets/textures/Editor/ButtonLightSide.png similarity index 100% rename from textures/Editor/ButtonLightSide.png rename to assets/textures/Editor/ButtonLightSide.png diff --git a/textures/Editor/DeleteButton.png b/assets/textures/Editor/DeleteButton.png similarity index 100% rename from textures/Editor/DeleteButton.png rename to assets/textures/Editor/DeleteButton.png diff --git a/textures/Editor/DuplicateButton.png b/assets/textures/Editor/DuplicateButton.png similarity index 100% rename from textures/Editor/DuplicateButton.png rename to assets/textures/Editor/DuplicateButton.png diff --git a/textures/Editor/MirrorButton.png b/assets/textures/Editor/MirrorButton.png similarity index 100% rename from textures/Editor/MirrorButton.png rename to assets/textures/Editor/MirrorButton.png diff --git a/textures/Editor/PartButton.png b/assets/textures/Editor/PartButton.png similarity index 100% rename from textures/Editor/PartButton.png rename to assets/textures/Editor/PartButton.png diff --git a/textures/Editor/PartGroupHeader.png b/assets/textures/Editor/PartGroupHeader.png similarity index 100% rename from textures/Editor/PartGroupHeader.png rename to assets/textures/Editor/PartGroupHeader.png diff --git a/textures/Editor/RotateButton.png b/assets/textures/Editor/RotateButton.png similarity index 100% rename from textures/Editor/RotateButton.png rename to assets/textures/Editor/RotateButton.png diff --git a/textures/Editor/ToolbarDark.png b/assets/textures/Editor/ToolbarDark.png similarity index 100% rename from textures/Editor/ToolbarDark.png rename to assets/textures/Editor/ToolbarDark.png diff --git a/textures/Editor/ToolbarIconAddPart.png b/assets/textures/Editor/ToolbarIconAddPart.png similarity index 100% rename from textures/Editor/ToolbarIconAddPart.png rename to assets/textures/Editor/ToolbarIconAddPart.png diff --git a/textures/Editor/ToolbarIconMenu.png b/assets/textures/Editor/ToolbarIconMenu.png similarity index 100% rename from textures/Editor/ToolbarIconMenu.png rename to assets/textures/Editor/ToolbarIconMenu.png diff --git a/textures/Editor/ToolbarIconPlay.png b/assets/textures/Editor/ToolbarIconPlay.png similarity index 100% rename from textures/Editor/ToolbarIconPlay.png rename to assets/textures/Editor/ToolbarIconPlay.png diff --git a/textures/Editor/ToolbarIconStaging.png b/assets/textures/Editor/ToolbarIconStaging.png similarity index 100% rename from textures/Editor/ToolbarIconStaging.png rename to assets/textures/Editor/ToolbarIconStaging.png diff --git a/textures/Editor/ToolbarIconZoom.png b/assets/textures/Editor/ToolbarIconZoom.png similarity index 100% rename from textures/Editor/ToolbarIconZoom.png rename to assets/textures/Editor/ToolbarIconZoom.png diff --git a/textures/Editor/ToolbarIconZoomIn.png b/assets/textures/Editor/ToolbarIconZoomIn.png similarity index 100% rename from textures/Editor/ToolbarIconZoomIn.png rename to assets/textures/Editor/ToolbarIconZoomIn.png diff --git a/textures/Editor/ToolbarIconZoomOut.png b/assets/textures/Editor/ToolbarIconZoomOut.png similarity index 100% rename from textures/Editor/ToolbarIconZoomOut.png rename to assets/textures/Editor/ToolbarIconZoomOut.png diff --git a/textures/Editor/ToolbarLight.png b/assets/textures/Editor/ToolbarLight.png similarity index 100% rename from textures/Editor/ToolbarLight.png rename to assets/textures/Editor/ToolbarLight.png diff --git a/textures/Editor/TrashCan.png b/assets/textures/Editor/TrashCan.png similarity index 100% rename from textures/Editor/TrashCan.png rename to assets/textures/Editor/TrashCan.png diff --git a/textures/EmptyShip.xml b/assets/textures/EmptyShip.xml similarity index 100% rename from textures/EmptyShip.xml rename to assets/textures/EmptyShip.xml diff --git a/textures/File-Icon-320.png b/assets/textures/File-Icon-320.png similarity index 100% rename from textures/File-Icon-320.png rename to assets/textures/File-Icon-320.png diff --git a/textures/File-Icon-64.png b/assets/textures/File-Icon-64.png similarity index 100% rename from textures/File-Icon-64.png rename to assets/textures/File-Icon-64.png diff --git a/textures/Flame.png b/assets/textures/Flame.png similarity index 100% rename from textures/Flame.png rename to assets/textures/Flame.png diff --git a/textures/Flame.xml b/assets/textures/Flame.xml similarity index 100% rename from textures/Flame.xml rename to assets/textures/Flame.xml diff --git a/textures/Header.png b/assets/textures/Header.png similarity index 100% rename from textures/Header.png rename to assets/textures/Header.png diff --git a/textures/Inputs.xml b/assets/textures/Inputs.xml similarity index 100% rename from textures/Inputs.xml rename to assets/textures/Inputs.xml diff --git a/textures/LevelAdvancedDocking.xml b/assets/textures/LevelAdvancedDocking.xml similarity index 100% rename from textures/LevelAdvancedDocking.xml rename to assets/textures/LevelAdvancedDocking.xml diff --git a/textures/LevelLandingTraining.xml b/assets/textures/LevelLandingTraining.xml similarity index 100% rename from textures/LevelLandingTraining.xml rename to assets/textures/LevelLandingTraining.xml diff --git a/textures/LevelOptimumTrajectory.xml b/assets/textures/LevelOptimumTrajectory.xml similarity index 100% rename from textures/LevelOptimumTrajectory.xml rename to assets/textures/LevelOptimumTrajectory.xml diff --git a/textures/LevelOrbitTraining.xml b/assets/textures/LevelOrbitTraining.xml similarity index 100% rename from textures/LevelOrbitTraining.xml rename to assets/textures/LevelOrbitTraining.xml diff --git a/textures/LevelSatelliteRecovery.xml b/assets/textures/LevelSatelliteRecovery.xml similarity index 100% rename from textures/LevelSatelliteRecovery.xml rename to assets/textures/LevelSatelliteRecovery.xml diff --git a/textures/LevelSimpleDocking.xml b/assets/textures/LevelSimpleDocking.xml similarity index 100% rename from textures/LevelSimpleDocking.xml rename to assets/textures/LevelSimpleDocking.xml diff --git a/textures/LevelSmearthLanding.xml b/assets/textures/LevelSmearthLanding.xml similarity index 100% rename from textures/LevelSmearthLanding.xml rename to assets/textures/LevelSmearthLanding.xml diff --git a/textures/Menu.png b/assets/textures/Menu.png similarity index 100% rename from textures/Menu.png rename to assets/textures/Menu.png diff --git a/textures/Menu.xml b/assets/textures/Menu.xml similarity index 100% rename from textures/Menu.xml rename to assets/textures/Menu.xml diff --git a/textures/PartList.xml b/assets/textures/PartList.xml similarity index 100% rename from textures/PartList.xml rename to assets/textures/PartList.xml diff --git a/textures/PlanetCrustHalley.png b/assets/textures/PlanetCrustHalley.png similarity index 100% rename from textures/PlanetCrustHalley.png rename to assets/textures/PlanetCrustHalley.png diff --git a/textures/PlanetCrustSmaturn.png b/assets/textures/PlanetCrustSmaturn.png similarity index 100% rename from textures/PlanetCrustSmaturn.png rename to assets/textures/PlanetCrustSmaturn.png diff --git a/textures/PlanetCrustSmenus.png b/assets/textures/PlanetCrustSmenus.png similarity index 100% rename from textures/PlanetCrustSmenus.png rename to assets/textures/PlanetCrustSmenus.png diff --git a/textures/PlanetCrustSmeptune.png b/assets/textures/PlanetCrustSmeptune.png similarity index 100% rename from textures/PlanetCrustSmeptune.png rename to assets/textures/PlanetCrustSmeptune.png diff --git a/textures/PlanetCrustSmercury.png b/assets/textures/PlanetCrustSmercury.png similarity index 100% rename from textures/PlanetCrustSmercury.png rename to assets/textures/PlanetCrustSmercury.png diff --git a/textures/PlanetCrustSmoon.png b/assets/textures/PlanetCrustSmoon.png similarity index 100% rename from textures/PlanetCrustSmoon.png rename to assets/textures/PlanetCrustSmoon.png diff --git a/textures/PlanetCrustSmupiter.png b/assets/textures/PlanetCrustSmupiter.png similarity index 100% rename from textures/PlanetCrustSmupiter.png rename to assets/textures/PlanetCrustSmupiter.png diff --git a/textures/PlanetCrustSmuranus.png b/assets/textures/PlanetCrustSmuranus.png similarity index 100% rename from textures/PlanetCrustSmuranus.png rename to assets/textures/PlanetCrustSmuranus.png diff --git a/textures/PlanetCrustTitan.png b/assets/textures/PlanetCrustTitan.png similarity index 100% rename from textures/PlanetCrustTitan.png rename to assets/textures/PlanetCrustTitan.png diff --git a/textures/PlanetSprites.png b/assets/textures/PlanetSprites.png similarity index 100% rename from textures/PlanetSprites.png rename to assets/textures/PlanetSprites.png diff --git a/textures/PlanetSprites.xml b/assets/textures/PlanetSprites.xml similarity index 100% rename from textures/PlanetSprites.xml rename to assets/textures/PlanetSprites.xml diff --git a/textures/Runtime.json5 b/assets/textures/Runtime.json5 similarity index 100% rename from textures/Runtime.json5 rename to assets/textures/Runtime.json5 diff --git a/textures/Runtime.png b/assets/textures/Runtime.png similarity index 100% rename from textures/Runtime.png rename to assets/textures/Runtime.png diff --git a/textures/Runtime.xml b/assets/textures/Runtime.xml similarity index 100% rename from textures/Runtime.xml rename to assets/textures/Runtime.xml diff --git a/textures/SatelleteRendezvous.xml b/assets/textures/SatelleteRendezvous.xml similarity index 100% rename from textures/SatelleteRendezvous.xml rename to assets/textures/SatelleteRendezvous.xml diff --git a/textures/ShipSprites.xml b/assets/textures/ShipSprites.xml similarity index 100% rename from textures/ShipSprites.xml rename to assets/textures/ShipSprites.xml diff --git a/textures/SkinAngel.xml b/assets/textures/SkinAngel.xml similarity index 100% rename from textures/SkinAngel.xml rename to assets/textures/SkinAngel.xml diff --git a/textures/SkinCartoon.xml b/assets/textures/SkinCartoon.xml similarity index 100% rename from textures/SkinCartoon.xml rename to assets/textures/SkinCartoon.xml diff --git a/textures/SkinGuardian.xml b/assets/textures/SkinGuardian.xml similarity index 100% rename from textures/SkinGuardian.xml rename to assets/textures/SkinGuardian.xml diff --git a/textures/SkinLava.xml b/assets/textures/SkinLava.xml similarity index 100% rename from textures/SkinLava.xml rename to assets/textures/SkinLava.xml diff --git a/textures/SkinPlatinum.xml b/assets/textures/SkinPlatinum.xml similarity index 100% rename from textures/SkinPlatinum.xml rename to assets/textures/SkinPlatinum.xml diff --git a/textures/SmolarSystem.xml b/assets/textures/SmolarSystem.xml similarity index 100% rename from textures/SmolarSystem.xml rename to assets/textures/SmolarSystem.xml diff --git a/textures/Water.png b/assets/textures/Water.png similarity index 100% rename from textures/Water.png rename to assets/textures/Water.png diff --git a/textures/back up/CommonGui.png b/assets/textures/back up/CommonGui.png similarity index 100% rename from textures/back up/CommonGui.png rename to assets/textures/back up/CommonGui.png diff --git a/textures/back up/Editor.png b/assets/textures/back up/Editor.png similarity index 100% rename from textures/back up/Editor.png rename to assets/textures/back up/Editor.png diff --git a/textures/back up/Menu.png b/assets/textures/back up/Menu.png similarity index 100% rename from textures/back up/Menu.png rename to assets/textures/back up/Menu.png diff --git a/textures/back up/Runtime.png b/assets/textures/back up/Runtime.png similarity index 100% rename from textures/back up/Runtime.png rename to assets/textures/back up/Runtime.png diff --git a/textures/back up/ShipSprites.png b/assets/textures/back up/ShipSprites.png similarity index 100% rename from textures/back up/ShipSprites.png rename to assets/textures/back up/ShipSprites.png diff --git a/textures/back up/SkinAngel.png b/assets/textures/back up/SkinAngel.png similarity index 100% rename from textures/back up/SkinAngel.png rename to assets/textures/back up/SkinAngel.png diff --git a/textures/back up/SkinCartoon.png b/assets/textures/back up/SkinCartoon.png similarity index 100% rename from textures/back up/SkinCartoon.png rename to assets/textures/back up/SkinCartoon.png diff --git a/textures/back up/SkinGuardian.png b/assets/textures/back up/SkinGuardian.png similarity index 100% rename from textures/back up/SkinGuardian.png rename to assets/textures/back up/SkinGuardian.png diff --git a/textures/back up/SkinIconAngel.png b/assets/textures/back up/SkinIconAngel.png similarity index 100% rename from textures/back up/SkinIconAngel.png rename to assets/textures/back up/SkinIconAngel.png diff --git a/textures/back up/SkinIconCartoon.png b/assets/textures/back up/SkinIconCartoon.png similarity index 100% rename from textures/back up/SkinIconCartoon.png rename to assets/textures/back up/SkinIconCartoon.png diff --git a/textures/back up/SkinIconGuardian.png b/assets/textures/back up/SkinIconGuardian.png similarity index 100% rename from textures/back up/SkinIconGuardian.png rename to assets/textures/back up/SkinIconGuardian.png diff --git a/textures/back up/SkinIconLava.png b/assets/textures/back up/SkinIconLava.png similarity index 100% rename from textures/back up/SkinIconLava.png rename to assets/textures/back up/SkinIconLava.png diff --git a/textures/back up/SkinIconPlatinum.png b/assets/textures/back up/SkinIconPlatinum.png similarity index 100% rename from textures/back up/SkinIconPlatinum.png rename to assets/textures/back up/SkinIconPlatinum.png diff --git a/textures/back up/SkinLava.png b/assets/textures/back up/SkinLava.png similarity index 100% rename from textures/back up/SkinLava.png rename to assets/textures/back up/SkinLava.png diff --git a/textures/back up/SkinPlatinum.png b/assets/textures/back up/SkinPlatinum.png similarity index 100% rename from textures/back up/SkinPlatinum.png rename to assets/textures/back up/SkinPlatinum.png diff --git a/textures/back_ground_space.png b/assets/textures/back_ground_space.png similarity index 100% rename from textures/back_ground_space.png rename to assets/textures/back_ground_space.png diff --git a/textures/earth_ground.png b/assets/textures/earth_ground.png similarity index 100% rename from textures/earth_ground.png rename to assets/textures/earth_ground.png diff --git a/textures/explosion/1.png b/assets/textures/explosion/1.png similarity index 100% rename from textures/explosion/1.png rename to assets/textures/explosion/1.png diff --git a/textures/explosion/10.png b/assets/textures/explosion/10.png similarity index 100% rename from textures/explosion/10.png rename to assets/textures/explosion/10.png diff --git a/textures/explosion/2.png b/assets/textures/explosion/2.png similarity index 100% rename from textures/explosion/2.png rename to assets/textures/explosion/2.png diff --git a/textures/explosion/3.png b/assets/textures/explosion/3.png similarity index 100% rename from textures/explosion/3.png rename to assets/textures/explosion/3.png diff --git a/textures/explosion/4.png b/assets/textures/explosion/4.png similarity index 100% rename from textures/explosion/4.png rename to assets/textures/explosion/4.png diff --git a/textures/explosion/5.png b/assets/textures/explosion/5.png similarity index 100% rename from textures/explosion/5.png rename to assets/textures/explosion/5.png diff --git a/textures/explosion/6.png b/assets/textures/explosion/6.png similarity index 100% rename from textures/explosion/6.png rename to assets/textures/explosion/6.png diff --git a/textures/explosion/7.png b/assets/textures/explosion/7.png similarity index 100% rename from textures/explosion/7.png rename to assets/textures/explosion/7.png diff --git a/textures/explosion/8.png b/assets/textures/explosion/8.png similarity index 100% rename from textures/explosion/8.png rename to assets/textures/explosion/8.png diff --git a/textures/explosion/9.png b/assets/textures/explosion/9.png similarity index 100% rename from textures/explosion/9.png rename to assets/textures/explosion/9.png diff --git a/textures/hand.png b/assets/textures/hand.png similarity index 100% rename from textures/hand.png rename to assets/textures/hand.png diff --git a/textures/icon.ico b/assets/textures/icon.ico similarity index 100% rename from textures/icon.ico rename to assets/textures/icon.ico diff --git a/textures/icon.png b/assets/textures/icon.png similarity index 100% rename from textures/icon.png rename to assets/textures/icon.png diff --git a/textures/ion_engine_flame.png b/assets/textures/ion_engine_flame.png similarity index 100% rename from textures/ion_engine_flame.png rename to assets/textures/ion_engine_flame.png diff --git a/textures/liquid_engine_flame.png b/assets/textures/liquid_engine_flame.png similarity index 100% rename from textures/liquid_engine_flame.png rename to assets/textures/liquid_engine_flame.png diff --git a/textures/mars_ground.png b/assets/textures/mars_ground.png similarity index 100% rename from textures/mars_ground.png rename to assets/textures/mars_ground.png diff --git a/textures/parts/Battery.png b/assets/textures/parts/Battery.png similarity index 100% rename from textures/parts/Battery.png rename to assets/textures/parts/Battery.png diff --git a/textures/parts/Beam.png b/assets/textures/parts/Beam.png similarity index 100% rename from textures/parts/Beam.png rename to assets/textures/parts/Beam.png diff --git a/textures/parts/CoverBottom.png b/assets/textures/parts/CoverBottom.png similarity index 100% rename from textures/parts/CoverBottom.png rename to assets/textures/parts/CoverBottom.png diff --git a/textures/parts/CoverStretch.png b/assets/textures/parts/CoverStretch.png similarity index 100% rename from textures/parts/CoverStretch.png rename to assets/textures/parts/CoverStretch.png diff --git a/textures/parts/CoverTop.png b/assets/textures/parts/CoverTop.png similarity index 100% rename from textures/parts/CoverTop.png rename to assets/textures/parts/CoverTop.png diff --git a/textures/parts/DetacherRadial.png b/assets/textures/parts/DetacherRadial.png similarity index 100% rename from textures/parts/DetacherRadial.png rename to assets/textures/parts/DetacherRadial.png diff --git a/textures/parts/DetacherVertical.png b/assets/textures/parts/DetacherVertical.png similarity index 100% rename from textures/parts/DetacherVertical.png rename to assets/textures/parts/DetacherVertical.png diff --git a/textures/parts/DockingConnector.png b/assets/textures/parts/DockingConnector.png similarity index 100% rename from textures/parts/DockingConnector.png rename to assets/textures/parts/DockingConnector.png diff --git a/textures/parts/DockingPort.png b/assets/textures/parts/DockingPort.png similarity index 100% rename from textures/parts/DockingPort.png rename to assets/textures/parts/DockingPort.png diff --git a/textures/parts/EngineIon.png b/assets/textures/parts/EngineIon.png similarity index 100% rename from textures/parts/EngineIon.png rename to assets/textures/parts/EngineIon.png diff --git a/textures/parts/EngineLarge.png b/assets/textures/parts/EngineLarge.png similarity index 100% rename from textures/parts/EngineLarge.png rename to assets/textures/parts/EngineLarge.png diff --git a/textures/parts/EngineMedium.png b/assets/textures/parts/EngineMedium.png similarity index 100% rename from textures/parts/EngineMedium.png rename to assets/textures/parts/EngineMedium.png diff --git a/textures/parts/EngineSmall.png b/assets/textures/parts/EngineSmall.png similarity index 100% rename from textures/parts/EngineSmall.png rename to assets/textures/parts/EngineSmall.png diff --git a/textures/parts/EngineTiny.png b/assets/textures/parts/EngineTiny.png similarity index 100% rename from textures/parts/EngineTiny.png rename to assets/textures/parts/EngineTiny.png diff --git a/textures/parts/Fuselage.png b/assets/textures/parts/Fuselage.png similarity index 100% rename from textures/parts/Fuselage.png rename to assets/textures/parts/Fuselage.png diff --git a/textures/parts/LanderLegJoint.png b/assets/textures/parts/LanderLegJoint.png similarity index 100% rename from textures/parts/LanderLegJoint.png rename to assets/textures/parts/LanderLegJoint.png diff --git a/textures/parts/LanderLegLower.png b/assets/textures/parts/LanderLegLower.png similarity index 100% rename from textures/parts/LanderLegLower.png rename to assets/textures/parts/LanderLegLower.png diff --git a/textures/parts/LanderLegPreview.png b/assets/textures/parts/LanderLegPreview.png similarity index 100% rename from textures/parts/LanderLegPreview.png rename to assets/textures/parts/LanderLegPreview.png diff --git a/textures/parts/LanderLegUpper.png b/assets/textures/parts/LanderLegUpper.png similarity index 100% rename from textures/parts/LanderLegUpper.png rename to assets/textures/parts/LanderLegUpper.png diff --git a/textures/parts/NoseCone.png b/assets/textures/parts/NoseCone.png similarity index 100% rename from textures/parts/NoseCone.png rename to assets/textures/parts/NoseCone.png diff --git a/textures/parts/Parachute.png b/assets/textures/parts/Parachute.png similarity index 100% rename from textures/parts/Parachute.png rename to assets/textures/parts/Parachute.png diff --git a/textures/parts/ParachuteCanister.png b/assets/textures/parts/ParachuteCanister.png similarity index 100% rename from textures/parts/ParachuteCanister.png rename to assets/textures/parts/ParachuteCanister.png diff --git a/textures/parts/ParachuteCanisterSide.png b/assets/textures/parts/ParachuteCanisterSide.png similarity index 100% rename from textures/parts/ParachuteCanisterSide.png rename to assets/textures/parts/ParachuteCanisterSide.png diff --git a/textures/parts/Pod.png b/assets/textures/parts/Pod.png similarity index 100% rename from textures/parts/Pod.png rename to assets/textures/parts/Pod.png diff --git a/textures/parts/Puffy750.png b/assets/textures/parts/Puffy750.png similarity index 100% rename from textures/parts/Puffy750.png rename to assets/textures/parts/Puffy750.png diff --git a/textures/parts/RcsBlock.png b/assets/textures/parts/RcsBlock.png similarity index 100% rename from textures/parts/RcsBlock.png rename to assets/textures/parts/RcsBlock.png diff --git a/textures/parts/SideTank.png b/assets/textures/parts/SideTank.png similarity index 100% rename from textures/parts/SideTank.png rename to assets/textures/parts/SideTank.png diff --git a/textures/parts/SolarPanel.png b/assets/textures/parts/SolarPanel.png similarity index 100% rename from textures/parts/SolarPanel.png rename to assets/textures/parts/SolarPanel.png diff --git a/textures/parts/SolarPanelBase.png b/assets/textures/parts/SolarPanelBase.png similarity index 100% rename from textures/parts/SolarPanelBase.png rename to assets/textures/parts/SolarPanelBase.png diff --git a/textures/parts/SolidRocketBooster.png b/assets/textures/parts/SolidRocketBooster.png similarity index 100% rename from textures/parts/SolidRocketBooster.png rename to assets/textures/parts/SolidRocketBooster.png diff --git a/textures/parts/TankLarge.png b/assets/textures/parts/TankLarge.png similarity index 100% rename from textures/parts/TankLarge.png rename to assets/textures/parts/TankLarge.png diff --git a/textures/parts/TankMedium.png b/assets/textures/parts/TankMedium.png similarity index 100% rename from textures/parts/TankMedium.png rename to assets/textures/parts/TankMedium.png diff --git a/textures/parts/TankSmall.png b/assets/textures/parts/TankSmall.png similarity index 100% rename from textures/parts/TankSmall.png rename to assets/textures/parts/TankSmall.png diff --git a/textures/parts/TankTiny.png b/assets/textures/parts/TankTiny.png similarity index 100% rename from textures/parts/TankTiny.png rename to assets/textures/parts/TankTiny.png diff --git a/textures/parts/Wheel.png b/assets/textures/parts/Wheel.png similarity index 100% rename from textures/parts/Wheel.png rename to assets/textures/parts/Wheel.png diff --git a/textures/parts/Wing.png b/assets/textures/parts/Wing.png similarity index 100% rename from textures/parts/Wing.png rename to assets/textures/parts/Wing.png diff --git a/textures/runtime/ActionButton.png b/assets/textures/runtime/ActionButton.png similarity index 100% rename from textures/runtime/ActionButton.png rename to assets/textures/runtime/ActionButton.png diff --git a/textures/runtime/ActionButtonSelected.png b/assets/textures/runtime/ActionButtonSelected.png similarity index 100% rename from textures/runtime/ActionButtonSelected.png rename to assets/textures/runtime/ActionButtonSelected.png diff --git a/textures/runtime/AltimeterControl.PNG b/assets/textures/runtime/AltimeterControl.PNG similarity index 100% rename from textures/runtime/AltimeterControl.PNG rename to assets/textures/runtime/AltimeterControl.PNG diff --git a/textures/runtime/Button.png b/assets/textures/runtime/Button.png similarity index 100% rename from textures/runtime/Button.png rename to assets/textures/runtime/Button.png diff --git a/textures/runtime/ButtonIconActivateStage.png b/assets/textures/runtime/ButtonIconActivateStage.png similarity index 100% rename from textures/runtime/ButtonIconActivateStage.png rename to assets/textures/runtime/ButtonIconActivateStage.png diff --git a/textures/runtime/ButtonIconMapView.png b/assets/textures/runtime/ButtonIconMapView.png similarity index 100% rename from textures/runtime/ButtonIconMapView.png rename to assets/textures/runtime/ButtonIconMapView.png diff --git a/textures/runtime/ButtonIconMenu.png b/assets/textures/runtime/ButtonIconMenu.png similarity index 100% rename from textures/runtime/ButtonIconMenu.png rename to assets/textures/runtime/ButtonIconMenu.png diff --git a/textures/runtime/ButtonPressed.png b/assets/textures/runtime/ButtonPressed.png similarity index 100% rename from textures/runtime/ButtonPressed.png rename to assets/textures/runtime/ButtonPressed.png diff --git a/textures/runtime/DR-icon.png b/assets/textures/runtime/DR-icon.png similarity index 100% rename from textures/runtime/DR-icon.png rename to assets/textures/runtime/DR-icon.png diff --git a/textures/runtime/DialogBackground.png b/assets/textures/runtime/DialogBackground.png similarity index 100% rename from textures/runtime/DialogBackground.png rename to assets/textures/runtime/DialogBackground.png diff --git a/textures/runtime/FastForward.png b/assets/textures/runtime/FastForward.png similarity index 100% rename from textures/runtime/FastForward.png rename to assets/textures/runtime/FastForward.png diff --git a/textures/runtime/ForwardButton.png b/assets/textures/runtime/ForwardButton.png similarity index 100% rename from textures/runtime/ForwardButton.png rename to assets/textures/runtime/ForwardButton.png diff --git a/textures/runtime/ForwardButtonBottomBar.PNG b/assets/textures/runtime/ForwardButtonBottomBar.PNG similarity index 100% rename from textures/runtime/ForwardButtonBottomBar.PNG rename to assets/textures/runtime/ForwardButtonBottomBar.PNG diff --git a/textures/runtime/ForwardButtonPressed.png b/assets/textures/runtime/ForwardButtonPressed.png similarity index 100% rename from textures/runtime/ForwardButtonPressed.png rename to assets/textures/runtime/ForwardButtonPressed.png diff --git a/textures/runtime/ForwardButtonTopBar.png b/assets/textures/runtime/ForwardButtonTopBar.png similarity index 100% rename from textures/runtime/ForwardButtonTopBar.png rename to assets/textures/runtime/ForwardButtonTopBar.png diff --git a/textures/runtime/FuelDrainIcon.png b/assets/textures/runtime/FuelDrainIcon.png similarity index 100% rename from textures/runtime/FuelDrainIcon.png rename to assets/textures/runtime/FuelDrainIcon.png diff --git a/textures/runtime/FuelFillIcon.png b/assets/textures/runtime/FuelFillIcon.png similarity index 100% rename from textures/runtime/FuelFillIcon.png rename to assets/textures/runtime/FuelFillIcon.png diff --git a/textures/runtime/MarkerApoapsis.png b/assets/textures/runtime/MarkerApoapsis.png similarity index 100% rename from textures/runtime/MarkerApoapsis.png rename to assets/textures/runtime/MarkerApoapsis.png diff --git a/textures/runtime/MarkerClosest.png b/assets/textures/runtime/MarkerClosest.png similarity index 100% rename from textures/runtime/MarkerClosest.png rename to assets/textures/runtime/MarkerClosest.png diff --git a/textures/runtime/MarkerEncounter.png b/assets/textures/runtime/MarkerEncounter.png similarity index 100% rename from textures/runtime/MarkerEncounter.png rename to assets/textures/runtime/MarkerEncounter.png diff --git a/textures/runtime/MarkerPeriapsis.png b/assets/textures/runtime/MarkerPeriapsis.png similarity index 100% rename from textures/runtime/MarkerPeriapsis.png rename to assets/textures/runtime/MarkerPeriapsis.png diff --git a/textures/runtime/PathSegment.png b/assets/textures/runtime/PathSegment.png similarity index 100% rename from textures/runtime/PathSegment.png rename to assets/textures/runtime/PathSegment.png diff --git a/textures/runtime/PlayButton.png b/assets/textures/runtime/PlayButton.png similarity index 100% rename from textures/runtime/PlayButton.png rename to assets/textures/runtime/PlayButton.png diff --git a/textures/runtime/RotateButton.png b/assets/textures/runtime/RotateButton.png similarity index 100% rename from textures/runtime/RotateButton.png rename to assets/textures/runtime/RotateButton.png diff --git a/textures/runtime/RotateButtonPressed.png b/assets/textures/runtime/RotateButtonPressed.png similarity index 100% rename from textures/runtime/RotateButtonPressed.png rename to assets/textures/runtime/RotateButtonPressed.png diff --git a/textures/runtime/SmokeParticle.PNG b/assets/textures/runtime/SmokeParticle.PNG similarity index 100% rename from textures/runtime/SmokeParticle.PNG rename to assets/textures/runtime/SmokeParticle.PNG diff --git a/textures/runtime/StageControlBottom.PNG b/assets/textures/runtime/StageControlBottom.PNG similarity index 100% rename from textures/runtime/StageControlBottom.PNG rename to assets/textures/runtime/StageControlBottom.PNG diff --git a/textures/runtime/StageControlStretch.PNG b/assets/textures/runtime/StageControlStretch.PNG similarity index 100% rename from textures/runtime/StageControlStretch.PNG rename to assets/textures/runtime/StageControlStretch.PNG diff --git a/textures/runtime/StageControlTop.PNG b/assets/textures/runtime/StageControlTop.PNG similarity index 100% rename from textures/runtime/StageControlTop.PNG rename to assets/textures/runtime/StageControlTop.PNG diff --git a/textures/runtime/SteerButton.png b/assets/textures/runtime/SteerButton.png similarity index 100% rename from textures/runtime/SteerButton.png rename to assets/textures/runtime/SteerButton.png diff --git a/textures/runtime/SteerButtonPressed.png b/assets/textures/runtime/SteerButtonPressed.png similarity index 100% rename from textures/runtime/SteerButtonPressed.png rename to assets/textures/runtime/SteerButtonPressed.png diff --git a/textures/runtime/StopButton.png b/assets/textures/runtime/StopButton.png similarity index 100% rename from textures/runtime/StopButton.png rename to assets/textures/runtime/StopButton.png diff --git a/textures/runtime/ThrottleControl.png b/assets/textures/runtime/ThrottleControl.png similarity index 100% rename from textures/runtime/ThrottleControl.png rename to assets/textures/runtime/ThrottleControl.png diff --git a/textures/runtime/ThrottleLevel1.png b/assets/textures/runtime/ThrottleLevel1.png similarity index 100% rename from textures/runtime/ThrottleLevel1.png rename to assets/textures/runtime/ThrottleLevel1.png diff --git a/textures/runtime/ThrottleLevel10.png b/assets/textures/runtime/ThrottleLevel10.png similarity index 100% rename from textures/runtime/ThrottleLevel10.png rename to assets/textures/runtime/ThrottleLevel10.png diff --git a/textures/runtime/ThrottleLevel2.png b/assets/textures/runtime/ThrottleLevel2.png similarity index 100% rename from textures/runtime/ThrottleLevel2.png rename to assets/textures/runtime/ThrottleLevel2.png diff --git a/textures/runtime/ThrottleLevel3.png b/assets/textures/runtime/ThrottleLevel3.png similarity index 100% rename from textures/runtime/ThrottleLevel3.png rename to assets/textures/runtime/ThrottleLevel3.png diff --git a/textures/runtime/ThrottleLevel4.png b/assets/textures/runtime/ThrottleLevel4.png similarity index 100% rename from textures/runtime/ThrottleLevel4.png rename to assets/textures/runtime/ThrottleLevel4.png diff --git a/textures/runtime/ThrottleLevel5.png b/assets/textures/runtime/ThrottleLevel5.png similarity index 100% rename from textures/runtime/ThrottleLevel5.png rename to assets/textures/runtime/ThrottleLevel5.png diff --git a/textures/runtime/ThrottleLevel6.png b/assets/textures/runtime/ThrottleLevel6.png similarity index 100% rename from textures/runtime/ThrottleLevel6.png rename to assets/textures/runtime/ThrottleLevel6.png diff --git a/textures/runtime/ThrottleLevel7.png b/assets/textures/runtime/ThrottleLevel7.png similarity index 100% rename from textures/runtime/ThrottleLevel7.png rename to assets/textures/runtime/ThrottleLevel7.png diff --git a/textures/runtime/ThrottleLevel8.png b/assets/textures/runtime/ThrottleLevel8.png similarity index 100% rename from textures/runtime/ThrottleLevel8.png rename to assets/textures/runtime/ThrottleLevel8.png diff --git a/textures/runtime/ThrottleLevel9.png b/assets/textures/runtime/ThrottleLevel9.png similarity index 100% rename from textures/runtime/ThrottleLevel9.png rename to assets/textures/runtime/ThrottleLevel9.png diff --git a/textures/runtime/TimeControl.PNG b/assets/textures/runtime/TimeControl.PNG similarity index 100% rename from textures/runtime/TimeControl.PNG rename to assets/textures/runtime/TimeControl.PNG diff --git a/textures/runtime/ToolbarSide.PNG b/assets/textures/runtime/ToolbarSide.PNG similarity index 100% rename from textures/runtime/ToolbarSide.PNG rename to assets/textures/runtime/ToolbarSide.PNG diff --git a/textures/runtime/ToolbarStretch.PNG b/assets/textures/runtime/ToolbarStretch.PNG similarity index 100% rename from textures/runtime/ToolbarStretch.PNG rename to assets/textures/runtime/ToolbarStretch.PNG diff --git a/textures/runtime/UnlockHeading.png b/assets/textures/runtime/UnlockHeading.png similarity index 100% rename from textures/runtime/UnlockHeading.png rename to assets/textures/runtime/UnlockHeading.png diff --git a/textures/runtime/WarpBarSide.PNG b/assets/textures/runtime/WarpBarSide.PNG similarity index 100% rename from textures/runtime/WarpBarSide.PNG rename to assets/textures/runtime/WarpBarSide.PNG diff --git a/textures/runtime/WarpBarStretch.png b/assets/textures/runtime/WarpBarStretch.png similarity index 100% rename from textures/runtime/WarpBarStretch.png rename to assets/textures/runtime/WarpBarStretch.png diff --git a/textures/runtime/WarpButton.png b/assets/textures/runtime/WarpButton.png similarity index 100% rename from textures/runtime/WarpButton.png rename to assets/textures/runtime/WarpButton.png diff --git a/textures/runtime/WarpSpeedButton.png b/assets/textures/runtime/WarpSpeedButton.png similarity index 100% rename from textures/runtime/WarpSpeedButton.png rename to assets/textures/runtime/WarpSpeedButton.png diff --git a/textures/runtime/background.png b/assets/textures/runtime/background.png similarity index 100% rename from textures/runtime/background.png rename to assets/textures/runtime/background.png diff --git a/textures/runtime/background_ka1.jpg b/assets/textures/runtime/background_ka1.jpg similarity index 100% rename from textures/runtime/background_ka1.jpg rename to assets/textures/runtime/background_ka1.jpg diff --git a/textures/runtime/background_ka2.jpg b/assets/textures/runtime/background_ka2.jpg similarity index 100% rename from textures/runtime/background_ka2.jpg rename to assets/textures/runtime/background_ka2.jpg diff --git a/textures/soild_engine_flame.png b/assets/textures/soild_engine_flame.png similarity index 100% rename from textures/soild_engine_flame.png rename to assets/textures/soild_engine_flame.png diff --git a/textures/train.jpg b/assets/textures/train.jpg similarity index 100% rename from textures/train.jpg rename to assets/textures/train.jpg diff --git a/configs/local_logger.toml b/config/local_logger.toml similarity index 100% rename from configs/local_logger.toml rename to config/local_logger.toml diff --git a/configs/logger.toml b/config/logger.toml similarity index 100% rename from configs/logger.toml rename to config/logger.toml diff --git a/configs/main.toml b/config/main.toml similarity index 100% rename from configs/main.toml rename to config/main.toml diff --git a/libs/utils/nuitka.py b/libs/utils/nuitka.py index 63fbd39..7e90a35 100644 --- a/libs/utils/nuitka.py +++ b/libs/utils/nuitka.py @@ -67,7 +67,8 @@ class CompilerHelper(Options): include_data_dir: List[Tuple[str, str]] = [('./libs/fonts', './libs/fonts'), ('./textures', './textures'), - ('./configs', './configs')] + ('./config', './config'), + ('./assets', './assets')] include_packages: List[str] = ['Difficult_Rocket.api'] enable_plugin: List[str] = [] # --enable-plugin=xxx,xxx diff --git a/mods/dr_game/Difficult_Rocket_rs/__init__.py b/mods/dr_game/Difficult_Rocket_rs/__init__.py index 7ec6efa..fa2374a 100644 --- a/mods/dr_game/Difficult_Rocket_rs/__init__.py +++ b/mods/dr_game/Difficult_Rocket_rs/__init__.py @@ -17,9 +17,9 @@ if TYPE_CHECKING: def get_version_str() -> str: ... - def part_list_read_test(file_name: Optional[str] = "./configs/PartList.xml") -> None: ... + def part_list_read_test(file_name: Optional[str] = "./assets/builtin/PartList.xml") -> None: ... - def read_ship_test(path: Optional[str] = "./configs/dock1.xml") -> None: ... + def read_ship_test(path: Optional[str] = "./assets/builtin/dock1.xml") -> None: ... class SR1PartType_rs: @@ -52,7 +52,7 @@ if TYPE_CHECKING: class SR1PartList_rs: """ 用于从 rust 中读取 SR1PartList """ - def __init__(self, file_name: Optional[str] = "./configs/PartList.xml", + def __init__(self, file_name: Optional[str] = "./assets/builtin/PartList.xml", list_name: Optional[str] = 'NewPartList'): ... def as_dict(self) -> Dict[str, SR1PartType_rs]: ... @@ -90,7 +90,10 @@ if TYPE_CHECKING: class SR1Ship_rs: """ 用于高效且省内存的读取 SR1Ship """ - def __init__(self, file_path = './configs/dock1.xml', part_list = './configs/PartList.xml', ship_name = 'NewShip'): ... + def __init__(self, + file_path = './assets/builtin/dock1.xml', + part_list = './assets/builtin/PartList.xml', + ship_name = 'NewShip'): ... @property def name(self) -> str: ... @property diff --git a/mods/dr_game/Difficult_Rocket_rs/src/src/python.rs b/mods/dr_game/Difficult_Rocket_rs/src/src/python.rs index 7e48e70..01e1e8b 100644 --- a/mods/dr_game/Difficult_Rocket_rs/src/src/python.rs +++ b/mods/dr_game/Difficult_Rocket_rs/src/src/python.rs @@ -84,7 +84,7 @@ pub mod data { #[pymethods] impl PySR1PartList { #[new] - #[pyo3(text_signature = "(file_path = './configs/PartList.xml', list_name = 'NewPartList')")] + #[pyo3(text_signature = "(file_path = './assets/builtin/PartList.xml', list_name = 'NewPartList')")] fn new(file_path: String, list_name: String) -> Self { let raw_part_list: RawPartList = RawPartList::from_file(file_path).unwrap(); let data = raw_part_list.to_sr_part_list(Some(list_name)); @@ -157,7 +157,7 @@ pub mod data { #[pymethods] impl PySR1Ship { #[new] - #[pyo3(text_signature = "(file_path = './configs/dock1.xml', part_list = './configs/PartList.xml', ship_name = 'NewShip')")] + #[pyo3(text_signature = "(file_path = './assets/builtin/dock1.xml', part_list = './assets/builtin/PartList.xml', ship_name = 'NewShip')")] fn new(file_path: String, part_list: String, ship_name: String) -> Self { let mut ship = SR1Ship::from_file(file_path, Some(ship_name)).unwrap(); let part_list = SR1PartList::from_file(part_list).unwrap(); diff --git a/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_data.rs b/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_data.rs index b8ad872..6ed4825 100644 --- a/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_data.rs +++ b/mods/dr_game/Difficult_Rocket_rs/src/src/sr1_data.rs @@ -351,9 +351,9 @@ pub mod part_list { #[inline] #[pyfunction] - #[pyo3(name = "part_list_read_test", signature = (file_name = "./configs/PartList.xml".to_string()))] + #[pyo3(name = "part_list_read_test", signature = (file_name = "./assets/builtin/PartList.xml".to_string()))] pub fn read_part_list_py(_py: Python, file_name: Option) -> PyResult<()> { - let file_name = file_name.unwrap_or("./configs/PartList.xml".to_string()); + let file_name = file_name.unwrap_or("./assets/builtin/PartList.xml".to_string()); let _parts = RawPartList::from_file(file_name); if let Some(parts) = _parts { // println!("{:?}", parts) @@ -624,7 +624,7 @@ pub mod ship { #[pyfunction] #[pyo3(name = "read_ship_test")] - #[pyo3(signature = (path = "./configs/dock1.xml".to_string()))] + #[pyo3(signature = (path = "./assets/builtin/dock1.xml".to_string()))] pub fn py_raw_ship_from_file(path: String) -> PyResult { let file = fs::read_to_string(path).unwrap(); let raw_ship = from_str::(&file); diff --git a/mods/dr_game/sr1_ship.py b/mods/dr_game/sr1_ship.py index af792e9..ce11310 100644 --- a/mods/dr_game/sr1_ship.py +++ b/mods/dr_game/sr1_ship.py @@ -126,14 +126,14 @@ class SR1ShipRender(BaseScreen): self.part_line_box: Dict[int, List[Line]] = {} self.part_line_list: List[Line] = [] - self.load_xml('configs/dock1.xml') + self.load_xml('assets/builtin/dock1.xml') load_end_time = time.time_ns() logger.info(sr_tr().mod.info.setup.use_time().format((load_end_time - load_start_time) / 1000000000)) self.camera = CenterCamera(main_window, min_zoom=(1 / 2) ** 10, max_zoom=10) if DR_mod_runtime.use_DR_rust: self.rust_parts = None - self.part_list_rs = SR1PartList_rs('configs/PartList.xml', 'default_part_list') + self.part_list_rs = SR1PartList_rs('assets/builtin/PartList.xml', 'default_part_list') def load_xml(self, file_path: str) -> bool: try: @@ -144,7 +144,7 @@ class SR1ShipRender(BaseScreen): self.xml_root = self.xml_doc.getroot() self.xml_name = file_path if DR_mod_runtime.use_DR_rust: - self.rust_ship = SR1Ship_rs(file_path, 'configs/PartList.xml', 'a_new_ship') + self.rust_ship = SR1Ship_rs(file_path, 'assets/builtin/PartList.xml', 'a_new_ship') logger.info(sr_tr().sr1.ship.xml.load_done()) logger.info(sr_tr().sr1.ship.xml.load_time().format( (time.time_ns() - start_time) / 1000000000)) diff --git a/nuitka_build.py b/nuitka_build.py index c15211f..3cd7367 100644 --- a/nuitka_build.py +++ b/nuitka_build.py @@ -127,7 +127,7 @@ if __name__ == '__main__': file_path = os.path.join(path, file) dist_dir_size += os.path.getsize(file_path) # 排除不需要记录的文件 - if any(x in file_path for x in ('configs', 'libs', 'textures')): + if any(x in file_path for x in ('config', 'libs', 'textures')): continue dist_file_size[file_path] = (os.path.getsize(file_path), os.path.getsize(file_path) / 1024 / 1024) compile_data = {'compile_time_ns': time.time_ns() - start_time, From 2155ad70457bc04755ca6e5b5b09492395e015b3 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 00:20:11 +0800 Subject: [PATCH 2/8] fix time zone in crash.py --- Difficult_Rocket/crash/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Difficult_Rocket/crash/__init__.py b/Difficult_Rocket/crash/__init__.py index 11746f0..3627b3d 100644 --- a/Difficult_Rocket/crash/__init__.py +++ b/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) From f3c2540daecc090a9f6a5277f402c3413b339d3c Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 00:21:31 +0800 Subject: [PATCH 3/8] clean up textures --- Difficult_Rocket/client/__init__.py | 4 ++-- docs/src/rua!.md | 2 +- mods/dr_game/types.py | 2 +- nuitka_build.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Difficult_Rocket/client/__init__.py b/Difficult_Rocket/client/__init__.py index f1175a9..cca56c9 100644 --- a/Difficult_Rocket/client/__init__.py +++ b/Difficult_Rocket/client/__init__.py @@ -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: diff --git a/docs/src/rua!.md b/docs/src/rua!.md index 651af06..2489ac9 100644 --- a/docs/src/rua!.md +++ b/docs/src/rua!.md @@ -19,5 +19,5 @@ pyglet 坐标轴原点是左上角 0, 0 我check一下微调器的代码，原理应该一样，有个函数我看看怎么实现 # 素材提供 -[背景候选1号](../../textures/runtime/background.png) +[背景候选1号](../../assets/textures/runtime/background.png) 来自 @底层萌新 QQ：1744251171 diff --git a/mods/dr_game/types.py b/mods/dr_game/types.py index 89ec821..bc37e0e 100644 --- a/mods/dr_game/types.py +++ b/mods/dr_game/types.py @@ -37,7 +37,7 @@ class SR1Textures(Options): super().__init__(**kwargs) self.flush_option() for image_name in self.cached_options: - img = load(f'textures/parts/{image_name}.png') + img = load(f'assets/textures/parts/{image_name}.png') img.anchor_x = img.width // 2 img.anchor_y = img.height // 2 setattr(self, image_name, img) diff --git a/nuitka_build.py b/nuitka_build.py index 3cd7367..6f2d04d 100644 --- a/nuitka_build.py +++ b/nuitka_build.py @@ -127,7 +127,7 @@ if __name__ == '__main__': file_path = os.path.join(path, file) dist_dir_size += os.path.getsize(file_path) # 排除不需要记录的文件 - if any(x in file_path for x in ('config', 'libs', 'textures')): + if any(x in file_path for x in ('config', 'libs', 'assets')): continue dist_file_size[file_path] = (os.path.getsize(file_path), os.path.getsize(file_path) / 1024 / 1024) compile_data = {'compile_time_ns': time.time_ns() - start_time, From 04ab2e3965eab54e7754e9d7c92cc8a11b67f43f Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 00:32:28 +0800 Subject: [PATCH 4/8] fix build --- libs/utils/nuitka.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/utils/nuitka.py b/libs/utils/nuitka.py index 7e90a35..3222dde 100644 --- a/libs/utils/nuitka.py +++ b/libs/utils/nuitka.py @@ -59,7 +59,7 @@ class CompilerHelper(Options): copy_right: str = 'Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com' # --copyright - icon_path: Path = Path('textures/icon.png') + icon_path: Path = Path('assets/textures/icon.png') follow_import: List[str] = ['pyglet'] no_follow_import: List[str] = ['objprint', 'pillow', 'PIL', 'cffi', 'pydoc', 'numpy', 'email', 'win32con', From eb12243e55cf21a43721faa47ae7542df2c8cf7b Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 00:59:24 +0800 Subject: [PATCH 5/8] some update --- Difficult_Rocket/__init__.py | 2 +- README.md | 2 +- config/main.toml | 2 +- docs/README-en.md | 2 +- docs/src/change_log/build_file.md | 2 ++ docs/src/change_log/dr_sdk.md | 23 ++++++++++++++++++++++- libs/utils/nuitka.py | 4 +--- pyproject.toml | 2 +- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Difficult_Rocket/__init__.py b/Difficult_Rocket/__init__.py index 5ea8afc..42d3def 100644 --- a/Difficult_Rocket/__init__.py +++ b/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.5.3") # SDK 版本 build_version = Version("2.1.3.0") # 编译文件版本(与游戏本体无关) Api_version = Version("0.1.1.0") # API 版本 __version__ = sdk_version diff --git a/README.md b/README.md index 6b96c87..347c660 100644 --- a/README.md +++ b/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.5.3-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) diff --git a/config/main.toml b/config/main.toml index 50999c7..0d41a67 100644 --- a/config/main.toml +++ b/config/main.toml @@ -3,7 +3,7 @@ fps = 60 language = "zh-CN" date_fmt = "%Y-%m-%d %H-%M-%S" write_py_v = "3.8.10" -fonts_folder = "libs/fonts" +fonts_folder = "assets/fonts" [window] style = "None" diff --git a/docs/README-en.md b/docs/README-en.md index 9cf5b17..a28e021 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -20,7 +20,7 @@ [About Versions](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.5.3-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) diff --git a/docs/src/change_log/build_file.md b/docs/src/change_log/build_file.md index 92fd51e..f4a3eae 100644 --- a/docs/src/change_log/build_file.md +++ b/docs/src/change_log/build_file.md @@ -10,6 +10,8 @@ - 添加 `email` `win32con` `smtplib` `win32evtlog` `win32evtlogutil` `win32api` 到 `--no-follow-import` - Add `email`, `win32con`, `smtplib`, `win32evtlog`, `win32evtlogutil`, `win32api` to `--no-follow-import` +- `include_data_dir` 移除 `libs/fonts` `textures` + - 改为 `assets` 和 `config` ## 20230708 build 2.1.2.0 diff --git a/docs/src/change_log/dr_sdk.md b/docs/src/change_log/dr_sdk.md index 6f02f4b..575ee06 100644 --- a/docs/src/change_log/dr_sdk.md +++ b/docs/src/change_log/dr_sdk.md @@ -2,7 +2,28 @@ # DR SDK 更新日志 - 最新版本号 - - DR sdk: 0.8.5.2 + - DR sdk: 0.8.5.3 + +## DR sdk 0.8.5.3 + +重构了一下项目结构 + +Refactored the project structure + +### Fix + +- issue [#42](https://github.com/shenjackyuanjie/Difficult-Rocket/issues/42) + - Crash report 的时区不正确 + - Crash report time zone is incorrect + +### Change + +- 将大部分资源文件移动到 `assets/` + - `libs/fonts` -> `assets/fonts` + - `configs/lang` -> `assets/lang` + - `configs/xxx.xml` -> `assets/builtin/xxx.xml` + - `textures` -> `assets/textures` + - Move all the resources to `assets/` ## DR sdk 0.8.5.2 diff --git a/libs/utils/nuitka.py b/libs/utils/nuitka.py index 3222dde..b3da94b 100644 --- a/libs/utils/nuitka.py +++ b/libs/utils/nuitka.py @@ -65,9 +65,7 @@ class CompilerHelper(Options): no_follow_import: List[str] = ['objprint', 'pillow', 'PIL', 'cffi', 'pydoc', 'numpy', 'email', 'win32con', 'smtplib', 'win32evtlog', 'win32evtlogutil', 'win32api'] - include_data_dir: List[Tuple[str, str]] = [('./libs/fonts', './libs/fonts'), - ('./textures', './textures'), - ('./config', './config'), + include_data_dir: List[Tuple[str, str]] = [('./config', './config'), ('./assets', './assets')] include_packages: List[str] = ['Difficult_Rocket.api'] diff --git a/pyproject.toml b/pyproject.toml index aafcfde..5d1777f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "pdm.pep517.api" [project] name = "difficult-rocket" -version = "0.8.5.1" +version = "0.8.5.3" description = "A rocket game" authors = [ {name = "shenjackyuanjie", email = "3695888@qq.com"} From 5bdf0861907622709f931533bb81a1425b29a76e Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 02:00:29 +0800 Subject: [PATCH 6/8] update: 0.8.6.0 --- Difficult_Rocket/__init__.py | 2 +- README.md | 2 +- docs/README-en.md | 2 +- docs/src/change_log/dr_sdk.md | 4 ++-- pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Difficult_Rocket/__init__.py b/Difficult_Rocket/__init__.py index 42d3def..ef8ed66 100644 --- a/Difficult_Rocket/__init__.py +++ b/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.3") # 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 diff --git a/README.md b/README.md index 347c660..c70fd73 100644 --- a/README.md +++ b/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.3-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) diff --git a/docs/README-en.md b/docs/README-en.md index a28e021..52541c9 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -20,7 +20,7 @@ [About Versions](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.3-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) diff --git a/docs/src/change_log/dr_sdk.md b/docs/src/change_log/dr_sdk.md index 575ee06..2d3323d 100644 --- a/docs/src/change_log/dr_sdk.md +++ b/docs/src/change_log/dr_sdk.md @@ -2,9 +2,9 @@ # DR SDK 更新日志 - 最新版本号 - - DR sdk: 0.8.5.3 + - DR sdk: 0.8.6.0 -## DR sdk 0.8.5.3 +## DR sdk 0.8.6.0 重构了一下项目结构 diff --git a/pyproject.toml b/pyproject.toml index 5d1777f..7334ecb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "pdm.pep517.api" [project] name = "difficult-rocket" -version = "0.8.5.3" +version = "0.8.6.0" description = "A rocket game" authors = [ {name = "shenjackyuanjie", email = "3695888@qq.com"} From 366e02d992226a65421a39e0c7d9130e87eacf98 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 02:13:03 +0800 Subject: [PATCH 7/8] update dependecy --- README.md | 2 +- docs/README-en.md | 2 +- requirement-build.txt | 2 +- requirement-dev.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c70fd73..706376c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docs/README-en.md b/docs/README-en.md index 52541c9..6550a0e 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -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 diff --git a/requirement-build.txt b/requirement-build.txt index f2f2210..350ea5c 100644 --- a/requirement-build.txt +++ b/requirement-build.txt @@ -18,7 +18,7 @@ defusedxml >= 0.7.1 objprint >= 0.2.2 # 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 diff --git a/requirement-dev.txt b/requirement-dev.txt index fccaf65..debcd87 100644 --- a/requirement-dev.txt +++ b/requirement-dev.txt @@ -21,7 +21,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 From 2da10160fee95802afcfd2bc9288dd16e83efd67 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 16 Jul 2023 02:24:23 +0800 Subject: [PATCH 8/8] fix CI --- nuitka_build.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nuitka_build.py b/nuitka_build.py index 6f2d04d..515ea85 100644 --- a/nuitka_build.py +++ b/nuitka_build.py @@ -36,7 +36,6 @@ if __name__ == '__main__': compiler.show_progress = False compiler.output_path = Path('./build/github') compiler.python_cmd = 'python' - compiler.include_data_dir.remove(('./libs/fonts', './libs/fonts')) compiler.save_xml = False # 检测 --xml 参数