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/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