diff --git a/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset b/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset index 0002718e..b076a99d 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 1f45fac7..c9e7073c 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 fd4cb68c..968abe35 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 dd9c7acd..024c9c51 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 7760e632..04b0165e 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 b193fee1..f7df21b9 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 282d09fb..62e35b0a 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 e0583eb7..6207c750 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 22910f16..59366beb 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 deaf7055..f7162b02 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 ec0cd844..e74578f1 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 b349e6dd..12fb0774 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 a12e5636..4915a6d3 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 95d4d018..9e8a4a83 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 40ae37bc..d3bc5470 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 ff930b66..d117331d 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 2d8f5496..094284cc 100644 Binary files a/SoloKing/Asset/Levels/Map_SMDJ.umap and b/SoloKing/Asset/Levels/Map_SMDJ.umap differ diff --git a/SoloKing/Asset/Levels/Minimap/MiniMap_NewYear.uasset b/SoloKing/Asset/Levels/Minimap/MiniMap_NewYear.uasset index 3345d82f..5a6ad83c 100644 Binary files a/SoloKing/Asset/Levels/Minimap/MiniMap_NewYear.uasset and b/SoloKing/Asset/Levels/Minimap/MiniMap_NewYear.uasset differ diff --git a/SoloKing/Asset/UGCLayout_BP.uasset b/SoloKing/Asset/UGCLayout_BP.uasset index 0694b3b6..750b0596 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 14f832b7..c96660b9 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 dfec1f29..979f6795 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 e510b13a..16f35429 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 ecde33d5..d1050e5d 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 f7aff086..90f3aa86 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 735b2f2c..a1e08d78 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 9c7e792b..69123b78 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 459a7090..f98acd7f 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 24213d33..80526e2d 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 14088e18..0b4ec2ae 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 52e9aa67..ce70e6e7 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 52058972..56dc6c75 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 80017f20..4c6b3f5a 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 ad4ccee6..0f8f2b59 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 df765a78..678b77e4 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 0d804372..f54b63b1 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 5724f40d..9c37b07b 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 61d5d651..77cfb481 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 6d1e608e..c783f529 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 b33f869c..4663d6a6 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 12908ab4..9c6d6765 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 2be229de..a810ca84 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 e83e17c0..f95025f7 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 11d85b0a..59aa6def 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 7a543538..a79194ce 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 8401c32e..faed5d25 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 8dcddb6d..a66a668a 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 6303c26d..fb8270ca 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 d51de398..2cac16f6 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 79d0b2c1..a53405e5 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 de15390c..b9e33e11 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 fb477f98..6057ed74 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 f19a4f36..6260ee41 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 16adcffc..843f3a74 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 0a442285..52203d60 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 e5587843..3c514214 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 e6bda40c..b2fb7e0d 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 75980c12..3eaf59a9 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 addab262..5b3f8fd0 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 43216c25..2d1f6c63 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 a0b83031..d6cd542e 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 a82db588..4bd64dfe 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 58d1ecf8..1056880a 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 8d54482b..f6c45b8a 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 736d61d8..5dc2bf67 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 dfa127ac..0aa16171 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 acee6440..831b22e6 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 96794215..562b9ad7 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 8dd5514e..9ae10c1f 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 1987167b..979fc182 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 db4d5c4d..91eab2e3 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 2a0300fd..7b30838c 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 8ea6dc25..b3dd9238 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 6e161251..59adb8bc 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 1a7e5a6a..ca2a133f 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 aa953768..c4eef39b 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 db192d63..f62edbac 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 ab389f02..cfa52df0 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 437251ca..02fd0cdd 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 47bfe948..2b945640 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 88e69670..92d8a8bd 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 11517e38..dae84c88 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 0508a432..5abc99ff 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 359004b8..e205ff06 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 8add9582..b06b37a5 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 6ea2ee21..2726ba7a 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 86f01930..93cb4f71 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 8bda2306..2835e554 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 bba6a310..cf449a81 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 79096623..97dac33a 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 214c5c47..da02fd66 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 78bc0f8a..6639a41b 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 18fb6479..d21f0afd 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 e7bc2a93..48b5ad62 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 ab34a580..557f6c5a 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 f74dc992..08acabf6 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 bb1fbc5a..eb5cd818 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 1b9d72dd..350b8b27 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 252eac65..ee1a29cd 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 ff406eb1..15488216 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 5956f0ff..de5b1e89 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 7588f1c4..80b84e80 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 bde459d7..16548c6f 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 32affc64..e985611d 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 a5025b5b..9aa5aed3 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 47f8ffc0..7060f8bf 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 ea346d4c..7ecc9130 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 05657b72..b9030d28 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 6f8ee3f1..f4c16ed4 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 e3c33419..40b825bd 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 db180584..9a66b09f 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 d2c72cda..d9779567 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 3e266b74..3daf0f16 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 61356652..2ae49dee 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 0d1a9122..14765021 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 0d6f3534..b3b9d149 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 feb4afd7..20dd7598 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 905d2035..c77aab3c 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 983a39f8..ba118593 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 8d6deade..7bb632fc 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 697ef332..4e22e412 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 03a50e04..cda35178 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 937d609f..ab963e41 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 0308b167..ce1f5f2e 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 2c03285b..ae58a2a1 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 f32c4968..09f5cce3 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 47fad21a..4191ffc2 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 5b469dda..9e4e62e7 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 854a7924..2a4ae98a 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 465345f8..6e13fe7b 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 46f940bc..ffb42c6e 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 923fc4ce..6b7f9e99 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 cfed4491..45642f7d 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 ea0f56a3..e29317ef 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 7f697262..993c510f 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 869b21f7..bb202d34 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 101b6ab2..5d665d25 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 15944ece..4e0ec921 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 0fb811fa..3f5af787 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 bcbc5e8b..b70b6565 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 a8dbb9ac..6acc86fc 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 58e02350..c3108c0e 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 555d6abc..279aadd2 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 39ba421d..47d5666a 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 eb3d98cd..271b7e52 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 532c29e3..23db18c5 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 28d37100..d103e7f0 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 8d503bd8..39c631c0 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 c97cf01f..c7ad77bc 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 228973d0..6c2ee634 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 7855de61..72691111 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 88c0e279..0ad97189 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/UGCGameMode.lua b/SoloKing/Script/Blueprint/UGCGameMode.lua index b77f7169..d8c2efb5 100644 --- a/SoloKing/Script/Blueprint/UGCGameMode.lua +++ b/SoloKing/Script/Blueprint/UGCGameMode.lua @@ -20,16 +20,7 @@ function UGCGameMode:LuaModifyDamage(Damage, DamageType, InstigatorPlayerState, if UE.IsValidPawn(Pawn) then PawnCount = PawnCount + 1; end end if PawnCount <= 1 then return 0; end - - local TargetDamage = table.func( - UGCGameSystem.GameState.MiniGameManager, - "OnPlayerDamage", - UGCGameSystem.GetPlayerPawnByPlayerKey(VictimPlayerState.PlayerKey), - Damage, - DamageType, - Instigator - ); - return TargetDamage or Damage; + return Damage; end -- function UGCGameMode:ReceiveTick(DeltaTime) diff --git a/SoloKing/Script/Blueprint/UGCGameState.lua b/SoloKing/Script/Blueprint/UGCGameState.lua index edbdd2bf..eb66c421 100644 --- a/SoloKing/Script/Blueprint/UGCGameState.lua +++ b/SoloKing/Script/Blueprint/UGCGameState.lua @@ -145,6 +145,13 @@ function UGCGameState:LoadMap(Name) self:UnloadMap({ self.LoadMapName }); end self.LoadMapName = Name; + for i, v in pairs(LevelTable.LevelInfo) do + if v.MapName == Name then + self.MapIndex = i; + DOREPONCE(self, "MapIndex"); + break; + end + end UGCLogSystem.Log("[UGCGameState:LoadMap] 加载 %s", Name) LevelStreamTool.LoadStreamLevels({ Name }, { Object = self, Func = self.LoadMapFinish }, false); end diff --git a/SoloKing/Script/Blueprint/UGCPlayerController.lua b/SoloKing/Script/Blueprint/UGCPlayerController.lua index cb7d2796..41678a58 100644 --- a/SoloKing/Script/Blueprint/UGCPlayerController.lua +++ b/SoloKing/Script/Blueprint/UGCPlayerController.lua @@ -1,5 +1,4 @@ ---@class UGCPlayerController_C:BP_UGCPlayerController_C ----@field RankingListComponent URankingListComponent_C --Edit Below-- require('Script.Global.Global') ---@type UGCPlayerController_C diff --git a/SoloKing/Script/Global/Mini/MiniGameConfig.lua b/SoloKing/Script/Global/Mini/MiniGameConfig.lua index 27c27ddf..c212b7d2 100644 --- a/SoloKing/Script/Global/Mini/MiniGameConfig.lua +++ b/SoloKing/Script/Global/Mini/MiniGameConfig.lua @@ -48,11 +48,11 @@ MiniGameConfig = MiniGameConfig or { MapName = { ['Map_SLXLC'] = 1, ['Map_SMDJ'] = 1, - ['Map_HDDJ'] = 2, - ['Map_JCK'] = 2, - ['Map_DBL'] = 2, - ['Map_SCL'] = 2, - --['Map_NewYear'] = 2, + ['Map_HDDJ'] = 1, + ['Map_JCK'] = 1, + ['Map_DBL'] = 1, + ['Map_SCL'] = 1, + ['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 06af0379..097c958d 100644 --- a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua +++ b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua @@ -922,25 +922,23 @@ function Mini_Solo:OnPostPlayerRank(PlayerKey, IsWin) if PS and UE.IsValid(PS) then PS:OnBestRank(ArchiveTable[PlayerKey].Score); end -- 设置分数 - local PC = UGCGameSystem.GetPlayerControllerByPlayerKey(PlayerKey) + local PC = UGCGameSystem.GetPlayerControllerByPlayerKey(PlayerKey) --- 1:积分；2:技术分 - local UID = UE.GetPlayerUID(PlayerKey); - PC.RankingListComponent:Server_UpdateRankListScore(PC, UID, 1, ArchiveTable[PlayerKey].Score); - PC.RankingListComponent:Server_UpdateRankListScore(PC, UID, 2, ArchiveTable[PlayerKey].TechScore); - - local PlayerName = UE.GetPlayerName(PlayerKey); - UGCLogSystem.Log("[Mini_Solo:OnPostPlayerRank] Player:%s 积分：%s 技术分：%s", PlayerName, tostring(ArchiveTable[PlayerKey].Score), tostring(ArchiveTable[PlayerKey].TechScore)); + --local UID = UE.GetPlayerUID(PlayerKey); + --PC.RankingListComponent:Server_UpdateRankListScore(PC, UID, 1, ArchiveTable[PlayerKey].Score); + --PC.RankingListComponent:Server_UpdateRankListScore(PC, UID, 2, ArchiveTable[PlayerKey].TechScore); if not self.IsLobbyTeam then for i = 1, 2 do table.insert(self.LiveInfo[i], { UID = AccountTable[PlayerKey].UID, TeamRank = IsWin and 1 or 2, - rankScore = ArchiveTable[PlayerKey].TechScore, + rankScore = ArchiveTable[PlayerKey].Score, }); end end + 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; @@ -2069,6 +2067,7 @@ function Mini_Solo:ShowRankInheritanceUI() if ArchiveTable[LocalPlayerKey].IsNewSeason then -- 读取之前数据 local Seasons = ArchiveTable[LocalPlayerKey].Seasons + if table.isEmpty(Seasons) then return; end UGCLogSystem.LogTree(string.format("[Mini_Solo:ShowRankInheritanceUI] Seasons ="), Seasons) -- 获取上一赛季 local LastSeason, LastRankScore = -1, 0; @@ -2151,4 +2150,18 @@ function Mini_Solo:HandleDoorChildActor(ChildActorComponent) end end +function Mini_Solo:Test_Season(PlayerKey) + ArchiveTable[PlayerKey].Score = 3500; + ArchiveTable[PlayerKey].Seasons = { + [0] = { + 0, + { 2521, 0, }, + { 6, 6 }, + { 14, 0 } + }, + } + ArchiveTable[PlayerKey].CurSeason = 1; + +end + return Mini_Solo; diff --git a/SoloKing/Script/Global/Tool/ItemTool.lua b/SoloKing/Script/Global/Tool/ItemTool.lua index 4b9ce215..08da3de2 100644 --- a/SoloKing/Script/Global/Tool/ItemTool.lua +++ b/SoloKing/Script/Global/Tool/ItemTool.lua @@ -487,7 +487,7 @@ function ItemTool.AddWeaponParts(InPawn, ItemDefineID, Count) if WeaponSuits[WeaponItemId] then local TheList = WeaponSuits[WeaponItemId][EWeaponPartType.Best]; if not table.isEmpty(TheList) then - AddSubitems = TheList[math.random(#TheList)]; + AddSubitems = TheList[1]; end end end @@ -737,11 +737,6 @@ function ItemTool.GetDefineIDBySocketType(Weapon, InType) return nil; end ----@param InWeapon ASTExtraShootWeapon -function ItemTool.WeaponAddPart(InWeapon, InPartId) - InWeapon:RPC_ServerEquipAttachment(InPartId); -end - function ItemTool.AddRangeItems(InPawn, Begin, End) for i = Begin, End do if UGCItemSystem.IsUGCItem(i) then @@ -752,4 +747,16 @@ function ItemTool.AddRangeItems(InPawn, Begin, End) until bSucces or Times <= 0; end end +end + +function ItemTool.WeaponAddPart(InWeapon, PartId) + UGCGunSystem.CreateAndAddGunAttachment(InWeapon, PartId); +end + +-- 设置当前武器配件（直接装上，估计需要验证） +function ItemTool.CurrWeaponAddPart(InPawn, InPart) + local Weapon = UGCWeaponManagerSystem.GetCurrentWeapon(InPawn); + if Weapon and ItemTool.IsShootWeapon(Weapon) then + UGCGunSystem.CreateAndAddGunAttachment(Weapon, InPart); + 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 1fc7d70d..c87b6ce0 100644 --- a/SoloKing/Script/Global/WidgetManager/WidgetConfig.lua +++ b/SoloKing/Script/Global/WidgetManager/WidgetConfig.lua @@ -201,7 +201,7 @@ if not UE_SERVER then Layer = WidgetConfig.EUILayerGroup.Medium, }, [WidgetConfig.EUIType.SelectWeaponNew] = { - Path = UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/WB_WeaponSelect_New.WB_WeaponSelect_New_C'), + Path = UGCGameSystem.GetUGCResourcesFullPath('Asset/UI/SelectWeapons/WB_CustomWeapon.WB_CustomWeapon_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 afdbcbb3..650e8053 100644 --- a/SoloKing/Script/UI/GameEnd/WB_GameEnd.lua +++ b/SoloKing/Script/UI/GameEnd/WB_GameEnd.lua @@ -11,7 +11,6 @@ ---@field WB_GameEnd_PlayerInfo_Self UWB_GameEnd_PlayerInfo_C ---@field WB_PID UWB_PID_C ---@field WB_PlayerInfo UWB_PlayerInfo_C ----@field WB_RankingListBtn1 UWB_RankingListBtn1_C ---@field WidgetSwitcher_Enemy UWidgetSwitcher ---@field WidgetSwitcher_GameEnd UWidgetSwitcher --Edit Below-- diff --git a/SoloKing/Script/UI/GameRecord/WB_Historical_Season.lua b/SoloKing/Script/UI/GameRecord/WB_Historical_Season.lua index b39262ea..6a6f40cb 100644 --- a/SoloKing/Script/UI/GameRecord/WB_Historical_Season.lua +++ b/SoloKing/Script/UI/GameRecord/WB_Historical_Season.lua @@ -27,7 +27,7 @@ end --- HistoricalSeasonInfo:{SeasonIndex:uint, Score:uint, HideScore:uint, NumberOfGames:uint, WinningRate:float} function WB_Historical_Season:Init(HistoricalSeasonInfo) if HistoricalSeasonInfo == nil then return end - + UGCLogSystem.LogTree(string.format("[WB_Historical_Season:Init] HistoricalSeasonInfo ="), HistoricalSeasonInfo) self.TextBlock_Score:SetText(HistoricalSeasonInfo.Score); -- 局数 diff --git a/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua b/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua index 3032e4ff..41061c42 100644 --- a/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua +++ b/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua @@ -83,10 +83,10 @@ function WB_SaveWeaponItem:SetSelect(IsSelect) self.IsSelected = IsSelect if IsSelect then self.Image_IsSelect:SetVisibility(ESlateVisibility.SelfHitTestInvisible); - self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.SelfHitTestInvisible); + --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.SelfHitTestInvisible); else self.Image_IsSelect:SetVisibility(ESlateVisibility.Collapsed); - self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.Collapsed); + --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.Collapsed); -- self:SetSelectPartType(nil) end end diff --git a/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon.lua b/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon.lua index 9b6d0401..2be52949 100644 --- a/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon.lua +++ b/SoloKing/Script/UI/SelectWeapons/WB_CustomWeapon.lua @@ -183,12 +183,14 @@ function WB_CustomWeapon:ClickSelectSaveWeapon(Index) end function WB_CustomWeapon: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) + if WeaponItem then + 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 - self:SetSelectWeapon(self.SelectWeaponSocketID, WeaponID, false) end function WB_CustomWeapon:SelectSaveWeaponByItemID(ItemID) diff --git a/SoloKing/Script/UI/SelectWeapons/WB_SelectAllWeapon.lua b/SoloKing/Script/UI/SelectWeapons/WB_SelectAllWeapon.lua index 8cf19ca1..c836145a 100644 --- a/SoloKing/Script/UI/SelectWeapons/WB_SelectAllWeapon.lua +++ b/SoloKing/Script/UI/SelectWeapons/WB_SelectAllWeapon.lua @@ -151,7 +151,8 @@ function WB_SelectAllWeapon:FillDisables() end function WB_SelectAllWeapon:OnSelectMap(InMapName) - self:OnMapLoaded({ InMapName }); + UGCLogSystem.Log("[WB_SelectAllWeapon:OnSelectMap] InMapName = %s", InMapName); + self:OnMapLoaded(InMapName); end function WB_SelectAllWeapon:OnShowPanel(...) diff --git a/SoloKing/Script/gamemode/Action_PlayerLogin.lua b/SoloKing/Script/gamemode/Action_PlayerLogin.lua index 41cc32a6..4eba0f39 100644 --- a/SoloKing/Script/gamemode/Action_PlayerLogin.lua +++ b/SoloKing/Script/gamemode/Action_PlayerLogin.lua @@ -56,15 +56,18 @@ function Action_PlayerLogin:Execute(...) end end + --self:Test_Season(); + -- 判断当前是否玩过 if ArchiveTable[self.PlayerKey].GameTimes == 0 then --- 设置为当前赛季 ArchiveTable[self.PlayerKey].CurSeason = DefaultSettings.CurrentSeason; end - + ArchiveTable[self.PlayerKey].IsNewSeason = false; -- 赛季重置 if ArchiveTable[self.PlayerKey].CurSeason < DefaultSettings.CurrentSeason then -- 检查是否是第一次进入 + UGCLogSystem.Log("[Action_PlayerLogin:Execute] CurrSeason = %d", ArchiveTable[self.PlayerKey].CurSeason); if ArchiveTable[self.PlayerKey].GameTimes ~= 0 then -- 更新赛季 ArchiveTable[self.PlayerKey].Seasons[ArchiveTable[self.PlayerKey].CurSeason] = { @@ -124,40 +127,12 @@ function Action_PlayerLogin:Execute(...) ArchiveTable[self.PlayerKey].Kill = 0; ArchiveTable[self.PlayerKey].Dead = 0; ArchiveTable[self.PlayerKey].Score = DefaultSettings.RankScore; - --local _RankScore = UGCRankSystem.GetUGCRank(self.PlayerKey) - --UGCRankSystem.AddRanktProgress(self.PlayerKey, DefaultSettings.RankScore - _RankScore); - else - ArchiveTable[self.PlayerKey].IsNewSeason = false; - end - else - ArchiveTable[self.PlayerKey].IsNewSeason = false; - end - - -- 计算补分 - if ArchiveTable[self.PlayerKey].SeasonInfo == nil then ArchiveTable[self.PlayerKey].SeasonInfo = {}; end - -- 使用第一槽 - if ArchiveTable[self.PlayerKey].SeasonInfo[1] == nil then - ArchiveTable[self.PlayerKey].SeasonInfo[1] = 1; -- 表示当前已经参与过补分了 - - -- 具体补分逻辑 - local AddedScore = 0; - for i, v in pairs(ArchiveTable[self.PlayerKey].Seasons) do - local SeasonInfo = UE.MakeSeason(v); - if SeasonInfo.Score > DefaultSettings.RankScore then - AddedScore = SeasonInfo.Score - DefaultSettings.RankScore; - end - break ; - end - if AddedScore > 0 then - UGCLogSystem.Log("[Action_PlayerLogin:Execute] Begin Hide Score = %d", ArchiveTable[self.PlayerKey].HideScore); - ArchiveTable[self.PlayerKey].HideScore = ArchiveTable[self.PlayerKey].HideScore + math.floor(AddedScore * 0.4); -- 给予补分 - UGCLogSystem.Log("[Action_PlayerLogin:Execute] End Hide Score = %d", ArchiveTable[self.PlayerKey].HideScore); end end - else - ArchiveTable[self.PlayerKey].IsNewSeason = false; end + ArchiveTable[self.PlayerKey].SeasonInfo = nil; + -- 处理玩家数据 for WeaponID, Table in pairs(ArchiveTable[self.PlayerKey].SelectWeapons) do if table.isEmpty(Table) then @@ -190,7 +165,6 @@ function Action_PlayerLogin:Execute(...) "Dead", "Last10Games", "CurSeason", - "Seasons", "Friends", "SelectWeapons", "LastSelectWeapons", @@ -225,4 +199,23 @@ function Action_PlayerLogin:Test_ResetArchive(Archive) end end +function Action_PlayerLogin:Test_Season() + UGCLogSystem.Log("[Action_PlayerLogin:Test_Season] 执行") + ArchiveTable[self.PlayerKey].Seasons = { + [0] = { + 0, + { 2521, 0, }, + { 6, 6 }, + { 14, 0 } + }, + }; + ArchiveTable[self.PlayerKey].CurSeason = 1; + ArchiveTable[self.PlayerKey].Score = 2557; + ArchiveTable[self.PlayerKey].GameWinTimes = 49; + ArchiveTable[self.PlayerKey].TotalGameTimes = 149; + ArchiveTable[self.PlayerKey].GameTimes = 226; + ArchiveTable[self.PlayerKey].Dead = 481; + ArchiveTable[self.PlayerKey].Kill = 407; +end + return Action_PlayerLogin \ No newline at end of file diff --git a/SoloKing/SoloKing.ugcproj b/SoloKing/SoloKing.ugcproj index 9af1bb3e..b50ddca4 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.13026 +Version=1.29.13.13030 UpdateVersion=5 GameModePath=/SoloKing/Asset/Blueprint/UGCGameMode.UGCGameMode_C DefaultLevelDirectorPath=/Asset/Blueprint/UGCLevelDirector.UGCLevelDirector_C @@ -51,7 +51,7 @@ SwitchesInMaps=((Key="r.Mobile.EnableIBL",Value=0),(Key="s.StreamableDelegateLim PlayBindingArray=[] [JobOption] -LastJobId=600041922 +LastJobId=600042287 LastWindowsJobId=600026723 LastAndroidJobId=600026723 LastIOSJobId=600026723 diff --git a/SoloKing/UGCmap.umap b/SoloKing/UGCmap.umap index ecc04831..ae01618f 100644 Binary files a/SoloKing/UGCmap.umap and b/SoloKing/UGCmap.umap differ