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

2025-11-14 13:59:12 +08:00
parent f7c0cad0c6 3c97daacbc
commit fc0143b3ee
55 changed files with 110 additions and 83 deletions
--- a/Content/Blueprints/Battle/BP_PlayerShip.uasset
+++ b/Content/Blueprints/Battle/BP_PlayerShip.uasset
--- a/Content/Blueprints/Data/BP_TechDerived/BP_TechHealth_Add114514.uasset
+++ b/Content/Blueprints/Data/BP_TechDerived/BP_TechHealth_Add114514.uasset
--- a/Content/Blueprints/TechTree/BP_TechTree_PlayerShip.uasset
+++ b/Content/Blueprints/TechTree/BP_TechTree_PlayerShip.uasset
--- a/Content/Levels/Battle.umap
+++ b/Content/Levels/Battle.umap
--- a/Content/Levels/TechTree.umap
+++ b/Content/Levels/TechTree.umap
--- a/Content/Materials/Base/M_ShadeToonBase.uasset
+++ b/Content/Materials/Base/M_ShadeToonBase.uasset
--- a/Content/Materials/MaterialFunctions/MF_EdgeWear.uasset
+++ b/Content/Materials/MaterialFunctions/MF_EdgeWear.uasset
--- a/Content/Materials/MaterialFunctions/MF_RandomTilling.uasset
+++ b/Content/Materials/MaterialFunctions/MF_RandomTilling.uasset
--- a/Content/Materials/Ships/HomeStation/CA_HomeStation.uasset
+++ b/Content/Materials/Ships/HomeStation/CA_HomeStation.uasset
--- a/Content/Materials/Ships/HomeStation/C_Heatsink.uasset
+++ b/Content/Materials/Ships/HomeStation/C_Heatsink.uasset
--- a/Content/Materials/Ships/HomeStation/MI_Flame.uasset
+++ b/Content/Materials/Ships/HomeStation/MI_Flame.uasset
--- a/Content/Materials/Ships/HomeStation/MI_Heatsink.uasset
+++ b/Content/Materials/Ships/HomeStation/MI_Heatsink.uasset
--- a/Content/Materials/Ships/Interceptor/CA_Interceptor.uasset
+++ b/Content/Materials/Ships/Interceptor/CA_Interceptor.uasset
--- a/Content/Materials/Ships/Interceptor/C_IntCockpit.uasset
+++ b/Content/Materials/Ships/Interceptor/C_IntCockpit.uasset
--- a/Content/Materials/Ships/Interceptor/C_IntFlame.uasset
+++ b/Content/Materials/Ships/Interceptor/C_IntFlame.uasset
--- a/Content/Materials/Ships/Interceptor/C_IntFlameOpacity.uasset
+++ b/Content/Materials/Ships/Interceptor/C_IntFlameOpacity.uasset
--- a/Content/Materials/Ships/Interceptor/C_IntYellowColor.uasset
+++ b/Content/Materials/Ships/Interceptor/C_IntYellowColor.uasset
--- a/Content/Materials/Ships/Interceptor/C_IntYellowLineEW.uasset
+++ b/Content/Materials/Ships/Interceptor/C_IntYellowLineEW.uasset
--- a/Content/Materials/Ships/Interceptor/MI_Cockpit.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_Cockpit.uasset
--- a/Content/Materials/Ships/Interceptor/MI_Ship_Grey.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_Ship_Grey.uasset
--- a/Content/Materials/Ships/Interceptor/MI_black.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_black.uasset
--- a/Content/Materials/Ships/Interceptor/MI_red_missle.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_red_missle.uasset
--- a/Content/Materials/Ships/Interceptor/MI_temp_blue.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_temp_blue.uasset
--- a/Content/Materials/Ships/Interceptor/MI_white_main.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_white_main.uasset
--- a/Content/Materials/Ships/Interceptor/MI_yellow.uasset
+++ b/Content/Materials/Ships/Interceptor/MI_yellow.uasset
--- a/Content/Models/HomeStation/MI_blue_glass.uasset
+++ b/Content/Models/HomeStation/MI_blue_glass.uasset
--- a/Content/Models/HomeStation/MI_blue_light.uasset
+++ b/Content/Models/HomeStation/MI_blue_light.uasset
--- a/Content/Models/HomeStation/MI_curved_grey.uasset
+++ b/Content/Models/HomeStation/MI_curved_grey.uasset
--- a/Content/Models/HomeStation/MI_dark_grey.uasset
+++ b/Content/Models/HomeStation/MI_dark_grey.uasset
--- a/Content/Models/HomeStation/MI_mental.uasset
+++ b/Content/Models/HomeStation/MI_mental.uasset
--- a/Content/Models/HomeStation/MI_mental_grey.uasset
+++ b/Content/Models/HomeStation/MI_mental_grey.uasset
--- a/Content/Models/HomeStation/MI_red_light.uasset
+++ b/Content/Models/HomeStation/MI_red_light.uasset
--- a/Content/Models/HomeStation/MI_red_light1.uasset
+++ b/Content/Models/HomeStation/MI_red_light1.uasset
--- a/Content/Models/HomeStation/M_sanreban.uasset
+++ b/Content/Models/HomeStation/M_sanreban.uasset
--- a/Content/Models/Player/Ship/MI_GlassGreen.uasset
+++ b/Content/Models/Player/Ship/MI_GlassGreen.uasset
--- a/Content/Models/Player/Ship/MI_Ship_Grey.uasset
+++ b/Content/Models/Player/Ship/MI_Ship_Grey.uasset
--- a/Content/Models/Player/Ship/MI_black.uasset
+++ b/Content/Models/Player/Ship/MI_black.uasset
--- a/Content/Models/Player/Ship/MI_red_missle.uasset
+++ b/Content/Models/Player/Ship/MI_red_missle.uasset
--- a/Content/Models/Player/Ship/MI_temp_blue.uasset
+++ b/Content/Models/Player/Ship/MI_temp_blue.uasset
--- a/Content/Models/Player/Ship/MI_white_main.uasset
+++ b/Content/Models/Player/Ship/MI_white_main.uasset
--- a/Content/Models/Player/Ship/MI_yellow.uasset
+++ b/Content/Models/Player/Ship/MI_yellow.uasset
--- a/Content/Models/Player/Ship/M_flame.uasset
+++ b/Content/Models/Player/Ship/M_flame.uasset
--- a/Content/Models/Player/Ship/M_flame_ship.uasset
+++ b/Content/Models/Player/Ship/M_flame_ship.uasset
--- a/Content/Models/Player/Ship/SK_飞船3-ani.uasset
+++ b/Content/Models/Player/Ship/SK_飞船3-ani.uasset
--- a/Content/Models/Rift/MI_dark_blue.uasset
+++ b/Content/Models/Rift/MI_dark_blue.uasset
--- a/Content/Models/Rift/MI_dim_purple.uasset
+++ b/Content/Models/Rift/MI_dim_purple.uasset
--- a/Content/Models/Rift/MI_grey_lava.uasset
+++ b/Content/Models/Rift/MI_grey_lava.uasset
--- a/Content/Models/Rift/MI_lava.uasset
+++ b/Content/Models/Rift/MI_lava.uasset
--- a/Content/Models/Rift/MI_lava_purple.uasset
+++ b/Content/Models/Rift/MI_lava_purple.uasset
--- a/Content/Models/Rift/MI_light_lava.uasset
+++ b/Content/Models/Rift/MI_light_lava.uasset
--- a/Content/Models/Rift/MI_light_purple.uasset
+++ b/Content/Models/Rift/MI_light_purple.uasset
--- a/Content/Models/Rift/MI_lighter_lava.uasset
+++ b/Content/Models/Rift/MI_lighter_lava.uasset
--- a/Content/Models/Rift/MI_pink.uasset
+++ b/Content/Models/Rift/MI_pink.uasset
--- a/Content/Textures/T_Heatsink.png
+++ b/Content/Textures/T_Heatsink.png
--- a/Content/Textures/T_Heatsink.uasset
+++ b/Content/Textures/T_Heatsink.uasset