diff --git a/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset b/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset index b076a99d..c54888b5 100644 Binary files a/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset and b/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset differ diff --git a/SoloKing/Asset/Blueprint/SceneObj/Start/BP_ActorStart.uasset b/SoloKing/Asset/Blueprint/SceneObj/Start/BP_ActorStart.uasset index c9e7073c..0c7b0d4a 100644 Binary files a/SoloKing/Asset/Blueprint/SceneObj/Start/BP_ActorStart.uasset and b/SoloKing/Asset/Blueprint/SceneObj/Start/BP_ActorStart.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCGameMode.uasset b/SoloKing/Asset/Blueprint/UGCGameMode.uasset index 968abe35..5c639ec0 100644 Binary files a/SoloKing/Asset/Blueprint/UGCGameMode.uasset and b/SoloKing/Asset/Blueprint/UGCGameMode.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCGameState.uasset b/SoloKing/Asset/Blueprint/UGCGameState.uasset index 024c9c51..42307524 100644 Binary files a/SoloKing/Asset/Blueprint/UGCGameState.uasset and b/SoloKing/Asset/Blueprint/UGCGameState.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCLevelDirector.uasset b/SoloKing/Asset/Blueprint/UGCLevelDirector.uasset index 04b0165e..584600e0 100644 Binary files a/SoloKing/Asset/Blueprint/UGCLevelDirector.uasset and b/SoloKing/Asset/Blueprint/UGCLevelDirector.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCPlayerController.uasset b/SoloKing/Asset/Blueprint/UGCPlayerController.uasset index f7df21b9..8f40d9f0 100644 Binary files a/SoloKing/Asset/Blueprint/UGCPlayerController.uasset and b/SoloKing/Asset/Blueprint/UGCPlayerController.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCPlayerPawn.uasset b/SoloKing/Asset/Blueprint/UGCPlayerPawn.uasset index 62e35b0a..5418a817 100644 Binary files a/SoloKing/Asset/Blueprint/UGCPlayerPawn.uasset and b/SoloKing/Asset/Blueprint/UGCPlayerPawn.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCPlayerStartManager.uasset b/SoloKing/Asset/Blueprint/UGCPlayerStartManager.uasset index 6207c750..55bf29d9 100644 Binary files a/SoloKing/Asset/Blueprint/UGCPlayerStartManager.uasset and b/SoloKing/Asset/Blueprint/UGCPlayerStartManager.uasset differ diff --git a/SoloKing/Asset/Blueprint/UGCPlayerState.uasset b/SoloKing/Asset/Blueprint/UGCPlayerState.uasset index 59366beb..8de9fbed 100644 Binary files a/SoloKing/Asset/Blueprint/UGCPlayerState.uasset and b/SoloKing/Asset/Blueprint/UGCPlayerState.uasset differ diff --git a/SoloKing/Asset/Levels/Map_DBL.umap b/SoloKing/Asset/Levels/Map_DBL.umap index f0094e6d..b2cf5518 100644 Binary files a/SoloKing/Asset/Levels/Map_DBL.umap and b/SoloKing/Asset/Levels/Map_DBL.umap differ diff --git a/SoloKing/Asset/Levels/Map_DC.umap b/SoloKing/Asset/Levels/Map_DC.umap index 2d5ba033..05bdaf3c 100644 Binary files a/SoloKing/Asset/Levels/Map_DC.umap and b/SoloKing/Asset/Levels/Map_DC.umap differ diff --git a/SoloKing/Asset/Levels/Map_HDDJ.umap b/SoloKing/Asset/Levels/Map_HDDJ.umap index b2b8c7a0..d5bde6a8 100644 Binary files a/SoloKing/Asset/Levels/Map_HDDJ.umap and b/SoloKing/Asset/Levels/Map_HDDJ.umap differ diff --git a/SoloKing/Asset/Levels/Map_JCK.umap b/SoloKing/Asset/Levels/Map_JCK.umap index a7dea739..890b2265 100644 Binary files a/SoloKing/Asset/Levels/Map_JCK.umap and b/SoloKing/Asset/Levels/Map_JCK.umap differ diff --git a/SoloKing/Asset/Levels/Map_NewYear.umap b/SoloKing/Asset/Levels/Map_NewYear.umap index 3810bb2a..be8714af 100644 Binary files a/SoloKing/Asset/Levels/Map_NewYear.umap and b/SoloKing/Asset/Levels/Map_NewYear.umap differ diff --git a/SoloKing/Asset/Levels/Map_SCL.umap b/SoloKing/Asset/Levels/Map_SCL.umap index 408d4e91..81dc29e9 100644 Binary files a/SoloKing/Asset/Levels/Map_SCL.umap and b/SoloKing/Asset/Levels/Map_SCL.umap differ diff --git a/SoloKing/Asset/Levels/Map_SLXLC.umap b/SoloKing/Asset/Levels/Map_SLXLC.umap index 89b6f6d4..bd569a1d 100644 Binary files a/SoloKing/Asset/Levels/Map_SLXLC.umap and b/SoloKing/Asset/Levels/Map_SLXLC.umap differ diff --git a/SoloKing/Asset/Levels/Map_SMDJ.umap b/SoloKing/Asset/Levels/Map_SMDJ.umap index f2b94dbd..51f8c978 100644 Binary files a/SoloKing/Asset/Levels/Map_SMDJ.umap and b/SoloKing/Asset/Levels/Map_SMDJ.umap differ diff --git a/SoloKing/Asset/UGCLayout_BP.uasset b/SoloKing/Asset/UGCLayout_BP.uasset index 750b0596..4cfd13a7 100644 Binary files a/SoloKing/Asset/UGCLayout_BP.uasset and b/SoloKing/Asset/UGCLayout_BP.uasset differ diff --git a/SoloKing/Asset/UI/Child/WB_PlayerInfoItem.uasset b/SoloKing/Asset/UI/Child/WB_PlayerInfoItem.uasset index c96660b9..0cdb25a5 100644 Binary files a/SoloKing/Asset/UI/Child/WB_PlayerInfoItem.uasset and b/SoloKing/Asset/UI/Child/WB_PlayerInfoItem.uasset differ diff --git a/SoloKing/Asset/UI/Child/WB_PlayerInfoItem_Small.uasset b/SoloKing/Asset/UI/Child/WB_PlayerInfoItem_Small.uasset index 979f6795..b68b8292 100644 Binary files a/SoloKing/Asset/UI/Child/WB_PlayerInfoItem_Small.uasset and b/SoloKing/Asset/UI/Child/WB_PlayerInfoItem_Small.uasset differ diff --git a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset index 16f35429..224bde44 100644 Binary files a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset and b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset differ diff --git a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVS.uasset b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVS.uasset index d1050e5d..ce317024 100644 Binary files a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVS.uasset and b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVS.uasset differ diff --git a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVSPlayerInfo.uasset b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVSPlayerInfo.uasset index 90f3aa86..6cb696ab 100644 Binary files a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVSPlayerInfo.uasset and b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowVSPlayerInfo.uasset differ diff --git a/SoloKing/Asset/UI/GameEnd/WB_GameEnd.uasset b/SoloKing/Asset/UI/GameEnd/WB_GameEnd.uasset index a1e08d78..60acd414 100644 Binary files a/SoloKing/Asset/UI/GameEnd/WB_GameEnd.uasset and b/SoloKing/Asset/UI/GameEnd/WB_GameEnd.uasset differ diff --git a/SoloKing/Asset/UI/GameEnd/WB_GameEnd_PlayerInfo.uasset b/SoloKing/Asset/UI/GameEnd/WB_GameEnd_PlayerInfo.uasset index 69123b78..fad76f1d 100644 Binary files a/SoloKing/Asset/UI/GameEnd/WB_GameEnd_PlayerInfo.uasset and b/SoloKing/Asset/UI/GameEnd/WB_GameEnd_PlayerInfo.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_GameRecord.uasset b/SoloKing/Asset/UI/GameRecord/WB_GameRecord.uasset index f98acd7f..c903f4c7 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_GameRecord.uasset and b/SoloKing/Asset/UI/GameRecord/WB_GameRecord.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_Historical_Season.uasset b/SoloKing/Asset/UI/GameRecord/WB_Historical_Season.uasset index 80526e2d..0e8228f8 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_Historical_Season.uasset and b/SoloKing/Asset/UI/GameRecord/WB_Historical_Season.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_RecordItem.uasset b/SoloKing/Asset/UI/GameRecord/WB_RecordItem.uasset index 0b4ec2ae..72ddeaed 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_RecordItem.uasset and b/SoloKing/Asset/UI/GameRecord/WB_RecordItem.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_RecordType.uasset b/SoloKing/Asset/UI/GameRecord/WB_RecordType.uasset index ce70e6e7..a1761c91 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_RecordType.uasset and b/SoloKing/Asset/UI/GameRecord/WB_RecordType.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_RoundInfoItem.uasset b/SoloKing/Asset/UI/GameRecord/WB_RoundInfoItem.uasset index 56dc6c75..9810dda5 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_RoundInfoItem.uasset and b/SoloKing/Asset/UI/GameRecord/WB_RoundInfoItem.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_SortType.uasset b/SoloKing/Asset/UI/GameRecord/WB_SortType.uasset index 4c6b3f5a..e06662d9 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_SortType.uasset and b/SoloKing/Asset/UI/GameRecord/WB_SortType.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiency.uasset b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiency.uasset index 0f8f2b59..6ea9f00b 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiency.uasset and b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiency.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyPanel.uasset b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyPanel.uasset index 678b77e4..a05a22f9 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyPanel.uasset and b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyPanel.uasset differ diff --git a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyTop.uasset b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyTop.uasset index f54b63b1..81893c93 100644 Binary files a/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyTop.uasset and b/SoloKing/Asset/UI/GameRecord/WB_WeaponProficiencyTop.uasset differ diff --git a/SoloKing/Asset/UI/InTest/WB_InTest_Side.uasset b/SoloKing/Asset/UI/InTest/WB_InTest_Side.uasset index 9c37b07b..5078167e 100644 Binary files a/SoloKing/Asset/UI/InTest/WB_InTest_Side.uasset and b/SoloKing/Asset/UI/InTest/WB_InTest_Side.uasset differ diff --git a/SoloKing/Asset/UI/InTest/WB_TestButtonItem.uasset b/SoloKing/Asset/UI/InTest/WB_TestButtonItem.uasset index 77cfb481..c6dca775 100644 Binary files a/SoloKing/Asset/UI/InTest/WB_TestButtonItem.uasset and b/SoloKing/Asset/UI/InTest/WB_TestButtonItem.uasset differ diff --git a/SoloKing/Asset/UI/Round/WB_RoundEnd.uasset b/SoloKing/Asset/UI/Round/WB_RoundEnd.uasset index c783f529..071a18a4 100644 Binary files a/SoloKing/Asset/UI/Round/WB_RoundEnd.uasset and b/SoloKing/Asset/UI/Round/WB_RoundEnd.uasset differ diff --git a/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset b/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset index 4663d6a6..05622352 100644 Binary files a/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset and b/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset differ diff --git a/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset b/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset index 9c6d6765..c6fcf159 100644 Binary files a/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset and b/SoloKing/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset differ diff --git a/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset b/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset index a810ca84..8823e7cb 100644 Binary files a/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset and b/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset differ diff --git a/SoloKing/Asset/UI/SelectGameMode/WB_SelectGameMode.uasset b/SoloKing/Asset/UI/SelectGameMode/WB_SelectGameMode.uasset index f95025f7..5c01dac7 100644 Binary files a/SoloKing/Asset/UI/SelectGameMode/WB_SelectGameMode.uasset and b/SoloKing/Asset/UI/SelectGameMode/WB_SelectGameMode.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Item.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Item.uasset index 59aa6def..fbe2de42 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Item.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Item.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_ItemHadSelect.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_ItemHadSelect.uasset index a79194ce..0b9071b5 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_ItemHadSelect.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_ItemHadSelect.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Type.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Type.uasset index faed5d25..61140f02 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Type.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_AllWeapon_Type.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponDefenceItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponDefenceItem.uasset index a66a668a..e41e568f 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponDefenceItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponDefenceItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItem.uasset index fb8270ca..754373a0 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItems.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItems.uasset index 2cac16f6..33fca2b8 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItems.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponItems.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponOtherItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponOtherItem.uasset index a53405e5..401c7d46 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponOtherItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponOtherItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponPartItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponPartItem.uasset index b9e33e11..6c029c26 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponPartItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_SelectWeaponPartItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Child/WB_Spectator_SelectWeaponItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Child/WB_Spectator_SelectWeaponItem.uasset index 6057ed74..65e3c83e 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Child/WB_Spectator_SelectWeaponItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Child/WB_Spectator_SelectWeaponItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Item/WB_OtherPartItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Item/WB_OtherPartItem.uasset index 6260ee41..6de6e98a 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Item/WB_OtherPartItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Item/WB_OtherPartItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponItem.uasset index 843f3a74..017f24d7 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponPartItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponPartItem.uasset index 52203d60..fa15aa7f 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponPartItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponPartItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponSelectItem.uasset b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponSelectItem.uasset index 3c514214..fb7116fa 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponSelectItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/Item/WB_WeaponSelectItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset index b2fb7e0d..601429ef 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset index 3eaf59a9..7fb20037 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset and b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponPartItem.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponPartItem.uasset index 5b3f8fd0..f58cc114 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponPartItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponPartItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset index 2d1f6c63..c3b389ad 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset and b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_Disables.uasset b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_Disables.uasset index d6cd542e..344cd02c 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_Disables.uasset and b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_Disables.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_SelectDisableChild.uasset b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_SelectDisableChild.uasset index 4bd64dfe..c4338690 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_SelectDisableChild.uasset and b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_SelectDisableChild.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_ShowDisable.uasset b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_ShowDisable.uasset index 1056880a..b02b91fa 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_ShowDisable.uasset and b/SoloKing/Asset/UI/SelectWeapons/SelectDisableChild/WB_ShowDisable.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon.uasset index f6c45b8a..8fcee9b9 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon_New.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon_New.uasset index 5dc2bf67..7ae54eb1 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon_New.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_CustomWeapon_New.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_ReselectWeaponBtn.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_ReselectWeaponBtn.uasset index 0aa16171..a288e531 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_ReselectWeaponBtn.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_ReselectWeaponBtn.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_SelectAllWeapon.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_SelectAllWeapon.uasset index 831b22e6..441cc054 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_SelectAllWeapon.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_SelectAllWeapon.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_SelectWeapons.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_SelectWeapons.uasset index 562b9ad7..62f7695d 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_SelectWeapons.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_SelectWeapons.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_SpectatorSelectWeapon.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_SpectatorSelectWeapon.uasset index 9ae10c1f..dc6aa7a8 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_SpectatorSelectWeapon.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_SpectatorSelectWeapon.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WB_WeaponSelect_New.uasset b/SoloKing/Asset/UI/SelectWeapons/WB_WeaponSelect_New.uasset index 979fc182..609496ae 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WB_WeaponSelect_New.uasset and b/SoloKing/Asset/UI/SelectWeapons/WB_WeaponSelect_New.uasset differ diff --git a/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset b/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset index 91eab2e3..fb9ff4b9 100644 Binary files a/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset and b/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset differ diff --git a/SoloKing/Asset/UI/Tip/WB_TipSlidingTackle.uasset b/SoloKing/Asset/UI/Tip/WB_TipSlidingTackle.uasset index 7b30838c..34407e36 100644 Binary files a/SoloKing/Asset/UI/Tip/WB_TipSlidingTackle.uasset and b/SoloKing/Asset/UI/Tip/WB_TipSlidingTackle.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Child/WB_RankItem.uasset b/SoloKing/Asset/UI/Tool/Child/WB_RankItem.uasset index b3dd9238..c851573f 100644 Binary files a/SoloKing/Asset/UI/Tool/Child/WB_RankItem.uasset and b/SoloKing/Asset/UI/Tool/Child/WB_RankItem.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset b/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset index 59adb8bc..0887e6e1 100644 Binary files a/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset and b/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset b/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset index ca2a133f..8e5d14aa 100644 Binary files a/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset and b/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Title/WB_Title1_2.uasset b/SoloKing/Asset/UI/Tool/Title/WB_Title1_2.uasset index c4eef39b..81efdb90 100644 Binary files a/SoloKing/Asset/UI/Tool/Title/WB_Title1_2.uasset and b/SoloKing/Asset/UI/Tool/Title/WB_Title1_2.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Title/WB_Title2.uasset b/SoloKing/Asset/UI/Tool/Title/WB_Title2.uasset index f62edbac..074d1ee2 100644 Binary files a/SoloKing/Asset/UI/Tool/Title/WB_Title2.uasset and b/SoloKing/Asset/UI/Tool/Title/WB_Title2.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Title/WB_Title2_2.uasset b/SoloKing/Asset/UI/Tool/Title/WB_Title2_2.uasset index cfa52df0..301fcde2 100644 Binary files a/SoloKing/Asset/UI/Tool/Title/WB_Title2_2.uasset and b/SoloKing/Asset/UI/Tool/Title/WB_Title2_2.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_CountDownButton.uasset b/SoloKing/Asset/UI/Tool/WB_CountDownButton.uasset index 02fd0cdd..782f8de5 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_CountDownButton.uasset and b/SoloKing/Asset/UI/Tool/WB_CountDownButton.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset b/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset index 2b945640..49d607a8 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset and b/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_FaceNotice.uasset b/SoloKing/Asset/UI/Tool/WB_FaceNotice.uasset index 92d8a8bd..5d39c4f1 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_FaceNotice.uasset and b/SoloKing/Asset/UI/Tool/WB_FaceNotice.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_PID.uasset b/SoloKing/Asset/UI/Tool/WB_PID.uasset index dae84c88..3cbaf1e7 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_PID.uasset and b/SoloKing/Asset/UI/Tool/WB_PID.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_Rank.uasset b/SoloKing/Asset/UI/Tool/WB_Rank.uasset index 5abc99ff..44a0b1a3 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_Rank.uasset and b/SoloKing/Asset/UI/Tool/WB_Rank.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset b/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset index e205ff06..edf7e642 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset and b/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset b/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset index b06b37a5..de8e2794 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset and b/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_SelectPartButton.uasset b/SoloKing/Asset/UI/Tool/WB_SelectPartButton.uasset index 2726ba7a..771cec06 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_SelectPartButton.uasset and b/SoloKing/Asset/UI/Tool/WB_SelectPartButton.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_SelectPartItem.uasset b/SoloKing/Asset/UI/Tool/WB_SelectPartItem.uasset index 93cb4f71..b0609b07 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_SelectPartItem.uasset and b/SoloKing/Asset/UI/Tool/WB_SelectPartItem.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset b/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset index 2835e554..9b3459d2 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset and b/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_SettingButton.uasset b/SoloKing/Asset/UI/Tool/WB_SettingButton.uasset index cf449a81..43387b9f 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_SettingButton.uasset and b/SoloKing/Asset/UI/Tool/WB_SettingButton.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_ShovelButton.uasset b/SoloKing/Asset/UI/Tool/WB_ShovelButton.uasset index 97dac33a..b5df8b47 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_ShovelButton.uasset and b/SoloKing/Asset/UI/Tool/WB_ShovelButton.uasset differ diff --git a/SoloKing/Asset/UI/WB_Main.uasset b/SoloKing/Asset/UI/WB_Main.uasset index da02fd66..5155bfd8 100644 Binary files a/SoloKing/Asset/UI/WB_Main.uasset and b/SoloKing/Asset/UI/WB_Main.uasset differ diff --git a/SoloKing/Asset/UI/WB_PlayerInfo.uasset b/SoloKing/Asset/UI/WB_PlayerInfo.uasset index 6639a41b..c2c6409e 100644 Binary files a/SoloKing/Asset/UI/WB_PlayerInfo.uasset and b/SoloKing/Asset/UI/WB_PlayerInfo.uasset differ diff --git a/SoloKing/Asset/UI/WB_PlayerInfo_Small.uasset b/SoloKing/Asset/UI/WB_PlayerInfo_Small.uasset index d21f0afd..dc9e026c 100644 Binary files a/SoloKing/Asset/UI/WB_PlayerInfo_Small.uasset and b/SoloKing/Asset/UI/WB_PlayerInfo_Small.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset index 48b5ad62..a13c8992 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_CheckBoxButton.uasset b/SoloKing/Asset/UMGTemplate/General_CheckBoxButton.uasset index 557f6c5a..db3e97fb 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_CheckBoxButton.uasset and b/SoloKing/Asset/UMGTemplate/General_CheckBoxButton.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_GameFailure_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_GameFailure_UIBP.uasset index 08acabf6..f88b254a 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_GameFailure_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_GameFailure_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset index eb5cd818..07f24ed5 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset index 350b8b27..c8838698 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_GameVictory_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_GameVictory_UIBP.uasset index ee1a29cd..012d20a1 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_GameVictory_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_GameVictory_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset b/SoloKing/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset index 15488216..ac2fdae5 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset and b/SoloKing/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Ingame_RingButton.uasset b/SoloKing/Asset/UMGTemplate/General_Ingame_RingButton.uasset index de5b1e89..e81b19b8 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Ingame_RingButton.uasset and b/SoloKing/Asset/UMGTemplate/General_Ingame_RingButton.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Ingame_SquareButton.uasset b/SoloKing/Asset/UMGTemplate/General_Ingame_SquareButton.uasset index 80b84e80..9852442e 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Ingame_SquareButton.uasset and b/SoloKing/Asset/UMGTemplate/General_Ingame_SquareButton.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset index 16548c6f..049603a3 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset index e985611d..d7ae3903 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset index 9aa5aed3..ef5feea1 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_1.uasset b/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_1.uasset index 7060f8bf..304bff7e 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_1.uasset and b/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_1.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_2.uasset b/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_2.uasset index 7ecc9130..d08dd736 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_2.uasset and b/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_2.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_3.uasset b/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_3.uasset index b9030d28..06c06c84 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_3.uasset and b/SoloKing/Asset/UMGTemplate/General_SecondLevelButton_3.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset index f4c16ed4..25fba6aa 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset index 40b825bd..ed0e207c 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset index 9a66b09f..175a4df7 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset index d9779567..f8ff7175 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset index 3daf0f16..b69dde07 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_SlideModeButton.uasset b/SoloKing/Asset/UMGTemplate/General_SlideModeButton.uasset index 2ae49dee..f6bdaee8 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_SlideModeButton.uasset and b/SoloKing/Asset/UMGTemplate/General_SlideModeButton.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_SwitchButton.uasset b/SoloKing/Asset/UMGTemplate/General_SwitchButton.uasset index 14765021..bc33e258 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_SwitchButton.uasset and b/SoloKing/Asset/UMGTemplate/General_SwitchButton.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset index b3b9d149..7159dfd9 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset index 20dd7598..7e67ee6f 100644 Binary files a/SoloKing/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset index c77aab3c..9e51f56c 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset index ba118593..37ced48e 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset index 7bb632fc..ffa0bb90 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset index 4e22e412..a8aa9f24 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset index cda35178..5713a599 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset index ab963e41..52f43464 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset index ce1f5f2e..382fa493 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset index ae58a2a1..bec06564 100644 Binary files a/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/ReuseList2.uasset b/SoloKing/Asset/UMGTemplate/ReuseList2.uasset index 09f5cce3..92c0a7ce 100644 Binary files a/SoloKing/Asset/UMGTemplate/ReuseList2.uasset and b/SoloKing/Asset/UMGTemplate/ReuseList2.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset index 4191ffc2..36a757ff 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset index 9e4e62e7..e735c1ee 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset index 2a4ae98a..55a06766 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset index 6e13fe7b..1126b288 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset index ffb42c6e..8a54ae50 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset index 6b7f9e99..26a0a2c2 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset index 45642f7d..ac03f441 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset b/SoloKing/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset index e29317ef..601bb7bd 100644 Binary files a/SoloKing/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset and b/SoloKing/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/UGC_DragDropTextBox.uasset b/SoloKing/Asset/UMGTemplate/UGC_DragDropTextBox.uasset index 993c510f..5ce1d5f9 100644 Binary files a/SoloKing/Asset/UMGTemplate/UGC_DragDropTextBox.uasset and b/SoloKing/Asset/UMGTemplate/UGC_DragDropTextBox.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Medium_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Medium_UIBP.uasset index bb202d34..0fa34d17 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Medium_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Medium_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Small_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Small_UIBP.uasset index 5d665d25..ba6eaf1e 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Small_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/Common/UIBP/Common_PopupsBg_Small_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_ButTab_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_ButTab_UIBP.uasset index 4e0ec921..bec6392e 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_ButTab_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_ButTab_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Explanation_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Explanation_UIBP.uasset index 3f5af787..cabe69b0 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Explanation_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Explanation_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Get_FX_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Get_FX_UIBP.uasset index b70b6565..452fa263 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Get_FX_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Get_FX_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Item_Style1_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Item_Style1_UIBP.uasset index 6acc86fc..e671d92a 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Item_Style1_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Item_Style1_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_PopupsBG_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_PopupsBG_UIBP.uasset index c3108c0e..9926d992 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_PopupsBG_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_PopupsBG_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Tips_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Tips_UIBP.uasset index 279aadd2..6241a9da 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Tips_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/Item/UGC_RankingList_Tips_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_But_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_But_UIBP.uasset index 47d5666a..9005ebc6 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_But_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_But_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_IngameBut_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_IngameBut_UIBP.uasset index 271b7e52..64409772 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_IngameBut_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_IngameBut_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_ItemGet_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_ItemGet_UIBP.uasset index 23db18c5..5b792575 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_ItemGet_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_ItemGet_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Main_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Main_UIBP.uasset index d103e7f0..a9f3e132 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Main_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Main_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Set_Popup_UIBP.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Set_Popup_UIBP.uasset index 39c631c0..fac8f16e 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Set_Popup_UIBP.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Arts_UI/UIBP/UGC_RankingList_Set_Popup_UIBP.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/BP_Placeholder.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/BP_Placeholder.uasset index c7ad77bc..51b54881 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/BP_Placeholder.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/BP_Placeholder.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListActor.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListActor.uasset index 6c2ee634..fcf36455 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListActor.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListActor.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListComponent.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListComponent.uasset index 72691111..57eae669 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListComponent.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/RankingListComponent.uasset differ diff --git a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/WBP_RankingListBtn.uasset b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/WBP_RankingListBtn.uasset index 0ad97189..eefe0340 100644 Binary files a/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/WBP_RankingListBtn.uasset and b/SoloKing/ExtendResource/RankingList/OfficialPackage/Asset/RankingList/Blueprint/WBP_RankingListBtn.uasset differ diff --git a/SoloKing/Script/Blueprint/UGCGameState.lua b/SoloKing/Script/Blueprint/UGCGameState.lua index eb66c421..aa9d477f 100644 --- a/SoloKing/Script/Blueprint/UGCGameState.lua +++ b/SoloKing/Script/Blueprint/UGCGameState.lua @@ -27,6 +27,9 @@ function UGCGameState:ReceiveBeginPlay() if GlobalBeginTool then GlobalBeginTool:ReceiveBeginPlay(); end table.func(MiniManager, "Init", self); + if DefaultSettings.EnableTest then + table.print_G(); + end end function UGCGameState:ReceiveTick(DeltaTime) @@ -274,7 +277,6 @@ function UGCGameState:OnGameEnded() WidgetManager:DestroyPanel(WidgetConfig.EUIType.AllWeapon); WidgetManager:DestroyPanel(WidgetConfig.EUIType.AllWeapon_Spectator); WidgetManager:DestroyPanel(WidgetConfig.EUIType.CustomSelectWeapon); - --WidgetManager:DestroyPanel(WidgetConfig.EUIType.ShowCustomSelectWeaponBtn); WidgetManager:DestroyPanel(WidgetConfig.EUIType.ShowPK); WidgetManager:DestroyPanel(WidgetConfig.EUIType.ShowRankInheritance); end diff --git a/SoloKing/Script/Blueprint/UGCPlayerController.lua b/SoloKing/Script/Blueprint/UGCPlayerController.lua index 41678a58..b39af52c 100644 --- a/SoloKing/Script/Blueprint/UGCPlayerController.lua +++ b/SoloKing/Script/Blueprint/UGCPlayerController.lua @@ -21,7 +21,7 @@ function UGCPlayerController:ReceiveBeginPlay() if not DefaultSettings.EnableAutoPickUp then UITool.HidePickUpPanel(); end UGCEventSystem.SetTimer(self, function() WidgetManager:ShowPanel(WidgetConfig.EUIType.Main, false); - + local MiniState = GameState.MiniInfo.State UGCLogSystem.Log("[UGCPlayerController:ReceiveBeginPlay] 执行 MiniState = %s", tostring(MiniState)); if MiniState ~= nil and MiniState <= MiniGameState.ROUND_PREPARE then @@ -46,9 +46,9 @@ function UGCPlayerController:ReceiveBeginPlay() end end, 1); end - + UGCEventSystem.AddListener(EventTypes.ClientAlready, self.OnClientAlready, self); - + -- 添加玩家死亡复活回调 self.OnCharacterDeadDelegate:Add(self.OnCharacterDeath, self) self.PlayerControllerRespawnedDelegate:AddInstance(self.OnRespawnPawn, self) @@ -79,10 +79,10 @@ function UGCPlayerController:OnRespawnPawn() UGCLogSystem.Log("[UGCPlayerController:OnRespawnPawn] 执行") if IsServer then Pawn:AddInitItems(); - + -- 检测当前有多少人 local Pawns = UGCGameSystem.GetAllPlayerPawn() - + --- 所有玩家重置成功 local PlayerCount = table.getCount(Pawns) if PlayerCount > 1 then @@ -95,7 +95,7 @@ function UGCPlayerController:OnRespawnPawn() table.insert(OBKeys, PC.PlayerKey); end end - + UGCLogSystem.LogTree(string.format("[UGCPlayerController:OnRespawnPawn] OBKeys ="), OBKeys) if not table.isEmpty(OBKeys) then UGCGameSystem.ChangeAllowOBPlayerKeys(self, OBKeys); @@ -106,7 +106,6 @@ function UGCPlayerController:OnRespawnPawn() else if GlobalMiniMode.ModeType ~= GameModeConfig.EGameModeType.DefaultMode then UGCLogSystem.Log("[UGCPlayerController:OnRespawnPawn] 显示按钮") - --WidgetManager:ShowPanel(WidgetConfig.EUIType.ShowCustomSelectWeaponBtn, false); WidgetManager:GetPanel(WidgetConfig.EUIType.Main, function(Widget) table.func(Widget, "ShowCustomSelectWeaponBtn", true); end) @@ -140,7 +139,7 @@ function UGCPlayerController:EnterSpectate(IsEnterSpectate) table.insert(OBKeys, PC.PlayerKey); end end - + if table.isEmpty(OBKeys) then return ; end UGCGameSystem.ChangeAllowOBPlayerKeys(self, OBKeys); UGCGameSystem.EnterSpectating(self); @@ -156,7 +155,7 @@ end function UGCPlayerController:SetEnableShovel(IsEnable) UGCLogSystem.Log("[UGCPlayerController:SetEnableShovel] 执行 IsEnable = %s", tostring(IsEnable)); if self.PlayerEnableShovel == IsEnable then return ; end - + self.PlayerEnableShovel = IsEnable; local PS = UGCGameSystem.GetPlayerStateByPlayerKey(self.PlayerKey) PS:SetEnableShovel(self.PlayerEnableShovel); @@ -302,18 +301,18 @@ function UGCPlayerController:SendArchive(Index, Total, Archive, Friend) if ArchiveTable[self.PlayerKey] == nil then ArchiveTable[self.PlayerKey] = {}; end if ArchiveTable[self.PlayerKey].Last10Games == nil then ArchiveTable[self.PlayerKey].Last10Games = {}; end ArchiveTable[self.PlayerKey].Last10Games[Index] = Archive; - + WidgetManager:GetPanel(WidgetConfig.EUIType.GameRecord, function(Widget) Widget:AddLastGameItem(Index, Archive, Friend); end) - + self:CloseLastGameTimer(); UGCEventSystem.SetTimer(self, function() -- 验证是否完全，不完全发送数据 local Success, List = self:CheckArchiveDataComplete(Total); if not Success then self:ResendArchive(List); end end, 3); - + -- 判断是否完整 if self:CheckArchiveDataComplete(Total) then -- 数据完整 @@ -343,7 +342,7 @@ UGCPlayerController.OneSendWeaponCount = 10; function UGCPlayerController:SendSelectWeapons() if table.isEmpty(ArchiveTable[self.PlayerKey]) then return end if table.isEmpty(ArchiveTable[self.PlayerKey].SelectWeapons) then return end - + UGCEventSystem.SetTimer(self, function() self.SendSelectWeaponsTimer = UGCEventSystem.SetTimerLoop(self, function() self:SendWeapons(); @@ -370,7 +369,7 @@ function UGCPlayerController:SendWeapons(Total, InList) Num = Num + 1; if Num > self.OneSendWeaponCount then break ; end end - + for WeaponId, v in pairs(InList) do self.SelectWeapons[WeaponId] = nil; end @@ -403,4 +402,69 @@ function UGCPlayerController:SendWeapons(Total, InList) end end +--- 一次发送武器配件数量的rpc有多少个 +UGCPlayerController.OneSendWeaponPartsCount = 20; +UGCPlayerController.SendPartsTimer = nil; +--- 正在发送的 IDs +UGCPlayerController.InSendWeaponIds = {}; + +-- 发送武器配件信息 +function UGCPlayerController:SendWeaponParts(InList) + if table.isEmpty(ArchiveTable[self.PlayerKey]) then return; end + local Weapons = ArchiveTable[self.PlayerKey].Weapons; + if table.isEmpty(Weapons) then return; end + if table.isEmpty(self.InSendWeaponIds) then self.InSendWeaponIds = {}; end + if table.isEmpty(InList) then + for WeaponID, Parts in pairs(Weapons) do + table.insert(self.InSendWeaponIds, WeaponID); + end + else + for i, v in pairs(InList) do + if i > 10000 then + table.insert(self.InSendWeaponIds, i); + else + table.insert(self.InSendWeaponIds, v); + end + end + end + self.SendPartsTimer = UGCEventSystem.SetTimerLoop(self, function() + self:SendPartsRPC(); + end, 0.5) +end + +UGCPlayerController.SendPartsTimer = nil; + +function UGCPlayerController:SendPartsRPC(InTotal, InList) + if IsServer then + -- 开始发送 + local Weapons = ArchiveTable[self.PlayerKey].Weapons; + local Count = table.getCount(self.InSendWeaponIds); + local SendTable = {}; + if Count <= self.OneSendWeaponPartsCount then + for i, WeaponID in pairs(self.InSendWeaponIds) do + SendTable[WeaponID] = Weapons[WeaponID] or {}; + end + self.InSendWeaponIds = {}; + UGCEventSystem.StopTimer(self.SendPartsTimer); + else + for i = 1, self.OneSendWeaponPartsCount do + local WeaponID = self.InSendWeaponIds[1]; + SendTable[WeaponID] = Weapons[WeaponID] or {}; + table.remove(self.InSendWeaponIds, 1); + end + end + UnrealNetwork.CallUnrealRPC(self, self, "SendPartsRPC", InTotal or table.getCount(SendTable), SendTable); + else + if table.isEmpty(ArchiveTable[self.PlayerKey]) then ArchiveTable[self.PlayerKey] = {}; end + if table.isEmpty(ArchiveTable[self.PlayerKey].Weapons) then ArchiveTable[self.PlayerKey].Weapons = {}; end + for WeaponID, Parts in pairs(InList) do + ArchiveTable[self.PlayerKey].Weapons[WeaponID] = Parts; + end + -- 查看是否完全了 + if table.getCount(ArchiveTable[self.PlayerKey].Weapons) == InTotal then + -- 说明对了 + end + end +end + return UGCPlayerController; \ No newline at end of file diff --git a/SoloKing/Script/GameAttribute/game_attribute_type.lua b/SoloKing/Script/GameAttribute/game_attribute_type.lua new file mode 100644 index 00000000..095f0d90 --- /dev/null +++ b/SoloKing/Script/GameAttribute/game_attribute_type.lua @@ -0,0 +1,91 @@ + +-- auto exported game_attributes +-- including native attributes and custom attributes + + +---@enum UGCNativeGameAttributeType +UGCNativeGameAttributeType = { + --Character [血量-Health], + Character_Health = 'Health', + --Character [最大血量-HealthMax], + Character_HealthMax = 'HealthMax', + --Character [技能急速-SkillCDRecoverRate], + Character_SkillCDRecoverRate = 'SkillCDRecoverRate', + --Character [无描述-SignalHP], + Character_SignalHP = 'SignalHP', + --Character [当前能量值-EnergyCurrent], + Character_EnergyCurrent = 'Energy|EnergyCurrent', + --Character [UGC移动速度倍率-UGCGeneralMoveSpeedScale], + Character_UGCGeneralMoveSpeedScale = 'UGCGeneralMoveSpeedScale', + +--------------------------------------------------------- + + --Weapon [换弹时间影响因子-ReloadTimeFactorWrapper], + Weapon_ReloadTimeFactorWrapper = 'ReloadTimeFactorWrapper', + --Weapon [切枪时间影响因子-SwitchTimeFactorWrapper], + Weapon_SwitchTimeFactorWrapper = 'SwitchTimeFactorWrapper', + --Weapon [攻击间隔影响因子-ShootIntervalFactorWrapper], + Weapon_ShootIntervalFactorWrapper = 'ShootIntervalFactorWrapper', + --Weapon [后坐力影响因子-RecoilFactorWrapper], + Weapon_RecoilFactorWrapper = 'RecoilFactorWrapper', + --Weapon [散布影响因子-DeviationFactorWrapper], + Weapon_DeviationFactorWrapper = 'DeviationFactorWrapper', + --Weapon [子弹基础伤害-BaseImpactDamageWrapper], + Weapon_BaseImpactDamageWrapper = 'BaseImpactDamageWrapper', + --Weapon [子弹基础伤害-MinimumImpactDamageWrapper], + Weapon_MinimumImpactDamageWrapper = 'MinimumImpactDamageWrapper', + --Weapon [子弹飞行速度-BulletFireSpeedWrapper], + Weapon_BulletFireSpeedWrapper = 'BulletFireSpeedWrapper', + --Weapon [最大射程-BulletRangeWrapper], + Weapon_BulletRangeWrapper = 'BulletRangeWrapper', + --Weapon [一次拉栓子弹装填数量-MaxBulletNumInBarrelWrapper], + Weapon_MaxBulletNumInBarrelWrapper = 'MaxBulletNumInBarrelWrapper', + --Weapon [弹匣容量-MaxBulletNumInOneClipWrapper], + Weapon_MaxBulletNumInOneClipWrapper = 'MaxBulletNumInOneClipWrapper', + --Weapon [全自动射击间隔-AutoShootIntervalWrapper], + Weapon_AutoShootIntervalWrapper = 'AutoShootIntervalWrapper', + --Weapon [连发射击间隔-BurstShootCDWrapper], + Weapon_BurstShootCDWrapper = 'BurstShootCDWrapper', + --Weapon [连发数量-BurstShootBulletsNumWrapper], + Weapon_BurstShootBulletsNumWrapper = 'BurstShootBulletsNumWrapper', + --Weapon [连发子弹间隔-BurstShootIntervalWrapper], + Weapon_BurstShootIntervalWrapper = 'BurstShootIntervalWrapper', +}; + +UGCNativeGameAttributeTypeCommentMap = { + +--------------------------------------------------------- + + ['Health'] = 'Character [血量-Health]', + ['HealthMax'] = 'Character [最大血量-HealthMax]', + ['SkillCDRecoverRate'] = 'Character [技能急速-SkillCDRecoverRate]', + ['SignalHP'] = 'Character [无描述-SignalHP]', + ['Energy|EnergyCurrent'] = 'Character [当前能量值-EnergyCurrent]', + ['UGCGeneralMoveSpeedScale'] = 'Character [UGC移动速度倍率-UGCGeneralMoveSpeedScale]', + +--------------------------------------------------------- + + ['ReloadTimeFactorWrapper'] = 'Weapon [换弹时间影响因子-ReloadTimeFactorWrapper]', + ['SwitchTimeFactorWrapper'] = 'Weapon [切枪时间影响因子-SwitchTimeFactorWrapper]', + ['ShootIntervalFactorWrapper'] = 'Weapon [攻击间隔影响因子-ShootIntervalFactorWrapper]', + ['RecoilFactorWrapper'] = 'Weapon [后坐力影响因子-RecoilFactorWrapper]', + ['DeviationFactorWrapper'] = 'Weapon [散布影响因子-DeviationFactorWrapper]', + ['BaseImpactDamageWrapper'] = 'Weapon [子弹基础伤害-BaseImpactDamageWrapper]', + ['MinimumImpactDamageWrapper'] = 'Weapon [子弹基础伤害-MinimumImpactDamageWrapper]', + ['BulletFireSpeedWrapper'] = 'Weapon [子弹飞行速度-BulletFireSpeedWrapper]', + ['BulletRangeWrapper'] = 'Weapon [最大射程-BulletRangeWrapper]', + ['MaxBulletNumInBarrelWrapper'] = 'Weapon [一次拉栓子弹装填数量-MaxBulletNumInBarrelWrapper]', + ['MaxBulletNumInOneClipWrapper'] = 'Weapon [弹匣容量-MaxBulletNumInOneClipWrapper]', + ['AutoShootIntervalWrapper'] = 'Weapon [全自动射击间隔-AutoShootIntervalWrapper]', + ['BurstShootCDWrapper'] = 'Weapon [连发射击间隔-BurstShootCDWrapper]', + ['BurstShootBulletsNumWrapper'] = 'Weapon [连发数量-BurstShootBulletsNumWrapper]', + ['BurstShootIntervalWrapper'] = 'Weapon [连发子弹间隔-BurstShootIntervalWrapper]', +}; + +---@enum UGCCustomGameAttributeType +UGCCustomGameAttributeType = { +}; + +UGCCustomGameAttributeTypeCommentMap = { +}; + diff --git a/SoloKing/Script/Global/Draw/DrawManager.lua b/SoloKing/Script/Global/Draw/DrawManager.lua new file mode 100644 index 00000000..2afabb18 --- /dev/null +++ b/SoloKing/Script/Global/Draw/DrawManager.lua @@ -0,0 +1,13 @@ +--- +---抽奖管理器 +--- +DrawManager = {}; + +--- 初始化抽奖 +function DrawManager:Init() + +end + +function DrawManager:Load() + UGCCommoditySystem.BuyUGCCommodity() +end \ No newline at end of file diff --git a/SoloKing/Script/Global/Mini/MiniGameConfig.lua b/SoloKing/Script/Global/Mini/MiniGameConfig.lua index c212b7d2..b2cde4ee 100644 --- a/SoloKing/Script/Global/Mini/MiniGameConfig.lua +++ b/SoloKing/Script/Global/Mini/MiniGameConfig.lua @@ -48,12 +48,12 @@ MiniGameConfig = MiniGameConfig or { MapName = { ['Map_SLXLC'] = 1, ['Map_SMDJ'] = 1, - ['Map_HDDJ'] = 1, - ['Map_JCK'] = 1, - ['Map_DBL'] = 1, - ['Map_SCL'] = 1, - ['Map_NewYear'] = 2, - ['Map_DC'] = 2, + ['Map_HDDJ'] = 2, + ['Map_JCK'] = 2, + ['Map_DBL'] = 2, + ['Map_SCL'] = 2, + --['Map_NewYear'] = 2, + --['Map_DC'] = 2, }, ShowName = "单挑王", -- 显示名称 }, diff --git a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua index 097c958d..2b8bd8bf 100644 --- a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua +++ b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua @@ -941,13 +941,8 @@ function Mini_Solo:OnPostPlayerRank(PlayerKey, IsWin) UGCLogSystem.Log("[Mini_Solo:OnPostPlayerRank] Player:%s 积分：%s 技术分：%s", UE.GetPlayerName(PlayerKey), tostring(ArchiveTable[PlayerKey].Score), tostring(ArchiveTable[PlayerKey].Score)); end -Mini_Solo.bIsFormalMode = nil; - function Mini_Solo:IsFormalMode() - if self.bIsFormalMode == nil then - self.bIsFormalMode = self.ModeType == GameModeConfig.EGameModeType.DefaultMode and table.getCount(UE.GetAccountInfo()) > 1; - end - return self.bIsFormalMode; + return self.ModeType == GameModeConfig.EGameModeType.DefaultMode and table.getCount(UE.GetAccountInfo()) > 1 end --- 小游戏结束 @@ -1166,7 +1161,6 @@ function Mini_Solo:OnPlayerRespawn(InPlayerKey) else if InPlayerKey == LocalPlayerKey then if self.ModeType ~= GameModeConfig.EGameModeType.DefaultMode then - --WidgetManager:ShowPanel(WidgetConfig.EUIType.ShowCustomSelectWeaponBtn, false); WidgetManager:GetPanel(WidgetConfig.EUIType.Main, function(Widget) table.func(Widget, "ShowCustomSelectWeaponBtn", true); end); @@ -1993,17 +1987,18 @@ function Mini_Solo:SelectMode(InPlayerKey, InModeType) -- 检查是否跟玩家数量不一样 if #self.PlayerSelectModes == table.getCount(UGCGameSystem.GetAllPlayerController(false)) then if self.PlayerSelectModes[1] == self.PlayerSelectModes[2] and self.PlayerSelectModes[1] ~= GameModeConfig.EGameModeType.DefaultMode then + UGCLogSystem.Log("[Mini_Solo:SelectMode] 同步 Mode") self.ModeType = self.PlayerSelectModes[1]; self:DOREPONCE("ModeType"); self:ResetMiniGameTimes(); - + -- 拿到之前的武器，并赋值 for i, PC in pairs(UGCGameSystem.GetAllPlayerController(false)) do if ArchiveTable[PC.PlayerKey].LastWeapon then self.CurrWeaponItem[PC.PlayerKey] = ArchiveTable[PC.PlayerKey].LastWeapon; end end - + if self.CurrTimeCount ~= nil and self.CurrTimeCount > self.SelectMapTime then UGCLogSystem.Log("[Mini_Solo:SelectMode] self.CurrTimeCount = %s", tostring(self.CurrTimeCount)); MiniManager:UpdateInternalCount(GameStateTimes.GangUp.SelectMapTime); @@ -2031,6 +2026,9 @@ end Mini_Solo.PlayerSelectedWeapons = {}; function Mini_Solo:PlayerSelectWeapon(PlayerKey, WeaponID) + --if self. then + -- + --end -- 给玩家添加上去 self.CurrWeaponItem[PlayerKey] = WeaponID; if self.PlayerSelectedWeapons[PlayerKey] == nil then self.PlayerSelectedWeapons[PlayerKey] = {}; end @@ -2042,6 +2040,10 @@ function Mini_Solo:PlayerSelectWeapon(PlayerKey, WeaponID) ArchiveTable[PlayerKey].LastWeapon = WeaponID; end +function Mini_Solo:PlayerSelectWeapons(PlayerKey, Weapons, Parts) + +end + Mini_Solo.AlreadyPlayers = {}; function Mini_Solo:OnPlayerAlready(PlayerKey) diff --git a/SoloKing/Script/Global/Tool/TableTool.lua b/SoloKing/Script/Global/Tool/TableTool.lua index 105fc68b..69114fe6 100644 --- a/SoloKing/Script/Global/Tool/TableTool.lua +++ b/SoloKing/Script/Global/Tool/TableTool.lua @@ -101,7 +101,7 @@ end function table.addTableNum(t, k, v, l) t[k] = t[k] == nil and v or t[k] + v; if l == nil then return t[k]; end - + if v < 0 then if t[k] < l then t[k] = l; end else @@ -331,7 +331,7 @@ end -- 输出打印table表 函数 function table.printTable(...) local args = { ... } - + local function table2String(temp, stack, t, depth) stack:push(t) if type(depth) == "number" then @@ -362,14 +362,14 @@ function table.printTable(...) end stack:pop() end - + for k, v in pairs(args) do local root = v if type(root) == "table" then local temp = { "------------------------ printTable start ------------------------\n", "local tableValue" .. " = {\n" } local stack = newStack() - + table2String(temp, stack, root) table.insert(temp, "}\n------------------------- printTable end -------------------------") logPrint(table.concat(temp)) @@ -378,4 +378,14 @@ function table.printTable(...) "\n------------------------ printString end -------------------------") end end +end + +function table.print_G() + for i, v in pairs(_G) do + if string.find(i, "Lobby") ~= 0 then + if type(v) == 'table' then + UGCLogSystem.LogTree(string.format("[WB_GameEnd:LuaInit] _G.%s = ", i), v); + end + end + end end \ No newline at end of file diff --git a/SoloKing/Script/Global/WidgetManager/WidgetConfig.lua b/SoloKing/Script/Global/WidgetManager/WidgetConfig.lua index c87b6ce0..330e9528 100644 --- a/SoloKing/Script/Global/WidgetManager/WidgetConfig.lua +++ b/SoloKing/Script/Global/WidgetManager/WidgetConfig.lua @@ -13,7 +13,6 @@ WidgetConfig.EUIType = { AllWeapon_Spectator = 9, CustomSelectWeapon = 10, - --ShowCustomSelectWeaponBtn = 11, GameRecord = 12, ShowRankInheritance = 13, RankingListBtn = 14, @@ -201,7 +200,7 @@ if not UE_SERVER then Layer = WidgetConfig.EUILayerGroup.Medium, }, [WidgetConfig.EUIType.SelectWeaponNew] = { - Path = UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/WB_CustomWeapon.WB_CustomWeapon_C'), + Path = UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/WB_CustomWeapon_New.WB_CustomWeapon_New_C'), -- 是否仅显示一次 bShowOnce = false, Layer = WidgetConfig.EUILayerGroup.MainUI, diff --git a/SoloKing/Script/UI/GameEnd/WB_GameEnd.lua b/SoloKing/Script/UI/GameEnd/WB_GameEnd.lua index 650e8053..babfad8f 100644 --- a/SoloKing/Script/UI/GameEnd/WB_GameEnd.lua +++ b/SoloKing/Script/UI/GameEnd/WB_GameEnd.lua @@ -111,6 +111,12 @@ function WB_GameEnd:LuaInit() --self.WB_RankingListBtn:LuaInit(); end +function WB_GameEnd:OnClickSelectMode() + UGCMultiMode.RequestMatch(1002, function(Success) + UGCLogSystem.Log("[WB_GameEnd:OnClickSelectMode] Success = %s", tostring(Success)); + end, self) +end + function WB_GameEnd:ReturnToLobby() UE.ReturnToLobby(); end diff --git a/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon_New.lua b/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon_New.lua index 8d1cadf0..1cc5c87d 100644 --- a/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon_New.lua +++ b/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon_New.lua @@ -7,278 +7,274 @@ ---@field VerticalBox_WeaponSocket UVerticalBox --Edit Below-- local WB_CustomWeapon_New = { - bInitDoOnce = false; - WeaponComb = {}; -- {WeaponID1, WeaponID2 - SelectSaveWeaponItemCol = 4; - WeaponSocketItems = {}; - IsChange = false; + bInitDoOnce = false; + WeaponComb = {}; -- {WeaponID1, WeaponID2 + SelectSaveWeaponItemCol = 4; + WeaponSocketItems = {}; + IsChange = false; } - function WB_CustomWeapon_New:Construct() - self:LuaInit() + self:LuaInit() end function WB_CustomWeapon_New:LuaInit() - if self.bInitDoOnce then - return; - end - self.bInitDoOnce = true; + if self.bInitDoOnce then + return ; + end + self.bInitDoOnce = true; - UGCLogSystem.Log("[WB_CustomWeapon_LuaInit]") + UGCLogSystem.Log("[WB_CustomWeapon_LuaInit]") - -- 按键初始化 - WidgetLibrary.BindButtonClicked(self.NewButton_Reset, self.ResetWeaponComb, self) - WidgetLibrary.BindButtonClicked(self.NewButton_Save, self.SaveWeaponComb, self) - WidgetLibrary.BindButtonClicked(self.NewButton_Close, self.ClickClose, self) + -- 按键初始化 + WidgetLibrary.BindButtonClicked(self.NewButton_Reset, self.ResetWeaponComb, self) + WidgetLibrary.BindButtonClicked(self.NewButton_Save, self.SaveWeaponComb, self) + WidgetLibrary.BindButtonClicked(self.NewButton_Close, self.ClickClose, self) - -- 初始化Item - self:InitItem() - UGCLogSystem.Log("[WB_CustomWeapon_LuaInit] Finish") + -- 初始化Item + self:InitItem() + UGCLogSystem.Log("[WB_CustomWeapon_LuaInit] Finish") end function WB_CustomWeapon_New:OnShowPanel(ProgrammeIndex) - UGCLogSystem.Log("[WB_CustomWeapon_OnShowPanel]") - -- 设置配置索引 - self:SetProgrammeIndex(ProgrammeIndex) - UGCLogSystem.Log("[WB_CustomWeapon_OnShowPanel] Finish") + UGCLogSystem.Log("[WB_CustomWeapon_OnShowPanel]") + -- 设置配置索引 + self:SetProgrammeIndex(ProgrammeIndex) + UGCLogSystem.Log("[WB_CustomWeapon_OnShowPanel] Finish") end function WB_CustomWeapon_New:InitItem() - local LocalPC = UGCSystemLibrary.GetLocalPlayerController() + local LocalPC = UGCSystemLibrary.GetLocalPlayerController() - -- 武器类型中最大可选择的的武器数量 - local MaxSelectItemCount = 0 + -- 武器类型中最大可选择的的武器数量 + local MaxSelectItemCount = 0 - -- 武器类型选择的Item在水平框中的对齐方式 - local WeaponTypeSlateChildSize = UE.CreateStruct("SlateChildSize"); - WeaponTypeSlateChildSize.SizeRule = ESlateSizeRule.Fill + -- 武器类型选择的Item在水平框中的对齐方式 + local WeaponTypeSlateChildSize = UE.CreateStruct("SlateChildSize"); + WeaponTypeSlateChildSize.SizeRule = ESlateSizeRule.Fill - for i, v in pairs(WeaponSelectionCombinationConfig.PlayerCustomWeapon) do - -- 设置一下最大的选择武器Item数量 - MaxSelectItemCount = math.max(MaxSelectItemCount, #v.WeaponIDs) - -- 加载图片 - for _, WeaponID in pairs(v.WeaponIDs) do - -- 加载剪影 - MyWeaponSystem.AsyncLoadItemWhiteIconToBrush(WeaponID) - -- 加载大图 - MyWeaponSystem.AsyncLoadItemBigIconToBrush(WeaponID) - end - -- 初始化武器类型 - local WeaponTypeItem = nil - if self.HorizontalBox_WeaponType:GetChildrenCount() < i then - WeaponTypeItem = UserWidget.NewWidgetObjectBP(LocalPC, self:GetWeaponTypeItemClass()); - self.HorizontalBox_WeaponType:AddChild(WeaponTypeItem) - -- 设置对齐方式 - local TargetHorizontalBoxSlot = WidgetLayoutLibrary.SlotAsHorizontalBoxSlot(WeaponTypeItem) - TargetHorizontalBoxSlot:SetSize(WeaponTypeSlateChildSize) - else - WeaponTypeItem = self.HorizontalBox_WeaponType:GetChildAt(i - 1) - end - WeaponTypeItem:SetIndex(i) - WeaponTypeItem:BindClickSelect(self.SelectWeaponType, self) - end + for i, v in pairs(WeaponSelectionCombinationConfig.PlayerCustomWeapon) do + -- 设置一下最大的选择武器Item数量 + MaxSelectItemCount = math.max(MaxSelectItemCount, #v.WeaponIDs) + -- 加载图片 + for _, WeaponID in pairs(v.WeaponIDs) do + -- 加载剪影 + MyWeaponSystem.AsyncLoadItemWhiteIconToBrush(WeaponID) + -- 加载大图 + MyWeaponSystem.AsyncLoadItemBigIconToBrush(WeaponID) + end + -- 初始化武器类型 + local WeaponTypeItem = nil + if self.HorizontalBox_WeaponType:GetChildrenCount() < i then + WeaponTypeItem = UserWidget.NewWidgetObjectBP(LocalPC, self:GetWeaponTypeItemClass()); + self.HorizontalBox_WeaponType:AddChild(WeaponTypeItem) + -- 设置对齐方式 + local TargetHorizontalBoxSlot = WidgetLayoutLibrary.SlotAsHorizontalBoxSlot(WeaponTypeItem) + TargetHorizontalBoxSlot:SetSize(WeaponTypeSlateChildSize) + else + WeaponTypeItem = self.HorizontalBox_WeaponType:GetChildAt(i - 1) + end + WeaponTypeItem:SetIndex(i) + WeaponTypeItem:BindClickSelect(self.SelectWeaponType, self) + end - -- 初始化武器槽UI - for i = 1, self.VerticalBox_WeaponSocket:GetChildrenCount() do - local Item = self.VerticalBox_WeaponSocket:GetChildAt(i - 1) - self.WeaponSocketItems[i] = Item - Item:SetIndex(i) - Item:BindClickSelect(self.SelectWeaponSocket, self) - end - -- 初始化武器选择Item - for i = 1, MaxSelectItemCount do - local Item = nil; - if self.UniformGridPanel_SelectWeapon:GetChildrenCount() < i then - Item = UserWidget.NewWidgetObjectBP(LocalPC, self:GetSelectSaveWeaponItemClass()); - self.UniformGridPanel_SelectWeapon:AddChild(Item) - local TargetUniformGridSlot = WidgetLayoutLibrary.SlotAsUniformGridSlot(Item) - -- 居中 - TargetUniformGridSlot:SetVerticalAlignment(EVerticalAlignment.VAlign_Center) - TargetUniformGridSlot:SetHorizontalAlignment(EHorizontalAlignment.HAlign_Center) - -- 设置索引 - TargetUniformGridSlot:SetColumn((i - 1) % self.SelectSaveWeaponItemCol) - TargetUniformGridSlot:SetRow((i - 1) // self.SelectSaveWeaponItemCol) - else - Item = self.UniformGridPanel_SelectWeapon:GetChildAt(i - 1) - Item:SetVisibility(ESlateVisibility.HitTestInvisible) - end - Item:SetIndex(i) - Item:BindClickSelect(self.ClickSelectSaveWeapon, self) - end - UGCLogSystem.Log("[WB_CustomWeapon_InitItem] Finish") + -- 初始化武器槽UI + for i = 1, self.VerticalBox_WeaponSocket:GetChildrenCount() do + local Item = self.VerticalBox_WeaponSocket:GetChildAt(i - 1) + self.WeaponSocketItems[i] = Item + Item:SetIndex(i) + Item:BindClickSelect(self.SelectWeaponSocket, self) + end + -- 初始化武器选择Item + for i = 1, MaxSelectItemCount do + local Item = nil; + if self.UniformGridPanel_SelectWeapon:GetChildrenCount() < i then + Item = UserWidget.NewWidgetObjectBP(LocalPC, self:GetSelectSaveWeaponItemClass()); + self.UniformGridPanel_SelectWeapon:AddChild(Item) + local TargetUniformGridSlot = WidgetLayoutLibrary.SlotAsUniformGridSlot(Item) + -- 居中 + TargetUniformGridSlot:SetVerticalAlignment(EVerticalAlignment.VAlign_Center) + TargetUniformGridSlot:SetHorizontalAlignment(EHorizontalAlignment.HAlign_Center) + -- 设置索引 + TargetUniformGridSlot:SetColumn((i - 1) % self.SelectSaveWeaponItemCol) + TargetUniformGridSlot:SetRow((i - 1) // self.SelectSaveWeaponItemCol) + else + Item = self.UniformGridPanel_SelectWeapon:GetChildAt(i - 1) + Item:SetVisibility(ESlateVisibility.HitTestInvisible) + end + Item:SetIndex(i) + Item:BindClickSelect(self.ClickSelectSaveWeapon, self) + end + UGCLogSystem.Log("[WB_CustomWeapon_InitItem] Finish") end - function WB_CustomWeapon_New:GetSelectSaveWeaponItemClass() - if self.SelectSaveWeaponClass == nil then - self.SelectSaveWeaponClass = UE.LoadClass(UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.WB_SelectSaveWeapon_C')) - end - return self.SelectSaveWeaponClass + if self.SelectSaveWeaponClass == nil then + self.SelectSaveWeaponClass = UE.LoadClass(UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SelectSaveWeapon.WB_SelectSaveWeapon_C')) + end + return self.SelectSaveWeaponClass end function WB_CustomWeapon_New:GetWeaponTypeItemClass() - if self.WeaponTypeItemClass == nil then - self.WeaponTypeItemClass = UE.LoadClass(UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.WB_WeaponType_C')) - end - return self.WeaponTypeItemClass + if self.WeaponTypeItemClass == nil then + self.WeaponTypeItemClass = UE.LoadClass(UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.WB_WeaponType_C')) + end + return self.WeaponTypeItemClass end --- 设置配置ID function WB_CustomWeapon_New:SetProgrammeIndex(InProgrammeIndex) - self.ProgrammeIndex = InProgrammeIndex - -- 在这里修改 这里获取存档中双武器配置 结构为 CombinationType为 {[CombinationType] = {[组合索引] = {WeaponID1, WeaponID2 },}, } - -- local SavedWeaponComb = ArchiveDataConfig.GetPlayerArchiveDataFromType(UGCSystemLibrary.GetLocalPlayerKey(), ArchiveDataConfig.EArchiveType.WeaponCombs) - local SavedWeaponComb = nil + self.ProgrammeIndex = InProgrammeIndex + -- 在这里修改 这里获取存档中双武器配置 结构为 CombinationType为 {[CombinationType] = {[组合索引] = {WeaponID1, WeaponID2 },}, } + -- local SavedWeaponComb = ArchiveDataConfig.GetPlayerArchiveDataFromType(UGCSystemLibrary.GetLocalPlayerKey(), ArchiveDataConfig.EArchiveType.WeaponCombs) + local SavedWeaponComb = nil - if SavedWeaponComb and SavedWeaponComb[self.ProgrammeIndex] then - self.WeaponComb = SavedWeaponComb[self.ProgrammeIndex] - else - local CombinationList = WeaponSelectionCombinationConfig.WeaponCombinationList.Weapon - if CombinationList and CombinationList[self.ProgrammeIndex] then - self.WeaponComb = CombinationList[self.ProgrammeIndex] - end - end - for i = #self.WeaponComb, 1, -1 do - self:SetSelectWeapon(i, self.WeaponComb[i], (i == 1)) - end + if SavedWeaponComb and SavedWeaponComb[self.ProgrammeIndex] then + self.WeaponComb = SavedWeaponComb[self.ProgrammeIndex] + else + local CombinationList = WeaponSelectionCombinationConfig.WeaponCombinationList.Weapon + if CombinationList and CombinationList[self.ProgrammeIndex] then + self.WeaponComb = CombinationList[self.ProgrammeIndex] + end + end + for i = #self.WeaponComb, 1, -1 do + self:SetSelectWeapon(i, self.WeaponComb[i], (i == 1)) + end end --- 点击选择插槽 function WB_CustomWeapon_New:SelectWeaponSocket(Index) - if self.SelectWeaponSocketID ~= Index then - self.SelectWeaponSocketID = Index - local WeaponSocketItem = self.WeaponSocketItems[self.SelectWeaponSocketID] - if WeaponSocketItem then - self:SetSelectWeapon(self.SelectWeaponSocketID, WeaponSocketItem:GetWeaponID(), true) - end - end + if self.SelectWeaponSocketID ~= Index then + self.SelectWeaponSocketID = Index + local WeaponSocketItem = self.WeaponSocketItems[self.SelectWeaponSocketID] + if WeaponSocketItem then + self:SetSelectWeapon(self.SelectWeaponSocketID, WeaponSocketItem:GetWeaponID(), true) + end + end end --- 点击选择武器类型 function WB_CustomWeapon_New:SelectWeaponType(Index) - if self.WeaponTypeIndex ~= Index then - self.WeaponTypeIndex = Index - for i = 1, self.HorizontalBox_WeaponType:GetChildrenCount() do - local WeaponTypeItem = self.HorizontalBox_WeaponType:GetChildAt(i - 1) - WeaponTypeItem:SetSelect(i == self.WeaponTypeIndex) - end - local CustomWeaponInfo = WeaponSelectionCombinationConfig.PlayerCustomWeapon[self.WeaponTypeIndex] - local SocketWeaponID = -1 - local WeaponSocketItem = self.WeaponSocketItems[self.SelectWeaponSocketID] - if WeaponSocketItem then - SocketWeaponID = WeaponSocketItem:GetWeaponID() - end - if CustomWeaponInfo then - for i = 1, self.UniformGridPanel_SelectWeapon:GetChildrenCount() do - local WeaponID = CustomWeaponInfo.WeaponIDs[i] - local WeaponItem = self.UniformGridPanel_SelectWeapon:GetChildAt(i - 1) - if WeaponID then - WeaponItem:SetWeaponID(WeaponID) - WeaponItem:SetSelect(SocketWeaponID == WeaponID) - WeaponItem:SetVisibility(ESlateVisibility.SelfHitTestInvisible) - else - WeaponItem:SetVisibility(ESlateVisibility.Collapsed) - end - end - end - end + if self.WeaponTypeIndex ~= Index then + self.WeaponTypeIndex = Index + for i = 1, self.HorizontalBox_WeaponType:GetChildrenCount() do + local WeaponTypeItem = self.HorizontalBox_WeaponType:GetChildAt(i - 1) + WeaponTypeItem:SetSelect(i == self.WeaponTypeIndex) + end + local CustomWeaponInfo = WeaponSelectionCombinationConfig.PlayerCustomWeapon[self.WeaponTypeIndex] + local SocketWeaponID = -1 + local WeaponSocketItem = self.WeaponSocketItems[self.SelectWeaponSocketID] + if WeaponSocketItem then + SocketWeaponID = WeaponSocketItem:GetWeaponID() + end + if CustomWeaponInfo then + for i = 1, self.UniformGridPanel_SelectWeapon:GetChildrenCount() do + local WeaponID = CustomWeaponInfo.WeaponIDs[i] + local WeaponItem = self.UniformGridPanel_SelectWeapon:GetChildAt(i - 1) + if WeaponID then + WeaponItem:SetWeaponID(WeaponID) + WeaponItem:SetSelect(SocketWeaponID == WeaponID) + WeaponItem:SetVisibility(ESlateVisibility.SelfHitTestInvisible) + else + WeaponItem:SetVisibility(ESlateVisibility.Collapsed) + end + end + end + end end --- 点击选择武器 function WB_CustomWeapon_New:ClickSelectSaveWeapon(Index) - self.IsChange = true - self:SelectSaveWeapon(Index) + self.IsChange = true + self:SelectSaveWeapon(Index) end function WB_CustomWeapon_New:SelectSaveWeapon(Index) - local WeaponItem = self.UniformGridPanel_SelectWeapon:GetChildAt(Index - 1) - local WeaponID = WeaponItem:GetWeaponID() - for i = 1, self.UniformGridPanel_SelectWeapon:GetChildrenCount() do - local TempWeaponItem = self.UniformGridPanel_SelectWeapon:GetChildAt(i - 1) - TempWeaponItem:SetSelect(Index == i) - end - self:SetSelectWeapon(self.SelectWeaponSocketID, WeaponID, false) + local WeaponItem = self.UniformGridPanel_SelectWeapon:GetChildAt(Index - 1) + local WeaponID = WeaponItem:GetWeaponID() + for i = 1, self.UniformGridPanel_SelectWeapon:GetChildrenCount() do + local TempWeaponItem = self.UniformGridPanel_SelectWeapon:GetChildAt(i - 1) + TempWeaponItem:SetSelect(Index == i) + end + self:SetSelectWeapon(self.SelectWeaponSocketID, WeaponID, false) end - --- 设置插槽内的武器 ---@param SocketID uint 插槽的索引 只有1和2 ---@param bUpdateSelectWeaponBar bool 是否更新武器选择栏 function WB_CustomWeapon_New:SetSelectWeapon(SocketID, WeaponID, bUpdateSelectWeaponBar) - if bUpdateSelectWeaponBar then - self.SelectWeaponSocketID = SocketID - for i, v in pairs(self.WeaponSocketItems) do - v:SetSelect(i == SocketID) - end - -- 获取武器ID类型和索引 - local CustomWeaponTypeIndex = -1 - local CustomWeaponIndex = -1; - for WeaponTypeIndex, v in pairs(WeaponSelectionCombinationConfig.PlayerCustomWeapon) do - -- 加载图片 - for WeaponIndex, TempWeaponID in pairs(v.WeaponIDs) do - if TempWeaponID == WeaponID then - CustomWeaponIndex = WeaponIndex - CustomWeaponTypeIndex = WeaponTypeIndex - end - end - if CustomWeaponTypeIndex > 0 then - break - end - end - -- 更新选择栏 - self:SelectWeaponType(CustomWeaponTypeIndex) - self:SelectSaveWeapon(CustomWeaponIndex) - else - local SocketItem = self.WeaponSocketItems[SocketID] - if SocketItem then - SocketItem:SetWeaponID(WeaponID) - end - end + if bUpdateSelectWeaponBar then + self.SelectWeaponSocketID = SocketID + for i, v in pairs(self.WeaponSocketItems) do + v:SetSelect(i == SocketID) + end + -- 获取武器ID类型和索引 + local CustomWeaponTypeIndex = -1 + local CustomWeaponIndex = -1; + for WeaponTypeIndex, v in pairs(WeaponSelectionCombinationConfig.PlayerCustomWeapon) do + -- 加载图片 + for WeaponIndex, TempWeaponID in pairs(v.WeaponIDs) do + if TempWeaponID == WeaponID then + CustomWeaponIndex = WeaponIndex + CustomWeaponTypeIndex = WeaponTypeIndex + end + end + if CustomWeaponTypeIndex > 0 then + break + end + end + -- 更新选择栏 + self:SelectWeaponType(CustomWeaponTypeIndex) + self:SelectSaveWeapon(CustomWeaponIndex) + else + local SocketItem = self.WeaponSocketItems[SocketID] + if SocketItem then + SocketItem:SetWeaponID(WeaponID) + end + end end - - --- 重置武器配置 function WB_CustomWeapon_New:ResetWeaponComb() - local CombinationList = WeaponSelectionCombinationConfig.Weapon - if CombinationList and CombinationList[self.ProgrammeIndex] then - local Comb = CombinationList[self.ProgrammeIndex] - for i = #Comb, 1, -1 do - self:SetSelectWeapon(i, Comb[i], (i == 1)) - end - end + local CombinationList = WeaponSelectionCombinationConfig.Weapon + if CombinationList and CombinationList[self.ProgrammeIndex] then + local Comb = CombinationList[self.ProgrammeIndex] + for i = #Comb, 1, -1 do + self:SetSelectWeapon(i, Comb[i], (i == 1)) + end + end end function WB_CustomWeapon_New:SaveWeaponComb() - local WeaponComb = {} - local PartsComb = {} - for i, v in pairs(self.WeaponSocketItems) do - WeaponComb[i] = v:GetWeaponID() - PartsComb[i] = v:GetAllParts() - end - UGCLogSystem.LogTree("[WB_CustomWeapon_SaveWeaponComb]WeaponComb:", WeaponComb) - -- 保存操作 - -- 在这里修改 发送RPC保存武器配件到存档并自动选择对应保存的配置 ProgrammeIndex:配置索引， WeaponComb = {WeaponID1, WeaponID2} ，PartsComb = {[WeaponID1] = {PartID, PartID, PartID, ... }, [WeaponID2] = {}, ...} - -- UGCSendRPCSystem.ActorRPCNotify(nil, UGCGameSystem.GameState, "PlayerCustomWeapon", UGCSystemLibrary.GetLocalPlayerKey(), self.ProgrammeIndex, WeaponComb, PartsComb) - - -- 关闭UI - self:CloseSelf() + local WeaponComb = {} + local PartsComb = {} + for i, v in pairs(self.WeaponSocketItems) do + WeaponComb[i] = v:GetWeaponID() + -- 传入武器ID，并保存 + PartsComb[v:GetWeaponID()] = v:GetAllParts() + end + UGCLogSystem.LogTree("[WB_CustomWeapon_SaveWeaponComb]WeaponComb:", WeaponComb) + -- 保存操作 + -- 在这里修改 发送RPC保存武器配件到存档并自动选择对应保存的配置 ProgrammeIndex:配置索引， WeaponComb = {WeaponID1, WeaponID2} ，PartsComb = {[WeaponID1] = {PartID, PartID, PartID, ... }, [WeaponID2] = {}, ...} + -- UGCSendRPCSystem.ActorRPCNotify(nil, UGCGameSystem.GameState, "PlayerCustomWeapon", UGCSystemLibrary.GetLocalPlayerKey(), self.ProgrammeIndex, WeaponComb, PartsComb) + GameState:SendMiniGameRPC("PlayerSelectWeapons", LocalPlayerKey, WeaponComb, PartsComb); + -- 关闭UI + self:CloseSelf() end function WB_CustomWeapon_New:ClickClose() - if self.IsChange then - local SecondaryConfirmationWidget = WidgetManager:GetPanel(WidgetConfig.EUIType.SecondaryConfirmation) - SecondaryConfirmationWidget:SetTextInfo("该配置还未保存，是否保存后关闭页面？", "关闭", "保存") - SecondaryConfirmationWidget:BindCancellationCallBack(self.CloseSelf, self) - SecondaryConfirmationWidget:BindConfirmCallBack(self.SaveWeaponComb, self) - WidgetManager:ShowPanel(WidgetConfig.EUIType.SecondaryConfirmation, false) - else - self:CloseSelf() - end + if self.IsChange then + local SecondaryConfirmationWidget = WidgetManager:GetPanel(WidgetConfig.EUIType.SecondaryConfirmation) + SecondaryConfirmationWidget:SetTextInfo("该配置还未保存，是否保存后关闭页面？", "关闭", "保存") + SecondaryConfirmationWidget:BindCancellationCallBack(self.CloseSelf, self) + SecondaryConfirmationWidget:BindConfirmCallBack(self.SaveWeaponComb, self) + WidgetManager:ShowPanel(WidgetConfig.EUIType.SecondaryConfirmation, false) + else + self:CloseSelf() + end end function WB_CustomWeapon_New:CloseSelf() - WidgetManager:ClosePanel(WidgetConfig.EUIType.CustomSelectWeapon) - self.IsChange = false + WidgetManager:ClosePanel(WidgetConfig.EUIType.CustomSelectWeapon) + self.IsChange = false end diff --git a/SoloKing/Script/UI/SelectWeapons/WB_ReselectWeaponBtn.lua b/SoloKing/Script/UI/SelectWeapons/WB_ReselectWeaponBtn.lua index 1aa78023..4dea4717 100644 --- a/SoloKing/Script/UI/SelectWeapons/WB_ReselectWeaponBtn.lua +++ b/SoloKing/Script/UI/SelectWeapons/WB_ReselectWeaponBtn.lua @@ -44,7 +44,6 @@ end function WB_ReselectWeaponBtn:CloseBtn() self.bIsShowing = false self:SetVisibility(ESlateVisibility.Collapsed); - --WidgetManager:ClosePanel(WidgetConfig.EUIType.ShowCustomSelectWeaponBtn) end function WB_ReselectWeaponBtn:UpdateCooling() diff --git a/SoloKing/Script/UI/WB_Main.lua b/SoloKing/Script/UI/WB_Main.lua index d8932110..e810518b 100644 --- a/SoloKing/Script/UI/WB_Main.lua +++ b/SoloKing/Script/UI/WB_Main.lua @@ -13,7 +13,6 @@ ---@field WB_DamageTextButton UWB_DamageTextButton_C ---@field WB_InTest_Side UWB_InTest_Side_C ---@field WB_PID UWB_PID_C ----@field WB_PlayerInfo_Small UWB_PlayerInfo_Small_C ---@field WB_ReselectWeaponBtn UWB_ReselectWeaponBtn_C ---@field WB_RoundEnd UWB_RoundEnd_C ---@field WB_SelectParts UWB_SelectParts_C @@ -142,23 +141,6 @@ function WB_Main:OnClickCustomTest() self.IsTestShow = not self.IsTestShow; end -WB_Main.IsShowScore = false; - -function WB_Main:OnShowScore() - -- 如果显示的话 - if self.WB_PlayerInfo_Small:IsVisible() then - self:PlayAnimation(self.ShowScore, 0, 1, EUMGSequencePlayMode.Reverse, 1); - else - self:PlayAnimation(self.ShowScore, 0, 1, EUMGSequencePlayMode.Forward, 1); - -- 过一段时间自动关闭 - UGCEventSystem.SetTimer(self, function() - if self.WB_PlayerInfo_Small:IsVisible() then - self:OnShowScore(); - end - end, 5); - end -end - function WB_Main:OnGameStart() UGCLogSystem.Log("[WB_Main:OnGameStart] 执行") end diff --git a/SoloKing/SoloKing.ugcproj b/SoloKing/SoloKing.ugcproj index 573536dc..d75cb4fe 100644 --- a/SoloKing/SoloKing.ugcproj +++ b/SoloKing/SoloKing.ugcproj @@ -7,7 +7,7 @@ ProjectShortPath=/SoloKing/ StartMapName=/SoloKing/UGCmap MapMode=0 bIsBigWorld=0 -Version=1.29.13.13030 +Version=1.30.21.13232 UpdateVersion=5 GameModePath=/SoloKing/Asset/Blueprint/UGCGameMode.UGCGameMode_C DefaultLevelDirectorPath=/Asset/Blueprint/UGCLevelDirector.UGCLevelDirector_C @@ -36,8 +36,10 @@ RankDensity=100 BeyondRankTime=2 BeyondRankNum=12 TeamScoreCalculation=0 -bUseMultiModeMatchSetting=1 +bUseMultiModeMatchSetting=0 MultiModeSettingNum=2 +bIsAllowStageMatching=0 +TeamSettings="{\"TeamSettings\": []}" [MiniMap] ZoomRatios=100 @@ -76,6 +78,8 @@ ModeImage=/SoloKing/Asset/Art/UITexture/Dan/T_Dan_1.T_Dan_1 ModeUnlockConditionDescription= NumberOfTeams=1 TeamPlayers=2 +bIsAllowStageMatching=0 +TeamSettings="{\"TeamSettings\": []}" bEnableChat=1 bEnableRoomChat=1 ChannelName=全部 @@ -106,6 +110,8 @@ ModeImage=/SoloKing/Asset/Art/UITexture/Dan/T_Dan_2.T_Dan_2 ModeUnlockConditionDescription= NumberOfTeams=1 TeamPlayers=1 +bIsAllowStageMatching=0 +TeamSettings="{\"TeamSettings\": []}" bEnableChat=1 bEnableRoomChat=1 ChannelName=全部 diff --git a/SoloKing/UGCmap.umap b/SoloKing/UGCmap.umap index 6579c2f3..b58fbf9d 100644 Binary files a/SoloKing/UGCmap.umap and b/SoloKing/UGCmap.umap differ