Merge branch 'main' of http://47.102.46.119:3000/ugc/UGCProjects

2025-01-14 15:38:45 +08:00 · 2025-01-14 15:38:45 +08:00 · 46cce4421a
commit 46cce4421a
parent 04d4e0ca7c a96088d573
164 changed files with 437 additions and 267 deletions
--- a/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset
+++ b/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset
--- a/SoloKing/Asset/Blueprint/SceneObj/Start/BP_ActorStart.uasset
+++ b/SoloKing/Asset/Blueprint/SceneObj/Start/BP_ActorStart.uasset
--- a/SoloKing/Asset/Blueprint/UGCGameMode.uasset
+++ b/SoloKing/Asset/Blueprint/UGCGameMode.uasset
--- a/SoloKing/Asset/Blueprint/UGCGameState.uasset
+++ b/SoloKing/Asset/Blueprint/UGCGameState.uasset
--- a/SoloKing/Asset/Blueprint/UGCLevelDirector.uasset
+++ b/SoloKing/Asset/Blueprint/UGCLevelDirector.uasset
--- a/SoloKing/Asset/Blueprint/UGCPlayerController.uasset
+++ b/SoloKing/Asset/Blueprint/UGCPlayerController.uasset
--- a/SoloKing/Asset/Blueprint/UGCPlayerPawn.uasset
+++ b/SoloKing/Asset/Blueprint/UGCPlayerPawn.uasset
--- a/SoloKing/Asset/Blueprint/UGCPlayerStartManager.uasset
+++ b/SoloKing/Asset/Blueprint/UGCPlayerStartManager.uasset
--- a/SoloKing/Asset/Blueprint/UGCPlayerState.uasset
+++ b/SoloKing/Asset/Blueprint/UGCPlayerState.uasset
--- a/SoloKing/Asset/Levels/Map_DBL.umap
+++ b/SoloKing/Asset/Levels/Map_DBL.umap
--- a/SoloKing/Asset/Levels/Map_DC.umap
+++ b/SoloKing/Asset/Levels/Map_DC.umap
--- a/SoloKing/Asset/Levels/Map_HDDJ.umap
+++ b/SoloKing/Asset/Levels/Map_HDDJ.umap
--- a/SoloKing/Asset/Levels/Map_JCK.umap
+++ b/SoloKing/Asset/Levels/Map_JCK.umap
--- a/SoloKing/Asset/Levels/Map_NewYear.umap
+++ b/SoloKing/Asset/Levels/Map_NewYear.umap
--- a/SoloKing/Asset/Levels/Map_SCL.umap
+++ b/SoloKing/Asset/Levels/Map_SCL.umap
--- a/SoloKing/Asset/Levels/Map_SLXLC.umap
+++ b/SoloKing/Asset/Levels/Map_SLXLC.umap
--- a/SoloKing/Asset/Levels/Map_SMDJ.umap
+++ b/SoloKing/Asset/Levels/Map_SMDJ.umap
--- a/SoloKing/Asset/UGCLayout_BP.uasset
+++ b/SoloKing/Asset/UGCLayout_BP.uasset
--- a/SoloKing/Asset/UI/Child/WB_PlayerInfoItem.uasset
+++ b/SoloKing/Asset/UI/Child/WB_PlayerInfoItem.uasset
--- a/SoloKing/Asset/UI/Child/WB_PlayerInfoItem_Small.uasset
+++ b/SoloKing/Asset/UI/Child/WB_PlayerInfoItem_Small.uasset
--- a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset
+++ b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset
--- a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVS.uasset
+++ b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVS.uasset
--- a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVSPlayerInfo.uasset
+++ b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVSPlayerInfo.uasset
--- a/SoloKing/Asset/UI/GameEnd/WB_GameEnd.uasset
+++ b/SoloKing/Asset/UI/GameEnd/WB_GameEnd.uasset
--- a/SoloKing/Asset/UI/GameEnd/WB_GameEnd_PlayerInfo.uasset
+++ b/SoloKing/Asset/UI/GameEnd/WB_GameEnd_PlayerInfo.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_GameRecord.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_GameRecord.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_Historical_Season.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_Historical_Season.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_RecordItem.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_RecordItem.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_RecordType.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_RecordType.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_RoundInfoItem.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_RoundInfoItem.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_SortType.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_SortType.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiency.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiency.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyPanel.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyPanel.uasset
--- a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyTop.uasset
+++ b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyTop.uasset
--- a/SoloKing/Asset/UI/InTest/WB_InTest_Side.uasset
+++ b/SoloKing/Asset/UI/InTest/WB_InTest_Side.uasset
--- a/SoloKing/Asset/UI/InTest/WB_TestButtonItem.uasset
+++ b/SoloKing/Asset/UI/InTest/WB_TestButtonItem.uasset
--- a/SoloKing/Asset/UI/Round/WB_RoundEnd.uasset
+++ b/SoloKing/Asset/UI/Round/WB_RoundEnd.uasset
--- a/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset
+++ b/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset
--- a/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset
+++ b/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset
--- a/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset
+++ b/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset
--- a/SoloKing/Asset/UI/SelectGameMode/WB_SelectGameMode.uasset
+++ b/SoloKing/Asset/UI/SelectGameMode/WB_SelectGameMode.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Item.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Item.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_ItemHadSelect.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_ItemHadSelect.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Type.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Type.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponDefenceItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponDefenceItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItems.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItems.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponOtherItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponOtherItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponPartItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponPartItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Child/WB_Spectator_SelectWeaponItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Child/WB_Spectator_SelectWeaponItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Item/WB_OtherPartItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Item/WB_OtherPartItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponPartItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponPartItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponSelectItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponSelectItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponPartItem.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponPartItem.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_Disables.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_Disables.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_SelectDisableChild.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_SelectDisableChild.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_ShowDisable.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_ShowDisable.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon_New.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon_New.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_ReselectWeaponBtn.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_ReselectWeaponBtn.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_SelectAllWeapon.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_SelectAllWeapon.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_SelectWeapons.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_SelectWeapons.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_SpectatorSelectWeapon.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_SpectatorSelectWeapon.uasset
--- a/SoloKing/Asset/UI/SelectWeapons/WB_WeaponSelect_New.uasset
+++ b/SoloKing/Asset/UI/SelectWeapons/WB_WeaponSelect_New.uasset
--- a/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset
+++ b/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset
--- a/SoloKing/Asset/UI/Tip/WB_TipSlidingTackle.uasset
+++ b/SoloKing/Asset/UI/Tip/WB_TipSlidingTackle.uasset
--- a/SoloKing/Asset/UI/Tool/Child/WB_RankItem.uasset
+++ b/SoloKing/Asset/UI/Tool/Child/WB_RankItem.uasset
--- a/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset
+++ b/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset
--- a/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset
+++ b/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset
--- a/SoloKing/Asset/UI/Tool/Title/WB_Title1_2.uasset
+++ b/SoloKing/Asset/UI/Tool/Title/WB_Title1_2.uasset
--- a/SoloKing/Asset/UI/Tool/Title/WB_Title2.uasset
+++ b/SoloKing/Asset/UI/Tool/Title/WB_Title2.uasset
--- a/SoloKing/Asset/UI/Tool/Title/WB_Title2_2.uasset
+++ b/SoloKing/Asset/UI/Tool/Title/WB_Title2_2.uasset
--- a/SoloKing/Asset/UI/Tool/WB_CountDownButton.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_CountDownButton.uasset
--- a/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset
--- a/SoloKing/Asset/UI/Tool/WB_FaceNotice.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_FaceNotice.uasset
--- a/SoloKing/Asset/UI/Tool/WB_PID.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_PID.uasset
--- a/SoloKing/Asset/UI/Tool/WB_Rank.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_Rank.uasset
--- a/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset
--- a/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset
--- a/SoloKing/Asset/UI/Tool/WB_SelectPartButton.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_SelectPartButton.uasset
--- a/SoloKing/Asset/UI/Tool/WB_SelectPartItem.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_SelectPartItem.uasset
--- a/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset
--- a/SoloKing/Asset/UI/Tool/WB_SettingButton.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_SettingButton.uasset
--- a/SoloKing/Asset/UI/Tool/WB_ShovelButton.uasset
+++ b/SoloKing/Asset/UI/Tool/WB_ShovelButton.uasset
--- a/SoloKing/Asset/UI/WB_Main.uasset
+++ b/SoloKing/Asset/UI/WB_Main.uasset
--- a/SoloKing/Asset/UI/WB_PlayerInfo.uasset
+++ b/SoloKing/Asset/UI/WB_PlayerInfo.uasset
--- a/SoloKing/Asset/UI/WB_PlayerInfo_Small.uasset
+++ b/SoloKing/Asset/UI/WB_PlayerInfo_Small.uasset
--- a/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset
--- a/SoloKing/Asset/UMGTemplate/General_CheckBoxButton.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_CheckBoxButton.uasset
--- a/SoloKing/Asset/UMGTemplate/General_GameFailure_UIBP.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_GameFailure_UIBP.uasset
--- a/SoloKing/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset
--- a/SoloKing/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset
--- a/SoloKing/Asset/UMGTemplate/General_GameVictory_UIBP.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_GameVictory_UIBP.uasset
--- a/SoloKing/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset
--- a/SoloKing/Asset/UMGTemplate/General_Ingame_RingButton.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_Ingame_RingButton.uasset
--- a/SoloKing/Asset/UMGTemplate/General_Ingame_SquareButton.uasset
+++ b/SoloKing/Asset/UMGTemplate/General_Ingame_SquareButton.uasset
--- a/Show More
+++ b/Show More