Merge branch 'main' of http://62.234.216.156/Stanley/Voyager

2025-11-03 14:48:13 +08:00
parent 92251c110c 71b4609a01
commit 63a86af8e1
20 changed files with 41 additions and 34 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -135,6 +135,7 @@ bSendUsageData=False
 +DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Enemy")
 +DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Player")
 +DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="RiftInBattle")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel5,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="RiftBackToStation")
 -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
 -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
 -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
--- a/Content/Blueprints/Battle/BP_BattleLevelManager.uasset
+++ b/Content/Blueprints/Battle/BP_BattleLevelManager.uasset
--- a/Content/Blueprints/Battle/BP_EnemySpawner.uasset
+++ b/Content/Blueprints/Battle/BP_EnemySpawner.uasset
--- 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/Core/BP_GI.uasset
+++ b/Content/Blueprints/Core/BP_GI.uasset
--- a/Content/GameMode/GM_TechTree.uasset
+++ b/Content/GameMode/GM_TechTree.uasset
--- a/Content/Levels/Battle.umap
+++ b/Content/Levels/Battle.umap
--- a/Content/Levels/TechTree.umap
+++ b/Content/Levels/TechTree.umap
--- a/Content/Models/Player/Ship/ABP_Ship.uasset
+++ b/Content/Models/Player/Ship/ABP_Ship.uasset
--- a/Content/Models/Player/Ship/BP_ShipAnimActor.uasset
+++ b/Content/Models/Player/Ship/BP_ShipAnimActor.uasset
--- a/Content/Models/Player/Ship/SK_飞船3-ani.uasset
+++ b/Content/Models/Player/Ship/SK_飞船3-ani.uasset
--- a/Content/UI/BattleAssets/T_Battle_NaviArrowWhite.uasset
+++ b/Content/UI/BattleAssets/T_Battle_NaviArrowWhite.uasset
--- a/Content/UI/BattleAssets/WBP_Arrow.uasset
+++ b/Content/UI/BattleAssets/WBP_Arrow.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/WBP_Battle.uasset
+++ b/Content/UI/WBP_Battle.uasset
--- a/Content/UI/WBP_MainMenu.uasset
+++ b/Content/UI/WBP_MainMenu.uasset
--- a/Content/UI/WBP_Planet.uasset
+++ b/Content/UI/WBP_Planet.uasset
--- a/Content/UI/WBP_TechTree.uasset
+++ b/Content/UI/WBP_TechTree.uasset