Merge branch 'main' of http://123.113.98.222:3000/azurice/Voyager

2025-11-11 21:25:31 +08:00
parent 1c5c051d2c 60cf953ecc
commit 94e987c597
23 changed files with 39 additions and 45 deletions
--- a/Content/Blueprints/Battle/BP_PlayerShip.uasset
+++ b/Content/Blueprints/Battle/BP_PlayerShip.uasset
--- a/Content/Blueprints/Battle/BP_RiftBackToStation.uasset
+++ b/Content/Blueprints/Battle/BP_RiftBackToStation.uasset
--- a/Content/Blueprints/Battle/BP_RiftInBattle.uasset
+++ b/Content/Blueprints/Battle/BP_RiftInBattle.uasset
--- a/Content/Blueprints/Core/BP_GI.uasset
+++ b/Content/Blueprints/Core/BP_GI.uasset
--- a/Content/Blueprints/TechTree/BP_CustomizedCameraActor.uasset
+++ b/Content/Blueprints/TechTree/BP_CustomizedCameraActor.uasset
--- a/Content/GameMode/GM_TechTree.uasset
+++ b/Content/GameMode/GM_TechTree.uasset
--- a/Content/Levels/TechTree.umap
+++ b/Content/Levels/TechTree.umap
--- a/Content/Materials/PostProcesing/PPI_UI_弹窗.uasset
+++ b/Content/Materials/PostProcesing/PPI_UI_弹窗.uasset
--- a/Content/Materials/PostProcesing/PP_UI_Base.uasset
+++ b/Content/Materials/PostProcesing/PP_UI_Base.uasset
--- a/Content/Materials/PostProcesing/PP_UI_弹窗.uasset
+++ b/Content/Materials/PostProcesing/PP_UI_弹窗.uasset
--- a/Content/Textures/icon/T_input_P.uasset
+++ b/Content/Textures/icon/T_input_P.uasset
--- a/Content/Textures/icon/T_input_W2.uasset
+++ b/Content/Textures/icon/T_input_W2.uasset
--- a/Content/Textures/icon/tile_0392.uasset
+++ b/Content/Textures/icon/tile_0392.uasset
--- a/Content/Textures/icon/tile_0393.uasset
+++ b/Content/Textures/icon/tile_0393.uasset
--- a/Content/Textures/icon/tile_0394.uasset
+++ b/Content/Textures/icon/tile_0394.uasset
--- a/Content/UI/PlanetAssets/WBP_ResourceListSingle.uasset
+++ b/Content/UI/PlanetAssets/WBP_ResourceListSingle.uasset
--- a/Content/UI/PlanetAssets/WBP_ResourcesList.uasset
+++ b/Content/UI/PlanetAssets/WBP_ResourcesList.uasset
--- a/Content/UI/TechTree/T_TechTree_Button_DisabledGrey.uasset
+++ b/Content/UI/TechTree/T_TechTree_Button_DisabledGrey.uasset
--- a/Content/UI/TechTree/WBP_Dialog_TechTreeApplyTech.uasset
+++ b/Content/UI/TechTree/WBP_Dialog_TechTreeApplyTech.uasset
--- a/Content/UI/TechTree/WBP_TechTreeButton.uasset
+++ b/Content/UI/TechTree/WBP_TechTreeButton.uasset
--- a/Content/UI/WBP_Battle.uasset
+++ b/Content/UI/WBP_Battle.uasset
--- a/Content/UI/WBP_Pause.uasset
+++ b/Content/UI/WBP_Pause.uasset
--- a/Content/UI/WBP_TechTree.uasset
+++ b/Content/UI/WBP_TechTree.uasset