Merge remote-tracking branch 'refs/remotes/origin/main'

2025-10-01 14:55:34 +08:00
parent c207c76002 1596d0d92e
commit 4bb3823cc0
49 changed files with 102 additions and 63 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -7,6 +7,7 @@ UseAudioMixer=True
 EditorStartupMap=/Game/Levels/PaperZD.PaperZD
 GameDefaultMap=/Game/Levels/PaperZD.PaperZD
 GlobalDefaultGameMode=/Game/Blueprints/BP_GameModeBase.BP_GameModeBase_C
 GameInstanceClass=/Game/Blueprints/Core/BP_GI.BP_GI_C
 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
--- a/Content/Blueprints/BPFunctionLibrary/BP_CommonFunctionLibrary.uasset
+++ b/Content/Blueprints/BPFunctionLibrary/BP_CommonFunctionLibrary.uasset
--- a/Content/Blueprints/Battle/BP_Enemy.uasset
+++ b/Content/Blueprints/Battle/BP_Enemy.uasset
--- a/Content/Blueprints/Battle/BP_Enemy_Blue.uasset
+++ b/Content/Blueprints/Battle/BP_Enemy_Blue.uasset
--- a/Content/Blueprints/Battle/BP_Enemy_Green.uasset
+++ b/Content/Blueprints/Battle/BP_Enemy_Green.uasset
--- a/Content/Blueprints/Battle/BP_Enemy_Purple.uasset
+++ b/Content/Blueprints/Battle/BP_Enemy_Purple.uasset
--- a/Content/Blueprints/Battle/BP_Enemy_Red.uasset
+++ b/Content/Blueprints/Battle/BP_Enemy_Red.uasset
--- a/Content/Blueprints/Battle/BP_PlayerShip.uasset
+++ b/Content/Blueprints/Battle/BP_PlayerShip.uasset
--- a/Content/Blueprints/Battle/BP_Projectile.uasset
+++ b/Content/Blueprints/Battle/BP_Projectile.uasset
--- a/Content/Blueprints/Battle/BP_Projectile_Blue.uasset
+++ b/Content/Blueprints/Battle/BP_Projectile_Blue.uasset
--- a/Content/Blueprints/Battle/BP_Projectile_Green.uasset
+++ b/Content/Blueprints/Battle/BP_Projectile_Green.uasset
--- a/Content/Blueprints/Battle/BP_Projectile_Red.uasset
+++ b/Content/Blueprints/Battle/BP_Projectile_Red.uasset
--- a/Content/Blueprints/Battle/C_HealthComponent.uasset
+++ b/Content/Blueprints/Battle/C_HealthComponent.uasset
--- a/Content/Blueprints/Core/BPI_GISave.uasset
+++ b/Content/Blueprints/Core/BPI_GISave.uasset
--- a/Content/Blueprints/Core/BPI_ManageLevel.uasset
+++ b/Content/Blueprints/Core/BPI_ManageLevel.uasset
--- a/Content/Blueprints/Core/BP_GI.uasset
+++ b/Content/Blueprints/Core/BP_GI.uasset
--- a/Content/Blueprints/Core/BP_SaveGame.uasset
+++ b/Content/Blueprints/Core/BP_SaveGame.uasset
--- a/Content/Blueprints/Core/GM_MainMenu.uasset
+++ b/Content/Blueprints/Core/GM_MainMenu.uasset
--- a/Content/Blueprints/Data/BP_SaveGame.uasset
+++ b/Content/Blueprints/Data/BP_SaveGame.uasset
--- a/Content/Blueprints/Data/BP_TechBase.uasset
+++ b/Content/Blueprints/Data/BP_TechBase.uasset
--- a/Content/Blueprints/Data/BP_TechDerived/BP_TechHealth.uasset
+++ b/Content/Blueprints/Data/BP_TechDerived/BP_TechHealth.uasset
--- a/Content/Blueprints/Data/DT_Resource.uasset
+++ b/Content/Blueprints/Data/DT_Resource.uasset
--- a/Content/Blueprints/Data/E_ResourceType.uasset
+++ b/Content/Blueprints/Data/E_ResourceType.uasset
--- a/Content/Blueprints/Data/ST_ResourceDef.uasset
+++ b/Content/Blueprints/Data/ST_ResourceDef.uasset
--- a/Content/Blueprints/Data/ST_Rift.uasset
+++ b/Content/Blueprints/Data/ST_Rift.uasset
--- a/Content/Blueprints/Data/ST_TechDef.uasset
+++ b/Content/Blueprints/Data/ST_TechDef.uasset
--- a/Content/Blueprints/Test/BP_TestResource.uasset
+++ b/Content/Blueprints/Test/BP_TestResource.uasset
--- a/Content/Levels/Battle.umap
+++ b/Content/Levels/Battle.umap
--- a/Content/Levels/Test.umap
+++ b/Content/Levels/Test.umap
--- a/Content/Levels/Test/TestResource.umap
+++ b/Content/Levels/Test/TestResource.umap
--- a/Content/Levels/TestResource.umap
+++ b/Content/Levels/TestResource.umap
--- a/Content/Materials/MI_Blue.uasset
+++ b/Content/Materials/MI_Blue.uasset
--- a/Content/Materials/MI_Green.uasset
+++ b/Content/Materials/MI_Green.uasset
--- a/Content/Materials/MI_Purple.uasset
+++ b/Content/Materials/MI_Purple.uasset
--- a/Content/Materials/MI_Red.uasset
+++ b/Content/Materials/MI_Red.uasset
--- a/Content/Materials/MI_Yellow.uasset
+++ b/Content/Materials/MI_Yellow.uasset
--- a/Content/Materials/M_Blue.uasset
+++ b/Content/Materials/M_Blue.uasset
--- a/Content/Materials/M_Green.uasset
+++ b/Content/Materials/M_Green.uasset
--- a/Content/Materials/M_Purple.uasset
+++ b/Content/Materials/M_Purple.uasset
--- a/Content/Materials/M_Red.uasset
+++ b/Content/Materials/M_Red.uasset
--- a/Content/Materials/M_SingleColor.uasset
+++ b/Content/Materials/M_SingleColor.uasset
--- a/Content/Materials/M_White.uasset
+++ b/Content/Materials/M_White.uasset
--- a/Content/Materials/M_Yellow.uasset
+++ b/Content/Materials/M_Yellow.uasset
--- a/Content/UI/GM_UIPlayGround.uasset
+++ b/Content/UI/GM_UIPlayGround.uasset
--- a/Content/UI/WBP_LoadingScreen.uasset
+++ b/Content/UI/WBP_LoadingScreen.uasset
--- a/Content/UI/WBP_MainMenu.uasset
+++ b/Content/UI/WBP_MainMenu.uasset
--- a/Content/_AzurIceShitting/ResourceSpawning/E_ResourceType.uasset
+++ b/Content/_AzurIceShitting/ResourceSpawning/E_ResourceType.uasset
--- a/Content/_AzurIceShitting/ResourceSpawning/E_ResourceType_Tmp.uasset
+++ b/Content/_AzurIceShitting/ResourceSpawning/E_ResourceType_Tmp.uasset
--- a/Voyager.uproject.DotSettings.user
+++ b/Voyager.uproject.DotSettings.user
@@ -0,0 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AButton_002Eh_002Fl_003A_002E_002E_003F_002E_002E_003FUE_005F5_002E6_003FEngine_003FSource_003FRuntime_003FUMG_003FPublic_003FComponents_003FButton_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
		`@@ -0,0 +1,2 @@`
							`<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
							`<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AButton_002Eh_002Fl_003A_002E_002E_003F_002E_002E_003FUE_005F5_002E6_003FEngine_003FSource_003FRuntime_003FUMG_003FPublic_003FComponents_003FButton_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>`