diff --git a/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset b/SoloKing/Asset/Blueprint/SceneObj/Portal/PortalDoor.uasset index ebaa1af1..a3195fd7 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 3fb90182..9fca9cdc 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 4dbc6271..54b3b6de 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 21706b7c..a13ca06b 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 ec970147..49a89f75 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 a6a9e287..8aa48b4c 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 f3df8dc2..640b76a6 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 48947b11..04578e43 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 594a0653..993988fe 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 d0065fb3..80ebff64 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 2b6e2242..0c07742e 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 9736a903..e0657d42 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 4542cb85..f02ea300 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 612fd6d2..6aba8149 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 615fc6da..530b8651 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 27289f46..74921b05 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 42818bb8..0e55ed51 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 f7669e41..eeb109de 100644 Binary files a/SoloKing/Asset/UGCLayout_BP.uasset and b/SoloKing/Asset/UGCLayout_BP.uasset differ diff --git a/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset b/SoloKing/Asset/UI/CompetitionSeason/WB_ShowRankInheritance.uasset index 2adcfa3e..6f685e67 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 013d1059..8cc95c08 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 de8068c4..464fa765 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 f19c8734..b1d9655a 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 a4799230..21ac8379 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 b855cd95..6bec8549 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 44086e24..b808fbe7 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 b4dbe98b..b0f28d77 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 9af79aa2..15bebc1f 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 3ea04105..b063b811 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 644bf084..a6feb26a 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 701eea61..87e95d9c 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 f069e0ef..bd905b2d 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 e7db18a7..4c5e9b51 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 9da761e4..e0e4a90c 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 87e6efe4..447fdb9f 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/SelectGameMode/WB_ModeType.uasset b/SoloKing/Asset/UI/SelectGameMode/WB_ModeType.uasset index 1c8cf037..ed3f1094 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 7d44b0a8..5abd756b 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 dcf36222..7e11a00d 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 21b43404..b9767689 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 b631fb61..236820d7 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 1c4abb0c..6f2aaa9f 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 e043a5b6..3e72e098 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 c8a2927a..c304654f 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 374f765c..1acab2d1 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 83c5704b..8dae05b3 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 5381170e..3ea89b9f 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 af963c78..4afd4493 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 a319f7b9..0f37f689 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 cbfa8dc5..6604eb04 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 b097f479..a1943fda 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_SaveOtherWeaponItem.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.uasset index cfb62c0a..2c881839 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset index de66b81c..09c96a7b 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 4272849e..e6fcba4a 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_WeaponType.uasset b/SoloKing/Asset/UI/SelectWeapons/SaveCustomWeaponItem/WB_WeaponType.uasset index bc800a3c..a2e2a716 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 8d31b521..82bf4695 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 93f2dc4d..e1370377 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 bc1d8476..cb17c7ff 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 7901c25f..3d3d5d9f 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 457f5a45..c824e969 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 76f33960..50e87663 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 97094af6..67a56d06 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 607d6849..04ad3d02 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 8b997eef..03fd4b39 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 c7a37904..4d250134 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/SelectWeapons/WeaponConfiguration/WB_WeaponConfigPartItem.uasset b/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfigPartItem.uasset index a3378ae7..052e5450 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfigPartItem.uasset and b/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfigPartItem.uasset differ diff --git a/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.uasset b/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.uasset index 2054e593..edcfdad7 100644 Binary files a/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.uasset and b/SoloKing/Asset/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.uasset differ diff --git a/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset b/SoloKing/Asset/UI/Tip/WB_SecondaryConfirmationNotice.uasset index a2c57023..696744e1 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 d2b2f3aa..faeeb8e0 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_PlayerInfoItem.uasset b/SoloKing/Asset/UI/Tool/Child/WB_PlayerInfoItem.uasset index 22eb7b3e..02d4b1a7 100644 Binary files a/SoloKing/Asset/UI/Tool/Child/WB_PlayerInfoItem.uasset and b/SoloKing/Asset/UI/Tool/Child/WB_PlayerInfoItem.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset b/SoloKing/Asset/UI/Tool/Child/WB_SelectMapItem.uasset index f938ae3e..9fd3d32a 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/Child/WB_SelectPartButton.uasset b/SoloKing/Asset/UI/Tool/Child/WB_SelectPartButton.uasset index 2133c837..f425c11a 100644 Binary files a/SoloKing/Asset/UI/Tool/Child/WB_SelectPartButton.uasset and b/SoloKing/Asset/UI/Tool/Child/WB_SelectPartButton.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Child/WB_SelectPartItem.uasset b/SoloKing/Asset/UI/Tool/Child/WB_SelectPartItem.uasset index 6714bb45..50d3f56f 100644 Binary files a/SoloKing/Asset/UI/Tool/Child/WB_SelectPartItem.uasset and b/SoloKing/Asset/UI/Tool/Child/WB_SelectPartItem.uasset differ diff --git a/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset b/SoloKing/Asset/UI/Tool/Title/WB_Title1.uasset index cc8d25a5..85d47385 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 c6ce2b1a..d08846d7 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 e25e6053..7c59a10b 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 c75698b6..fdf45fe4 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_DamageTextButton.uasset b/SoloKing/Asset/UI/Tool/WB_DamageTextButton.uasset index 3a582077..40593053 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_PID.uasset b/SoloKing/Asset/UI/Tool/WB_PID.uasset index 2c51347f..d679f62c 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_PlayerInfo.uasset b/SoloKing/Asset/UI/Tool/WB_PlayerInfo.uasset index 61886d2f..96ba35a3 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_PlayerInfo.uasset and b/SoloKing/Asset/UI/Tool/WB_PlayerInfo.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset b/SoloKing/Asset/UI/Tool/WB_RankingListBtn1.uasset index f2405f7f..c3e71ad2 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_RoundEnd.uasset b/SoloKing/Asset/UI/Tool/WB_RoundEnd.uasset index 93575172..ba2a6b81 100644 Binary files a/SoloKing/Asset/UI/Tool/WB_RoundEnd.uasset and b/SoloKing/Asset/UI/Tool/WB_RoundEnd.uasset differ diff --git a/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset b/SoloKing/Asset/UI/Tool/WB_SelectMap.uasset index 75578ba7..adbf7451 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_SelectParts.uasset b/SoloKing/Asset/UI/Tool/WB_SelectParts.uasset index 9415389e..cfafe2dd 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 e6d17e80..8d5c6d12 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 23645187..3a393892 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/TwoConfirm/WB_SecondaryConfirmation.uasset b/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation.uasset index 70dbffcc..c273084d 100644 Binary files a/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation.uasset and b/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation.uasset differ diff --git a/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation_Strip.uasset b/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation_Strip.uasset index 294905a0..1a31e337 100644 Binary files a/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation_Strip.uasset and b/SoloKing/Asset/UI/TwoConfirm/WB_SecondaryConfirmation_Strip.uasset differ diff --git a/SoloKing/Asset/UI/WB_Main.uasset b/SoloKing/Asset/UI/WB_Main.uasset index f332d045..aee560cd 100644 Binary files a/SoloKing/Asset/UI/WB_Main.uasset and b/SoloKing/Asset/UI/WB_Main.uasset differ diff --git a/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset b/SoloKing/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset index 6a02d424..bb5a8e55 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 8784e16c..90562524 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 83da199b..b645f9d7 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 e63a1aae..83425330 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 b894640d..d6983472 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 c84771de..3528b498 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 77f9fdf9..e7984898 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 21f9328d..faa63d61 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 74bf17a5..921bc413 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 a7dff374..25d388c0 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 63a1ab65..20767c30 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 fb639e41..4dff549a 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 36468b97..8970358c 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 e2f8f5d8..6e2aa815 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 ae2627e6..a52fdd87 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 50cc6eb9..32c77626 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 860988b2..12c01849 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 b6caf610..8dae2672 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 ca68c2d7..0b6e7a05 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 cdf38268..34391667 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 83f8c7d3..0c8c1aac 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 4151fa83..67c869b8 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 1d2999e4..487fcf64 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 d0345f0d..6b098296 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 fdb7fbd8..ba24e422 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 97bd34ce..4c9741d4 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 417ea210..04ea3b33 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 0b9a42a0..82177fd4 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 a5810e42..0a122fbd 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 87deba5a..b1807ee7 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 f1204b59..9a8efd24 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 2a8b40c9..0ab3b978 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 b3410f8a..b60175ac 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 d73c44c6..a6a0257d 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 52de6427..46466ea7 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 a041de47..87b7a863 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 272827b3..dea43a2b 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 ea01e82a..51447492 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 e5078a36..98a7f4ab 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 aea64fec..9731284c 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 1cccf433..9f67eeb2 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 0092ae59..482823df 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 28208e8a..a9d0cde5 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 07ef706f..dd912a6b 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 ee2b37ae..f49401ed 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 9f203689..3d7ad7c2 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 ac2fc9cb..446084a2 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 67562dea..2125556d 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 34a8008b..625aad01 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 0437552b..a78e36e1 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 60bbc4fe..da9089c2 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 da0971eb..c8ede905 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 e535c277..8e292ee2 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 ea0ece03..03034274 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 6d59759c..13898e77 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 cfa88ac1..6bea08cc 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 9059c1e9..709ee8fb 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 8649d96b..ddff5226 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 39af319b..a0e887f2 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 a252492b..4f4d80e2 100644 --- a/SoloKing/Script/Blueprint/UGCGameState.lua +++ b/SoloKing/Script/Blueprint/UGCGameState.lua @@ -74,6 +74,7 @@ function UGCGameState:GetReplicatedProperties() , { "MiniInfo", "Lazy" } , { "MiniInitData", "Lazy" } , { "MiniState", "Lazy" } + , { "SelectGameMode", "Lazy" } , "EnableShovel" end @@ -576,4 +577,16 @@ function UGCGameState:OnRep_MiniState() end end +function UGCGameState:SetSelectGameMode(InMode) + if IsServer then + self.SelectGameMode = InMode; + DOREPONCE(self, "SelectGameMode"); + end +end + +function UGCGameState:OnRep_SelectGameMode() + if self.SelectGameMode == nil then return; end + GlobalModeType = self.SelectGameMode; +end + return UGCGameState; diff --git a/SoloKing/Script/Blueprint/UGCPlayerController.lua b/SoloKing/Script/Blueprint/UGCPlayerController.lua index b720bb8b..5a6992ed 100644 --- a/SoloKing/Script/Blueprint/UGCPlayerController.lua +++ b/SoloKing/Script/Blueprint/UGCPlayerController.lua @@ -380,7 +380,7 @@ function UGCPlayerController:SendWeapons(Total, InList) end end end - if table.isEmpty(InList) then return ; end + if table.isEmpty(InList) then return; end if Total == nil then UnrealNetwork.CallUnrealRPC(self, self, "SendWeapons", table.getCount(ArchiveTable[self.PlayerKey].SelectWeapons), InList); else @@ -402,7 +402,7 @@ function UGCPlayerController:SendWeapons(Total, InList) end --- 一次发送武器配件数量的rpc有多少个 -UGCPlayerController.OneSendWeaponPartsCount = 20; +UGCPlayerController.OneSendWeaponPartsCount = 10; UGCPlayerController.SendPartsTimer = nil; --- 正在发送的 IDs UGCPlayerController.InSendWeaponIds = {}; @@ -419,11 +419,15 @@ function UGCPlayerController:SendWeaponParts(InList) end else for i, v in pairs(InList) do - table.insert(self.InSendWeaponIds, i > 10000 and i or v); + table.insert(self.InSendWeaponIds, v); end end - if table.isEmpty(self.InSendWeaponIds) then return self:CloseWeaponPartsTimer(); end + + UGCLogSystem.LogTree(string.format("[UGCPlayerController:SendWeaponParts] InSendWeaponIds ="), self.InSendWeaponIds) + + if table.isEmpty(self.InSendWeaponIds) then self:CloseWeaponPartsTimer(); end self.SendPartsTimer = UGCEventSystem.SetTimerLoop(self, function() + UGCLogSystem.Log("[UGCPlayerController:SendWeaponParts] 发送 Parts") self:SendPartsRPC(); end, 0.5) end @@ -444,19 +448,23 @@ function UGCPlayerController:SendPartsRPC(InTotal, InList) local SendTable = {}; if Count <= self.OneSendWeaponPartsCount then for i, WeaponID in pairs(self.InSendWeaponIds) do - SendTable[WeaponID] = Weapons[WeaponID] or {}; + SendTable[WeaponID] = Weapons[WeaponID]; end self.InSendWeaponIds = {}; self:CloseWeaponPartsTimer(); else for i = 1, self.OneSendWeaponPartsCount do local WeaponID = self.InSendWeaponIds[1]; - SendTable[WeaponID] = Weapons[WeaponID] or {}; + SendTable[WeaponID] = Weapons[WeaponID]; table.remove(self.InSendWeaponIds, 1); end end + UGCLogSystem.LogTree(string.format("[UGCPlayerController:SendPartsRPC] SendTable ="), SendTable) + if table.isEmpty(SendTable) then return; end UnrealNetwork.CallUnrealRPC(self, self, "SendPartsRPC", InTotal or table.getCount(SendTable), SendTable); else + UGCLogSystem.Log("[UGCPlayerController:SendPartsRPC] 接收到 Total = %s", tostring(InTotal)); + table.printTable(InList) 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 @@ -465,6 +473,7 @@ function UGCPlayerController:SendPartsRPC(InTotal, InList) -- 查看是否完全了 if table.getCount(ArchiveTable[self.PlayerKey].Weapons) == InTotal or InTotal == -1 then -- 更新存档武器 + UGCEventSystem.SendEvent(EventTypes.UpdateArchiveData, ArchiveTable); end end end diff --git a/SoloKing/Script/Blueprint/UGCPlayerPawn.lua b/SoloKing/Script/Blueprint/UGCPlayerPawn.lua index f42716d8..b43628e3 100644 --- a/SoloKing/Script/Blueprint/UGCPlayerPawn.lua +++ b/SoloKing/Script/Blueprint/UGCPlayerPawn.lua @@ -321,7 +321,6 @@ end --- 更新武器配件 function UGCPlayerPawn:UpdateWeaponParts(WeaponID, WeaponParts) ArchiveTable[self.PlayerKey].Weapons[WeaponID] = WeaponParts; - local Weapons = {}; for i, Enum in pairs(AllWeaponEnums) do local Weapon = UGCWeaponManagerSystem.GetWeaponBySlot(self, Enum); @@ -346,6 +345,16 @@ function UGCPlayerPawn:UpdateWeaponParts(WeaponID, WeaponParts) UGCLogSystem.LogError("[UGCPlayerPawn:UpdateWeaponParts] 当前武器跟设置的武器不相同，检查一下, WeaponID : %d", WeaponID); end end + + UnrealNetwork.CallUnrealRPC(self:GetPlayerControllerSafety(), self, "RecvWeaponParts", WeaponID, WeaponParts); +end + +function UGCPlayerPawn:RecvWeaponParts(WeaponID, Parts) + if table.isEmpty(ArchiveTable[LocalPlayerKey]) then ArchiveTable[LocalPlayerKey] = {}; end + if table.isEmpty(ArchiveTable[LocalPlayerKey].Weapons) then ArchiveTable[LocalPlayerKey].Weapons = {}; end + ArchiveTable[LocalPlayerKey].Weapons[WeaponID] = Parts; + UGCLogSystem.LogTree(string.format("[UGCPlayerPawn:RecvWeaponParts] Parts ="), Parts) + UGCEventSystem.SendEvent(EventTypes.UpdateWeapons, WeaponID) end --- 发送 RPC 进行再次同步 diff --git a/SoloKing/Script/Global/EventTypes.lua b/SoloKing/Script/Global/EventTypes.lua index 685ab688..4d236ffa 100644 --- a/SoloKing/Script/Global/EventTypes.lua +++ b/SoloKing/Script/Global/EventTypes.lua @@ -39,4 +39,5 @@ EventTypes = EventTypes or { AllLastGamesAlready = CountTable(); -- 所有存档数据准备就绪 AllSelectWeaponsAlready = CountTable(); -- 所有存档数据准备就绪 UpdateEnterWeapons = CountTable(); -- 所有存档数据准备就绪 + UpdateWeapons = CountTable(); -- 所有存档数据准备就绪 } diff --git a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua index 1b11dd32..36daf679 100644 --- a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua +++ b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua @@ -1417,8 +1417,10 @@ function Mini_Solo:OnRoundFormalStart() self:PlayerAddWeapon(PlayerKey, self.CurrWeaponItem[PlayerKey]); end end + -- 移除对应的东西 self:DOREPONCE("SelectWeapons"); + GameState:SetSelectGameMode(self.ModeType); UGCLogSystem.LogTree(string.format("[Mini_Solo:OnRoundFormalStart] SelectWeapons End"), self.SelectWeapons) else UGCLogSystem.Log("[Mini_Solo:OnRoundFormalStart] 娱乐模式") diff --git a/SoloKing/Script/Global/Table/WeaponTable.lua b/SoloKing/Script/Global/Table/WeaponTable.lua index 35055557..aaea4b3f 100644 --- a/SoloKing/Script/Global/Table/WeaponTable.lua +++ b/SoloKing/Script/Global/Table/WeaponTable.lua @@ -243,7 +243,7 @@ EnglishNamedWeapon = { WeaponTypeParts = { [EWeaponPartType.Muzzle] = { 201001, 201002, 201003, 201004, 201005, 201006, 201007, 201008, 201009, 201010, 201011, 201012, 201050, 201051 }, [EWeaponPartType.Grip] = { 202001, 202002, 202004, 202005, 202006, 202007 }, - [EWeaponPartType.Telescope] = { 203001, 203002, 203003, 203004, 203005, 203014, 203015, 203018, 203023, 203024, 203104 }, + [EWeaponPartType.Telescope] = { 203001, 203002, 203003, 203004, 203005, 203014, 203015, 203023, 203024, 203104 }, [EWeaponPartType.Magazine] = { 204001, 204002, 204003, 204004, 204005, 204006, 204007, 204008, 204009, 204010, 204011, 204012, 204013, 204014, 204015, 204016, 204017 }, [EWeaponPartType.ButtStock] = { 205001, 205002, 205003, 205004, }, [EWeaponPartType.SubTelescope] = { 203018, }, @@ -389,11 +389,11 @@ WeaponParts = { }, [203018] = { ID = 203018, - Type = EWeaponPartType.Telescope, + Type = EWeaponPartType.SubTelescope, -- Name = "侧面瞄准镜", }, -- [203023] = { ID = 203023, Type = EWeaponPartType.Telescope, Name = "红点UV瞄准镜", WrapperClass = , - -- Icon = "/Game/Arts/UI/TableIcons/ItemIcon/Attach/Icon_MZJ_HD.Icon_MZJ_HD", }, + -- }, -- [203024] = { ID = 203024, Type = EWeaponPartType.Telescope, Name = "全息UV瞄准镜", WrapperClass = , -- Icon = "/Game/Arts/UI/TableIcons/ItemIcon/Attach/Icon_MZJ_QX.Icon_MZJ_QX", }, [204001] = { diff --git a/SoloKing/Script/UI/SelectWeapons/Item/WB_WeaponItem.lua b/SoloKing/Script/UI/SelectWeapons/Item/WB_WeaponItem.lua index 7a9ffad6..34c12b9e 100644 --- a/SoloKing/Script/UI/SelectWeapons/Item/WB_WeaponItem.lua +++ b/SoloKing/Script/UI/SelectWeapons/Item/WB_WeaponItem.lua @@ -25,6 +25,12 @@ function WB_WeaponItem:LuaInit() self.bInitDoOnce = true -- 在这里修改 存档中的武器配件存档修改同步后触发 CustomWeaponParts = {[WeaponID] = {PartID, PartID, PartID, ...}, ...} -- UGCEventSystem.AddListener(ArchiveDataConfig.GetParamNotifyEvent(ArchiveDataConfig.EArchiveType.CustomWeaponParts), self.SetWeaponID, self) + UGCEventSystem.AddListener(EventTypes.UpdateWeapons, self.OnUpdateWeapons, self) +end + +function WB_WeaponItem:OnUpdateWeapons(Weapon) + UGCLogSystem.Log("[WB_WeaponItem:OnUpdateWeapons] 更新 WeaponID = %s", tostring(Weapon)); + self:SetWeaponID(self.WeaponID); end function WB_WeaponItem:SetWeaponID(WeaponID) @@ -34,13 +40,8 @@ function WB_WeaponItem:SetWeaponID(WeaponID) end local Parts = MyWeaponSystem.GetWeaponBastParts(self.WeaponID) local PartList = UE.GetLocalArchiveData("Weapons") - local CustomWeaponParts = nil; - if PartList then - CustomWeaponParts = PartList[self.WeaponID]; - end - - if CustomWeaponParts and CustomWeaponParts[self.WeaponID] then - Parts = CustomWeaponParts[self.WeaponID] + if PartList and PartList[self.WeaponID] then + Parts = PartList[self.WeaponID] UGCLogSystem.LogTree("[WB_WeaponItem_SetWeaponID] Parts:", Parts) end if Parts then diff --git a/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.lua b/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.lua index 9b75d492..3bcc85df 100644 --- a/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.lua +++ b/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveOtherWeaponItem.lua @@ -9,9 +9,9 @@ ---@field TextBlock_WeaponName UTextBlock --Edit Below-- local WB_SaveOtherWeaponItem = { - bInitDoOnce = false; - PartTypeToPartItem = {}; - IsSelected = false; + bInitDoOnce = false; + PartTypeToPartItem = {}; + IsSelected = false; }; --[==[ Construct @@ -30,176 +30,184 @@ end function WB_SaveOtherWeaponItem:LuaInit() if self.bInitDoOnce then - return; + return ; end self.bInitDoOnce = true; WidgetLibrary.BindButtonClicked(self.NewButton_Select, self.ClickSelect, self) + + -- 设置配件类型 + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + Item:LuaInit() + Item:SetPartType(PartTypeDisplayOrder[i]) + Item:BindSelectCallBack(self.ClickPart, self) + if PartTypeDisplayOrder[i] then + self.PartTypeToPartItem[PartTypeDisplayOrder[i]] = Item + end + end + for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do + local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) + Item:LuaInit() + Item:SetSelectStyle(1) + Item:BindSelectCallBack(self.ClickSelectPart, self) + end + + UGCEventSystem.AddListener(EventTypes.UpdateWeapons, self.OnUpdateWeapons, self) +end - -- 设置配件类型 - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - Item:LuaInit() - Item:SetPartType(PartTypeDisplayOrder[i]) - Item:BindSelectCallBack(self.ClickPart, self) - if PartTypeDisplayOrder[i] then - self.PartTypeToPartItem[PartTypeDisplayOrder[i]] = Item - end - end - for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do - local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) - Item:LuaInit() - Item:SetSelectStyle(1) - Item:BindSelectCallBack(self.ClickSelectPart, self) - end +function WB_SaveOtherWeaponItem:OnUpdateWeapons(WeaponID) + UGCLogSystem.Log("[WB_SaveWeaponItem:OnUpdateWeapons] WeaponID = %d", WeaponID); + self:SetWeaponID(self.WeaponID); end function WB_SaveOtherWeaponItem:SetIndex(InIndex) - self.Index = InIndex - self:LuaInit() + self.Index = InIndex + self:LuaInit() end function WB_SaveOtherWeaponItem:GetIndex() - return self.Index + return self.Index end function WB_SaveOtherWeaponItem:BindClickSelect(Func, Obj) - self.SelectCallBackFunc = Func - self.SelectCallBackObj = Obj + self.SelectCallBackFunc = Func + self.SelectCallBackObj = Obj end function WB_SaveOtherWeaponItem:ClickSelect() - -- UGCLogSystem.Log("[WB_BuffSelectItem_ClickSelect]") - if self.SelectCallBackFunc then - if self.SelectCallBackObj then - self.SelectCallBackFunc(self.SelectCallBackObj, self:GetIndex()) - else - self.SelectCallBackFunc(self:GetIndex()) - end - end + -- UGCLogSystem.Log("[WB_BuffSelectItem_ClickSelect]") + if self.SelectCallBackFunc then + if self.SelectCallBackObj then + self.SelectCallBackFunc(self.SelectCallBackObj, self:GetIndex()) + else + self.SelectCallBackFunc(self:GetIndex()) + end + end end function WB_SaveOtherWeaponItem:SetSelect(IsSelect) - if self.IsSelected ~= IsSelect then - self.IsSelected = IsSelect - if IsSelect then - self.Image_IsSelect:SetVisibility(ESlateVisibility.SelfHitTestInvisible); - --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.SelfHitTestInvisible); - else - self.Image_IsSelect:SetVisibility(ESlateVisibility.Collapsed); - --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.Collapsed); - -- self:SetSelectPartType(nil) - end - end + if self.IsSelected ~= IsSelect then + self.IsSelected = IsSelect + if IsSelect then + self.Image_IsSelect:SetVisibility(ESlateVisibility.SelfHitTestInvisible); + --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.SelfHitTestInvisible); + else + self.Image_IsSelect:SetVisibility(ESlateVisibility.Collapsed); + --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.Collapsed); + -- self:SetSelectPartType(nil) + end + end end function WB_SaveOtherWeaponItem:GetWeaponID() - return self.WeaponID + return self.WeaponID end function WB_SaveOtherWeaponItem:SetWeaponID(WeaponID) - if self.WeaponID ~= WeaponID then - self.WeaponID = WeaponID - local WeaponParts = MyWeaponSystem.GetWeaponBastParts(self.WeaponID) - -- 在这里修改 获取存档中的武器配件存档 CustomWeaponParts = {[WeaponID] = {PartID, PartID, PartID, ...}, ...} - -- local CustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(UGCSystemLibrary.GetLocalPlayerKey(), ArchiveDataConfig.EArchiveType.CustomWeaponParts) - local CustomWeaponParts = nil - - if CustomWeaponParts and CustomWeaponParts[self.WeaponID] then - WeaponParts = CustomWeaponParts[self.WeaponID] - end - local WeaponPartsMap = MyWeaponSystem.PartListToPartMap(WeaponParts) - local UpdateSelectPartsOnce = false - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - local PartType = Item:GetPartType() - local ItemID = WeaponPartsMap[PartType] - Item:SetItemID(ItemID) - -- 设置当前默认选择的Part - if ItemID and not UpdateSelectPartsOnce then - UpdateSelectPartsOnce = true - self:SetSelectPartType(PartType) - end - end - if not UpdateSelectPartsOnce then - self:SetSelectPartType(nil) - end - - MyWeaponSystem.AsyncLoadItemSmallIconToBrush(self.WeaponID, self.Image_WeaponIcon) - self.TextBlock_WeaponName:SetText(MyWeaponSystem.GetItemName(self.WeaponID)) - end + self.WeaponID = WeaponID + local WeaponParts = MyWeaponSystem.GetWeaponBastParts(self.WeaponID) + -- 在这里修改 获取存档中的武器配件存档 CustomWeaponParts = {[WeaponID] = {PartID, PartID, PartID, ...}, ...} + -- local CustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(UGCSystemLibrary.GetLocalPlayerKey(), ArchiveDataConfig.EArchiveType.CustomWeaponParts) + local CustomWeaponParts = nil + if not table.isEmpty(ArchiveTable[LocalPlayerKey]) then + CustomWeaponParts = ArchiveTable[LocalPlayerKey].Weapons + end + + if CustomWeaponParts and CustomWeaponParts[self.WeaponID] then + WeaponParts = CustomWeaponParts[self.WeaponID] + end + local WeaponPartsMap = MyWeaponSystem.PartListToPartMap(WeaponParts) + local UpdateSelectPartsOnce = false + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + local PartType = Item:GetPartType() + local ItemID = WeaponPartsMap[PartType] + Item:SetItemID(ItemID) + -- 设置当前默认选择的Part + if ItemID and not UpdateSelectPartsOnce then + UpdateSelectPartsOnce = true + self:SetSelectPartType(PartType) + end + end + if not UpdateSelectPartsOnce then + self:SetSelectPartType(nil) + end + + MyWeaponSystem.AsyncLoadItemSmallIconToBrush(self.WeaponID, self.Image_WeaponIcon) + self.TextBlock_WeaponName:SetText(MyWeaponSystem.GetItemName(self.WeaponID)) end function WB_SaveOtherWeaponItem:SetVisWeaponInfo(IsVis) - if IsVis then - self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.HitTestInvisible) - else - self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.Hidden) - end + if IsVis then + self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.HitTestInvisible) + else + self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.Hidden) + end end function WB_SaveOtherWeaponItem:ClickPart(PartID) - if self.IsSelected then - local PartType = MyWeaponSystem.GetPartType(PartID) - self:SetSelectPartType(PartType) - else - self:ClickSelect() - end + if self.IsSelected then + local PartType = MyWeaponSystem.GetPartType(PartID) + self:SetSelectPartType(PartType) + else + self:ClickSelect() + end end --- 设置选择修改的类型 function WB_SaveOtherWeaponItem:SetSelectPartType(InPartType) - UGCLogSystem.Log("[WB_SaveOtherWeaponItem_SetSelectPartType] InPartType:%s", tostring(InPartType)) - self.SelectPartType = InPartType - local ItemID = -1 - if self.PartTypeToPartItem[InPartType] then - ItemID = self.PartTypeToPartItem[InPartType]:GetItemID() - end - local Parts = MyWeaponSystem.GetWeaponCanUsePartFromPartType(self.WeaponID, InPartType) - for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do - local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) - Item:SetItemID(Parts[i]) - Item:SetIsSelect(ItemID == Parts[i]) - end - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - Item:SetIsSelect(InPartType == Item:GetPartType()) - end + UGCLogSystem.Log("[WB_SaveOtherWeaponItem_SetSelectPartType] InPartType:%s", tostring(InPartType)) + self.SelectPartType = InPartType + local ItemID = -1 + if self.PartTypeToPartItem[InPartType] then + ItemID = self.PartTypeToPartItem[InPartType]:GetItemID() + end + local Parts = MyWeaponSystem.GetWeaponCanUsePartFromPartType(self.WeaponID, InPartType) + for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do + local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) + Item:SetItemID(Parts[i]) + Item:SetIsSelect(ItemID == Parts[i]) + end + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + Item:SetIsSelect(InPartType == Item:GetPartType()) + end end --- 修改显示的配件 function WB_SaveOtherWeaponItem:ClickSelectPart(PartID) - UGCLogSystem.Log("[WB_SaveOtherWeaponItem_ClickSelectPart] PartID:%s", tostring(PartID)) - local PartType = MyWeaponSystem.GetPartType(PartID) - local PartItem = self.PartTypeToPartItem[PartType] - if PartItem then - PartItem:SetItemID(PartID) - -- 设置已选择 - for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do - local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) - Item:SetIsSelect(PartID == Item:GetItemID()) - end - end + UGCLogSystem.Log("[WB_SaveOtherWeaponItem_ClickSelectPart] PartID:%s", tostring(PartID)) + local PartType = MyWeaponSystem.GetPartType(PartID) + local PartItem = self.PartTypeToPartItem[PartType] + if PartItem then + PartItem:SetItemID(PartID) + -- 设置已选择 + for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do + local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) + Item:SetIsSelect(PartID == Item:GetItemID()) + end + end end --- 获取当前修改后的配件信息 function WB_SaveOtherWeaponItem:GetAllParts() - local Res = {} - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - local ItemID = Item:GetItemID() - if ItemID and MyWeaponSystem.IsWeaponPartValid(ItemID) then - Res[#Res + 1] = ItemID - end - end - return Res + local Res = {} + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + local ItemID = Item:GetItemID() + if ItemID and MyWeaponSystem.IsWeaponPartValid(ItemID) then + Res[#Res + 1] = ItemID + end + end + return Res end function WB_SaveOtherWeaponItem:SetWeaponSocketType(InSocketType) - self.WeaponSocketType = InSocketType + self.WeaponSocketType = InSocketType end function WB_SaveOtherWeaponItem:GetWeaponSocketType() - return self.WeaponSocketType + return self.WeaponSocketType end return WB_SaveOtherWeaponItem; \ No newline at end of file diff --git a/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua b/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua index 625ac11a..f707d00a 100644 --- a/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua +++ b/SoloKing/Script/UI/SelectWeapons/SaveCustomWeaponItem/WB_SaveWeaponItem.lua @@ -9,9 +9,9 @@ ---@field TextBlock_WeaponName UTextBlock --Edit Below-- local WB_SaveWeaponItem = { - bInitDoOnce = false; - PartTypeToPartItem = {}; - IsSelected = false; + bInitDoOnce = false; + PartTypeToPartItem = {}; + IsSelected = false; }; --[==[ Construct @@ -30,181 +30,189 @@ end function WB_SaveWeaponItem:LuaInit() if self.bInitDoOnce then - return; + return ; end self.bInitDoOnce = true; WidgetLibrary.BindButtonClicked(self.NewButton_Select, self.ClickSelect, self) + + -- 设置配件类型 + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + Item:LuaInit() + Item:SetPartType(PartTypeDisplayOrder[i]) + Item:BindSelectCallBack(self.ClickPart, self) + if PartTypeDisplayOrder[i] then + self.PartTypeToPartItem[PartTypeDisplayOrder[i]] = Item + end + end + for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do + local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) + Item:LuaInit() + Item:SetSelectStyle(1) + Item:BindSelectCallBack(self.ClickSelectPart, self) + end + + UGCEventSystem.AddListener(EventTypes.UpdateWeapons, self.OnUpdateWeapons, self) +end - -- 设置配件类型 - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - Item:LuaInit() - Item:SetPartType(PartTypeDisplayOrder[i]) - Item:BindSelectCallBack(self.ClickPart, self) - if PartTypeDisplayOrder[i] then - self.PartTypeToPartItem[PartTypeDisplayOrder[i]] = Item - end - end - for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do - local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) - Item:LuaInit() - Item:SetSelectStyle(1) - Item:BindSelectCallBack(self.ClickSelectPart, self) - end +function WB_SaveWeaponItem:OnUpdateWeapons(WeaponID) + UGCLogSystem.Log("[WB_SaveWeaponItem:OnUpdateWeapons] WeaponID = %d", WeaponID); + self:SetWeaponID(self.WeaponID); end function WB_SaveWeaponItem:SetIndex(InIndex) - self.Index = InIndex - self:LuaInit() + self.Index = InIndex + self:LuaInit() end function WB_SaveWeaponItem:GetIndex() - return self.Index + return self.Index end function WB_SaveWeaponItem:BindClickSelect(Func, Obj) - self.SelectCallBackFunc = Func - self.SelectCallBackObj = Obj + self.SelectCallBackFunc = Func + self.SelectCallBackObj = Obj end function WB_SaveWeaponItem:ClickSelect() - -- UGCLogSystem.Log("[WB_BuffSelectItem_ClickSelect]") - if self.SelectCallBackFunc then - if self.SelectCallBackObj then - self.SelectCallBackFunc(self.SelectCallBackObj, self:GetIndex()) - else - self.SelectCallBackFunc(self:GetIndex()) - end - end + -- UGCLogSystem.Log("[WB_BuffSelectItem_ClickSelect]") + if self.SelectCallBackFunc then + if self.SelectCallBackObj then + self.SelectCallBackFunc(self.SelectCallBackObj, self:GetIndex()) + else + self.SelectCallBackFunc(self:GetIndex()) + end + end end function WB_SaveWeaponItem:SetSelect(IsSelect) - if self.IsSelected ~= IsSelect then - self.IsSelected = IsSelect - if IsSelect then - self.Image_IsSelect:SetVisibility(ESlateVisibility.SelfHitTestInvisible); - --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.SelfHitTestInvisible); - else - self.Image_IsSelect:SetVisibility(ESlateVisibility.Collapsed); - --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.Collapsed); - -- self:SetSelectPartType(nil) - end - end + if self.IsSelected ~= IsSelect then + self.IsSelected = IsSelect + if IsSelect then + self.Image_IsSelect:SetVisibility(ESlateVisibility.SelfHitTestInvisible); + --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.SelfHitTestInvisible); + else + self.Image_IsSelect:SetVisibility(ESlateVisibility.Collapsed); + --self.CanvasPanel_SelectPartsPanel:SetVisibility(ESlateVisibility.Collapsed); + -- self:SetSelectPartType(nil) + end + end end function WB_SaveWeaponItem:GetWeaponID() - return self.WeaponID + return self.WeaponID end function WB_SaveWeaponItem:SetWeaponID(WeaponID) - if self.WeaponID ~= WeaponID then - self.WeaponID = WeaponID - local WeaponParts = MyWeaponSystem.GetWeaponBastParts(self.WeaponID) - -- 在这里修改 获取存档中的武器配件存档 CustomWeaponParts = {[WeaponID] = {PartID, PartID, PartID, ...}, ...} - -- local CustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(UGCSystemLibrary.GetLocalPlayerKey(), ArchiveDataConfig.EArchiveType.CustomWeaponParts) - local CustomWeaponParts = nil - - if CustomWeaponParts and CustomWeaponParts[self.WeaponID] then - WeaponParts = CustomWeaponParts[self.WeaponID] - end - local WeaponPartsMap = MyWeaponSystem.PartListToPartMap(WeaponParts) - if WeaponSuits[WeaponID] then - for i, v in pairs(WeaponSuits[WeaponID]) do - if WeaponPartsMap[i] == nil then WeaponPartsMap[i] = 0 end - end + self.WeaponID = WeaponID + local WeaponParts = MyWeaponSystem.GetWeaponBastParts(self.WeaponID) + -- 在这里修改 获取存档中的武器配件存档 CustomWeaponParts = {[WeaponID] = {PartID, PartID, PartID, ...}, ...} + -- local CustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(UGCSystemLibrary.GetLocalPlayerKey(), ArchiveDataConfig.EArchiveType.CustomWeaponParts) + local CustomWeaponParts = nil + if not table.isEmpty(ArchiveTable[LocalPlayerKey]) then + CustomWeaponParts = ArchiveTable[LocalPlayerKey].Weapons + end + + if CustomWeaponParts and CustomWeaponParts[self.WeaponID] then + WeaponParts = CustomWeaponParts[self.WeaponID] + end + local WeaponPartsMap = MyWeaponSystem.PartListToPartMap(WeaponParts) + if WeaponSuits[WeaponID] then + for i, v in pairs(WeaponSuits[WeaponID]) do + if WeaponPartsMap[i] == nil then WeaponPartsMap[i] = 0 end end - local UpdateSelectPartsOnce = false - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - local PartType = Item:GetPartType() - local ItemID = WeaponPartsMap[PartType] - Item:SetItemID(ItemID) - -- 设置当前默认选择的Part - if ItemID and not UpdateSelectPartsOnce then - UpdateSelectPartsOnce = true - self:SetSelectPartType(PartType) - end - end - if not UpdateSelectPartsOnce then - self:SetSelectPartType(nil) - end - - MyWeaponSystem.AsyncLoadItemBigIconToBrush(self.WeaponID, self.Image_WeaponIcon) - self.TextBlock_WeaponName:SetText(MyWeaponSystem.GetItemName(self.WeaponID)) - end + end + local UpdateSelectPartsOnce = false + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + local PartType = Item:GetPartType() + local ItemID = WeaponPartsMap[PartType] + Item:SetItemID(ItemID) + -- 设置当前默认选择的Part + if ItemID and not UpdateSelectPartsOnce then + UpdateSelectPartsOnce = true + self:SetSelectPartType(PartType) + end + end + if not UpdateSelectPartsOnce then + self:SetSelectPartType(nil) + end + + MyWeaponSystem.AsyncLoadItemBigIconToBrush(self.WeaponID, self.Image_WeaponIcon) + self.TextBlock_WeaponName:SetText(MyWeaponSystem.GetItemName(self.WeaponID)) end function WB_SaveWeaponItem:SetVisWeaponInfo(IsVis) - if IsVis then - self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.HitTestInvisible) - else - self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.Hidden) - end + if IsVis then + self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.HitTestInvisible) + else + self.CanvasPanel_WeaponInfo:SetVisibility(ESlateVisibility.Hidden) + end end function WB_SaveWeaponItem:ClickPart(PartID) - if self.IsSelected then - local PartType = MyWeaponSystem.GetPartType(PartID) - self:SetSelectPartType(PartType) - else - self:ClickSelect() - end + if self.IsSelected then + local PartType = MyWeaponSystem.GetPartType(PartID) + self:SetSelectPartType(PartType) + else + self:ClickSelect() + end end --- 设置选择修改的类型 function WB_SaveWeaponItem:SetSelectPartType(InPartType) - UGCLogSystem.Log("[WB_SaveWeaponItem_SetSelectPartType] InPartType:%s", tostring(InPartType)) - self.SelectPartType = InPartType - local ItemID = -1 - if self.PartTypeToPartItem[InPartType] then - ItemID = self.PartTypeToPartItem[InPartType]:GetItemID() - end - local Parts = MyWeaponSystem.GetWeaponCanUsePartFromPartType(self.WeaponID, InPartType) - for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do - local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) - Item:SetItemID(Parts[i]) - Item:SetIsSelect(ItemID == Parts[i]) - end - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - Item:SetIsSelect(InPartType == Item:GetPartType()) - end + UGCLogSystem.Log("[WB_SaveWeaponItem_SetSelectPartType] InPartType:%s", tostring(InPartType)) + self.SelectPartType = InPartType + local ItemID = -1 + if self.PartTypeToPartItem[InPartType] then + ItemID = self.PartTypeToPartItem[InPartType]:GetItemID() + end + local Parts = MyWeaponSystem.GetWeaponCanUsePartFromPartType(self.WeaponID, InPartType) + for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do + local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) + Item:SetItemID(Parts[i]) + --Item:SetIsSelect(ItemID == Parts[i]) + end + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + --Item:SetIsSelect(InPartType == Item:GetPartType()) + end end --- 修改显示的配件 function WB_SaveWeaponItem:ClickSelectPart(PartID) - UGCLogSystem.Log("[WB_SaveWeaponItem_ClickSelectPart] PartID:%s", tostring(PartID)) - local PartType = MyWeaponSystem.GetPartType(PartID) - local PartItem = self.PartTypeToPartItem[PartType] - if PartItem then - PartItem:SetItemID(PartID) - -- 设置已选择 - for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do - local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) - Item:SetIsSelect(PartID == Item:GetItemID()) - end - end + UGCLogSystem.Log("[WB_SaveWeaponItem_ClickSelectPart] PartID:%s", tostring(PartID)) + local PartType = MyWeaponSystem.GetPartType(PartID) + local PartItem = self.PartTypeToPartItem[PartType] + if PartItem then + PartItem:SetItemID(PartID) + -- 设置已选择 + for i = 1, self.ScrollBox_SelectParts:GetChildrenCount() do + local Item = self.ScrollBox_SelectParts:GetChildAt(i - 1) + --Item:SetIsSelect(PartID == Item:GetItemID()) + end + end end --- 获取当前修改后的配件信息 function WB_SaveWeaponItem:GetAllParts() - local Res = {} - for i = 1, self.HorizontalBox_Part:GetChildrenCount() do - local Item = self.HorizontalBox_Part:GetChildAt(i - 1) - local ItemID = Item:GetItemID() - if ItemID and MyWeaponSystem.IsWeaponPartValid(ItemID) then - Res[#Res + 1] = ItemID - end - end - return Res + local Res = {} + for i = 1, self.HorizontalBox_Part:GetChildrenCount() do + local Item = self.HorizontalBox_Part:GetChildAt(i - 1) + local ItemID = Item:GetItemID() + if ItemID and MyWeaponSystem.IsWeaponPartValid(ItemID) then + Res[#Res + 1] = ItemID + end + end + return Res end function WB_SaveWeaponItem:SetWeaponSocketType(InSocketType) - self.WeaponSocketType = InSocketType + self.WeaponSocketType = InSocketType end function WB_SaveWeaponItem:GetWeaponSocketType() - return self.WeaponSocketType + return self.WeaponSocketType end return WB_SaveWeaponItem; \ No newline at end of file diff --git a/SoloKing/Script/UI/SelectWeapons/WB_WeaponSelect_New.lua b/SoloKing/Script/UI/SelectWeapons/WB_WeaponSelect_New.lua index 5a5537d9..fbfcd35c 100644 --- a/SoloKing/Script/UI/SelectWeapons/WB_WeaponSelect_New.lua +++ b/SoloKing/Script/UI/SelectWeapons/WB_WeaponSelect_New.lua @@ -19,6 +19,7 @@ function WB_WeaponSelect_New:Construct() WidgetLibrary.BindButtonClicked(self.Button_Select, self.SelectWeapon, self) UGCEventSystem.AddListener(EventTypes.UpdateArchiveData, self.LoadArchiveTable, self); UGCEventSystem.AddListener(EventTypes.UpdateEnterWeapons, self.LoadArchiveTable, self); + UGCEventSystem.AddListener(EventTypes.UpdateWeapons, self.UpdateWeaponCombination, self); self:LoadArchiveTable(); -- 判断是否可以修改配置 WidgetLibrary.BindButtonClicked(self.Button_Custom, self.CustomWeaponComb, self) diff --git a/SoloKing/Script/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.lua b/SoloKing/Script/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.lua index 82f3aa7d..afb58f83 100644 --- a/SoloKing/Script/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.lua +++ b/SoloKing/Script/UI/SelectWeapons/WeaponConfiguration/WB_WeaponConfiguration.lua @@ -142,14 +142,14 @@ end --- 设置选择修改的类型 function WB_WeaponConfiguration:SetSelectPartType(InPartType) UGCLogSystem.Log("[WB_WeaponConfiguration_SetSelectPartType] InPartType:%s", tostring(InPartType)) - self.SelectPartType = InPartType + self.SelectPartType = InPartType; local ItemID = -1 if self.PartTypeToPartItem[InPartType] then ItemID = self.PartTypeToPartItem[InPartType]:GetItemID() end local Info = WeaponTypeName[InPartType] - UGCLogSystem.LogTree(string.format("[WB_WeaponConfiguration:SetSelectPartType] Info ="), Info) + --UGCLogSystem.LogTree(string.format("[WB_WeaponConfiguration:SetSelectPartType] Info ="), Info) if Info then self.TextBlock_Parts:SetText('配件：' .. Info.Chinese); else diff --git a/SoloKing/Script/gamemode/Action_PlayerLogin.lua b/SoloKing/Script/gamemode/Action_PlayerLogin.lua index 43f3e82c..75d65a6e 100644 --- a/SoloKing/Script/gamemode/Action_PlayerLogin.lua +++ b/SoloKing/Script/gamemode/Action_PlayerLogin.lua @@ -160,6 +160,12 @@ function Action_PlayerLogin:Execute(...) --}; --ArchiveTable[self.PlayerKey].EnterWeaponIndex = 2; + --ArchiveTable[self.PlayerKey].Weapons = { + -- [102003] = { + -- 201002, 202007, 203003, 204006, 205002, 203018, + -- } + --} + GameState:HandleArchiveData(nil, { "GameTimes", "TotalGameTimes", diff --git a/SoloKing/SoloKing.ugcproj b/SoloKing/SoloKing.ugcproj index 630857cd..2aee0fab 100644 --- a/SoloKing/SoloKing.ugcproj +++ b/SoloKing/SoloKing.ugcproj @@ -7,7 +7,7 @@ ProjectShortPath=/SoloKing/ StartMapName=/SoloKing/UGCmap MapMode=0 bIsBigWorld=0 -Version=1.30.21.13234 +Version=1.30.21.13236 UpdateVersion=5 GameModePath=/SoloKing/Asset/Blueprint/UGCGameMode.UGCGameMode_C DefaultLevelDirectorPath=/Asset/Blueprint/UGCLevelDirector.UGCLevelDirector_C