diff --git a/Counterattack/Asset/Blueprint/PlaceItems/BP_ClientPreviewItemBase.uasset b/Counterattack/Asset/Blueprint/PlaceItems/BP_ClientPreviewItemBase.uasset index 0afe6fb0..a46a1cf1 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/BP_ClientPreviewItemBase.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/BP_ClientPreviewItemBase.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceItemBase.uasset b/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceItemBase.uasset index 7b39cf78..940a1364 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceItemBase.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceItemBase.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceModeManager.uasset b/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceModeManager.uasset index 73b7f507..602d0318 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceModeManager.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/BP_PlaceModeManager.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Airblower.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Airblower.uasset index 4db21b29..a4dd8095 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Airblower.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Airblower.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Preview_Airblower.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Preview_Airblower.uasset index 9a391d81..73728278 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Preview_Airblower.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Airblower/BP_Preview_Airblower.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_BigBunker.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_BigBunker.uasset index a56b21a9..7e8fcac0 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_BigBunker.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_BigBunker.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_Preview_BigBunker.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_Preview_BigBunker.uasset index 219ec5f7..aebbeaf3 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_Preview_BigBunker.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/BigBanker/BP_Preview_BigBunker.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Flamethrower.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Flamethrower.uasset index 64e40b18..16187a42 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Flamethrower.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Flamethrower.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Preview_Flamethrower.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Preview_Flamethrower.uasset index 239e3287..614e2e4b 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Preview_Flamethrower.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Flamethrower/BP_Preview_Flamethrower.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_LandMine.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_LandMine.uasset index c8de3620..9ea7e2aa 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_LandMine.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_LandMine.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_Preview_LandMine.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_Preview_LandMine.uasset index e5e5aec3..f7d97728 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_Preview_LandMine.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/LandMine/BP_Preview_LandMine.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Launch.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Launch.uasset index 117ea7ac..58397c46 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Launch.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Launch.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Preview_Launch.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Preview_Launch.uasset index a2f52af5..c3b513c5 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Preview_Launch.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Launch/BP_Preview_Launch.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Preview_Slope.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Preview_Slope.uasset index cca35ce9..b9443a11 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Preview_Slope.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Preview_Slope.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Slope.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Slope.uasset index 959c0f50..cd635adc 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Slope.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/Slope/BP_Slope.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_Preview_SmallBunker.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_Preview_SmallBunker.uasset index 5c3f8a12..95612dea 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_Preview_SmallBunker.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_Preview_SmallBunker.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_SmallBunker.uasset b/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_SmallBunker.uasset index 4fa605b8..ce6037f1 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_SmallBunker.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/Items/SmallBunker/BP_SmallBunker.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlaceItems/WB_PlacePonitTo.uasset b/Counterattack/Asset/Blueprint/PlaceItems/WB_PlacePonitTo.uasset index 27d285d5..d7d9d097 100644 Binary files a/Counterattack/Asset/Blueprint/PlaceItems/WB_PlacePonitTo.uasset and b/Counterattack/Asset/Blueprint/PlaceItems/WB_PlacePonitTo.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlayerStart/BP_CustomPlayerStart.uasset b/Counterattack/Asset/Blueprint/PlayerStart/BP_CustomPlayerStart.uasset index af2af353..147556ce 100644 Binary files a/Counterattack/Asset/Blueprint/PlayerStart/BP_CustomPlayerStart.uasset and b/Counterattack/Asset/Blueprint/PlayerStart/BP_CustomPlayerStart.uasset differ diff --git a/Counterattack/Asset/Blueprint/PlayerStart/BP_HDPlayerStart.uasset b/Counterattack/Asset/Blueprint/PlayerStart/BP_HDPlayerStart.uasset index f1b9351b..64190158 100644 Binary files a/Counterattack/Asset/Blueprint/PlayerStart/BP_HDPlayerStart.uasset and b/Counterattack/Asset/Blueprint/PlayerStart/BP_HDPlayerStart.uasset differ diff --git a/Counterattack/Asset/Blueprint/Post/HD_PostProcessMgr.uasset b/Counterattack/Asset/Blueprint/Post/HD_PostProcessMgr.uasset index 06a440fd..6bb17ab0 100644 Binary files a/Counterattack/Asset/Blueprint/Post/HD_PostProcessMgr.uasset and b/Counterattack/Asset/Blueprint/Post/HD_PostProcessMgr.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_KillBox.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_KillBox.uasset index 0c254c54..c33b055e 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_KillBox.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_KillBox.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_Launch.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_Launch.uasset index 0ad5f4fc..3fec6683 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_Launch.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_Launch.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_PlayerDeadParticle.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_PlayerDeadParticle.uasset index 6e317f31..01bbceaa 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_PlayerDeadParticle.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_PlayerDeadParticle.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_ResetHeight.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_ResetHeight.uasset index b5449a66..4d68facf 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_ResetHeight.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_ResetHeight.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_SpawnPickupWrapper.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_SpawnPickupWrapper.uasset index a70542c3..c580b4d3 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_SpawnPickupWrapper.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_SpawnPickupWrapper.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_TrackKillerCamera.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_TrackKillerCamera.uasset index ddd30663..4e6668db 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_TrackKillerCamera.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_TrackKillerCamera.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/BP_VehicleSpawnPoint.uasset b/Counterattack/Asset/Blueprint/SceneActor/BP_VehicleSpawnPoint.uasset index 8b6de13f..95c44d4d 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/BP_VehicleSpawnPoint.uasset and b/Counterattack/Asset/Blueprint/SceneActor/BP_VehicleSpawnPoint.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/Capture/BP_CaptureCamera.uasset b/Counterattack/Asset/Blueprint/SceneActor/Capture/BP_CaptureCamera.uasset index b02cbc9b..fef8cdc0 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/Capture/BP_CaptureCamera.uasset and b/Counterattack/Asset/Blueprint/SceneActor/Capture/BP_CaptureCamera.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_LineOfDefense.uasset b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_LineOfDefense.uasset index 918f0aaa..97c2ab06 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_LineOfDefense.uasset and b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_LineOfDefense.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PassagewayBlock.uasset b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PassagewayBlock.uasset index 11d43f9c..386eb32f 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PassagewayBlock.uasset and b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PassagewayBlock.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PlaceableArea.uasset b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PlaceableArea.uasset index dd700e02..ceb97a05 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PlaceableArea.uasset and b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/BP_PlaceableArea.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipLineOfDefense.uasset b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipLineOfDefense.uasset index d2650dd9..cfde06a7 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipLineOfDefense.uasset and b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipLineOfDefense.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipPassageway.uasset b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipPassageway.uasset index 4ba317fb..7b11f81c 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipPassageway.uasset and b/Counterattack/Asset/Blueprint/SceneActor/PlaceMode/WB_TipPassageway.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/BP_PlayerSelectMapOverlap.uasset b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/BP_PlayerSelectMapOverlap.uasset index 13e3139b..debb2614 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/BP_PlayerSelectMapOverlap.uasset and b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/BP_PlayerSelectMapOverlap.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_MechanismInfo_Select.uasset b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_MechanismInfo_Select.uasset index 1710ab5a..d552f90b 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_MechanismInfo_Select.uasset and b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_MechanismInfo_Select.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapBG.uasset b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapBG.uasset index c3411e04..ef779c7a 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapBG.uasset and b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapBG.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapInfo.uasset b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapInfo.uasset index 54bfddc3..aa754442 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapInfo.uasset and b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapInfo.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapName.uasset b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapName.uasset index aaf1fd7b..05ba1c53 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapName.uasset and b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMapName.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMiniMap.uasset b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMiniMap.uasset index 37f09898..c70fd0f0 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMiniMap.uasset and b/Counterattack/Asset/Blueprint/SceneActor/SelectMap/WB_ShowMiniMap.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamCTTip.uasset b/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamCTTip.uasset index f00c964f..9c2db799 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamCTTip.uasset and b/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamCTTip.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamTTip.uasset b/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamTTip.uasset index 1ba59b96..76c9f129 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamTTip.uasset and b/Counterattack/Asset/Blueprint/SceneActor/Team/BP_TeamTTip.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/Team/WB_CTTip.uasset b/Counterattack/Asset/Blueprint/SceneActor/Team/WB_CTTip.uasset index 58b37e17..3b83b6f6 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/Team/WB_CTTip.uasset and b/Counterattack/Asset/Blueprint/SceneActor/Team/WB_CTTip.uasset differ diff --git a/Counterattack/Asset/Blueprint/SceneActor/Team/WB_TTip.uasset b/Counterattack/Asset/Blueprint/SceneActor/Team/WB_TTip.uasset index 303f9167..e93f2ec5 100644 Binary files a/Counterattack/Asset/Blueprint/SceneActor/Team/WB_TTip.uasset and b/Counterattack/Asset/Blueprint/SceneActor/Team/WB_TTip.uasset differ diff --git a/Counterattack/Asset/Blueprint/Skill/DetectActor/BPC_DetectPlayerNew.uasset b/Counterattack/Asset/Blueprint/Skill/DetectActor/BPC_DetectPlayerNew.uasset index 91fff9fb..cd12381b 100644 Binary files a/Counterattack/Asset/Blueprint/Skill/DetectActor/BPC_DetectPlayerNew.uasset and b/Counterattack/Asset/Blueprint/Skill/DetectActor/BPC_DetectPlayerNew.uasset differ diff --git a/Counterattack/Asset/Blueprint/Skill/DetectActor/BP_DetectPlayerNew.uasset b/Counterattack/Asset/Blueprint/Skill/DetectActor/BP_DetectPlayerNew.uasset index 65e0272b..e0c8669d 100644 Binary files a/Counterattack/Asset/Blueprint/Skill/DetectActor/BP_DetectPlayerNew.uasset and b/Counterattack/Asset/Blueprint/Skill/DetectActor/BP_DetectPlayerNew.uasset differ diff --git a/Counterattack/Asset/Blueprint/Skill/Skill_DetectPlayer.uasset b/Counterattack/Asset/Blueprint/Skill/Skill_DetectPlayer.uasset index 623f8895..4d9deb7b 100644 Binary files a/Counterattack/Asset/Blueprint/Skill/Skill_DetectPlayer.uasset and b/Counterattack/Asset/Blueprint/Skill/Skill_DetectPlayer.uasset differ diff --git a/Counterattack/Asset/Blueprint/Skill/Skill_Fly.uasset b/Counterattack/Asset/Blueprint/Skill/Skill_Fly.uasset index 90bc44ca..ef16dcbe 100644 Binary files a/Counterattack/Asset/Blueprint/Skill/Skill_Fly.uasset and b/Counterattack/Asset/Blueprint/Skill/Skill_Fly.uasset differ diff --git a/Counterattack/Asset/Blueprint/Skill/Skill_My_MultiJump.uasset b/Counterattack/Asset/Blueprint/Skill/Skill_My_MultiJump.uasset index 74901617..4bed0372 100644 Binary files a/Counterattack/Asset/Blueprint/Skill/Skill_My_MultiJump.uasset and b/Counterattack/Asset/Blueprint/Skill/Skill_My_MultiJump.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCGameMode.uasset b/Counterattack/Asset/Blueprint/UGCGameMode.uasset index ab17a17a..3efc74bf 100644 Binary files a/Counterattack/Asset/Blueprint/UGCGameMode.uasset and b/Counterattack/Asset/Blueprint/UGCGameMode.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCGameState.uasset b/Counterattack/Asset/Blueprint/UGCGameState.uasset index 6ba3dd6e..361115ca 100644 Binary files a/Counterattack/Asset/Blueprint/UGCGameState.uasset and b/Counterattack/Asset/Blueprint/UGCGameState.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCLevelDirector.uasset b/Counterattack/Asset/Blueprint/UGCLevelDirector.uasset index db11d559..8e4dae7b 100644 Binary files a/Counterattack/Asset/Blueprint/UGCLevelDirector.uasset and b/Counterattack/Asset/Blueprint/UGCLevelDirector.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCPlayerController.uasset b/Counterattack/Asset/Blueprint/UGCPlayerController.uasset index 68e5ff6c..a7fe2474 100644 Binary files a/Counterattack/Asset/Blueprint/UGCPlayerController.uasset and b/Counterattack/Asset/Blueprint/UGCPlayerController.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCPlayerPawn.uasset b/Counterattack/Asset/Blueprint/UGCPlayerPawn.uasset index ce759480..df3d3370 100644 Binary files a/Counterattack/Asset/Blueprint/UGCPlayerPawn.uasset and b/Counterattack/Asset/Blueprint/UGCPlayerPawn.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCPlayerStartManager.uasset b/Counterattack/Asset/Blueprint/UGCPlayerStartManager.uasset index f1932ddc..2b3a65e1 100644 Binary files a/Counterattack/Asset/Blueprint/UGCPlayerStartManager.uasset and b/Counterattack/Asset/Blueprint/UGCPlayerStartManager.uasset differ diff --git a/Counterattack/Asset/Blueprint/UGCPlayerState.uasset b/Counterattack/Asset/Blueprint/UGCPlayerState.uasset index 82baaac7..f2ea30ff 100644 Binary files a/Counterattack/Asset/Blueprint/UGCPlayerState.uasset and b/Counterattack/Asset/Blueprint/UGCPlayerState.uasset differ diff --git a/Counterattack/Asset/Level/HD_PS.umap b/Counterattack/Asset/Level/HD_PS.umap index d0d4473f..71e55e06 100644 Binary files a/Counterattack/Asset/Level/HD_PS.umap and b/Counterattack/Asset/Level/HD_PS.umap differ diff --git a/Counterattack/Asset/Temp/BP_HDTest.uasset b/Counterattack/Asset/Temp/BP_HDTest.uasset index f1b80150..631b8283 100644 Binary files a/Counterattack/Asset/Temp/BP_HDTest.uasset and b/Counterattack/Asset/Temp/BP_HDTest.uasset differ diff --git a/Counterattack/Asset/UGCLayout_BP.uasset b/Counterattack/Asset/UGCLayout_BP.uasset index 094370cb..77f8084a 100644 Binary files a/Counterattack/Asset/UGCLayout_BP.uasset and b/Counterattack/Asset/UGCLayout_BP.uasset differ diff --git a/Counterattack/Asset/UI/Broadcast/WB_Broadcast.uasset b/Counterattack/Asset/UI/Broadcast/WB_Broadcast.uasset index c64266d5..9d6864ce 100644 Binary files a/Counterattack/Asset/UI/Broadcast/WB_Broadcast.uasset and b/Counterattack/Asset/UI/Broadcast/WB_Broadcast.uasset differ diff --git a/Counterattack/Asset/UI/Broadcast/WB_BroadcastItem.uasset b/Counterattack/Asset/UI/Broadcast/WB_BroadcastItem.uasset index 3efb804a..b5a73363 100644 Binary files a/Counterattack/Asset/UI/Broadcast/WB_BroadcastItem.uasset and b/Counterattack/Asset/UI/Broadcast/WB_BroadcastItem.uasset differ diff --git a/Counterattack/Asset/UI/Debug/WB_Debug.uasset b/Counterattack/Asset/UI/Debug/WB_Debug.uasset index 45f1ab42..7ca304db 100644 Binary files a/Counterattack/Asset/UI/Debug/WB_Debug.uasset and b/Counterattack/Asset/UI/Debug/WB_Debug.uasset differ diff --git a/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDesc.uasset b/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDesc.uasset index 4fff4311..f74f0886 100644 Binary files a/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDesc.uasset and b/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDesc.uasset differ diff --git a/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDescItem.uasset b/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDescItem.uasset index a1948406..cfb4af1a 100644 Binary files a/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDescItem.uasset and b/Counterattack/Asset/UI/Guide/BuffDesc/WB_BuffDescItem.uasset differ diff --git a/Counterattack/Asset/UI/Guide/WB_Guide.uasset b/Counterattack/Asset/UI/Guide/WB_Guide.uasset index a420f74f..808e150b 100644 Binary files a/Counterattack/Asset/UI/Guide/WB_Guide.uasset and b/Counterattack/Asset/UI/Guide/WB_Guide.uasset differ diff --git a/Counterattack/Asset/UI/KillInfo/WB_KillInfo.uasset b/Counterattack/Asset/UI/KillInfo/WB_KillInfo.uasset index dc74703a..9a1dcbbb 100644 Binary files a/Counterattack/Asset/UI/KillInfo/WB_KillInfo.uasset and b/Counterattack/Asset/UI/KillInfo/WB_KillInfo.uasset differ diff --git a/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead.uasset b/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead.uasset index 5f1bc644..322f0a7d 100644 Binary files a/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead.uasset and b/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead.uasset differ diff --git a/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead_48.uasset b/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead_48.uasset index 6dea052b..3e13cbb9 100644 Binary files a/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead_48.uasset and b/Counterattack/Asset/UI/PlayerHead/WB_PlayerHead_48.uasset differ diff --git a/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_L.uasset b/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_L.uasset index 66dcbd11..1ca3a8c1 100644 Binary files a/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_L.uasset and b/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_L.uasset differ diff --git a/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_R.uasset b/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_R.uasset index 4a26e511..17a32df1 100644 Binary files a/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_R.uasset and b/Counterattack/Asset/UI/PlayerHead/WB_PlayerInfo_R.uasset differ diff --git a/Counterattack/Asset/UI/Rank/WB_TeamRank.uasset b/Counterattack/Asset/UI/Rank/WB_TeamRank.uasset index 5b76b04e..1c1bdb70 100644 Binary files a/Counterattack/Asset/UI/Rank/WB_TeamRank.uasset and b/Counterattack/Asset/UI/Rank/WB_TeamRank.uasset differ diff --git a/Counterattack/Asset/UI/Rank/WB_TeamRankItem.uasset b/Counterattack/Asset/UI/Rank/WB_TeamRankItem.uasset index a09f6399..089770ee 100644 Binary files a/Counterattack/Asset/UI/Rank/WB_TeamRankItem.uasset and b/Counterattack/Asset/UI/Rank/WB_TeamRankItem.uasset differ diff --git a/Counterattack/Asset/UI/ScreenEffect/WB_Vague.uasset b/Counterattack/Asset/UI/ScreenEffect/WB_Vague.uasset index 63cf5b14..c17d0e90 100644 Binary files a/Counterattack/Asset/UI/ScreenEffect/WB_Vague.uasset and b/Counterattack/Asset/UI/ScreenEffect/WB_Vague.uasset differ diff --git a/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset b/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset index 012c6c67..72170a1f 100644 Binary files a/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset and b/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation.uasset differ diff --git a/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_EditableText.uasset b/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_EditableText.uasset index 7c275ee5..2c4be419 100644 Binary files a/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_EditableText.uasset and b/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_EditableText.uasset differ diff --git a/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset b/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset index 33bb4631..542b656a 100644 Binary files a/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset and b/Counterattack/Asset/UI/SecondaryConfirmation/WB_SecondaryConfirmation_Strip.uasset differ diff --git a/Counterattack/Asset/UI/SelectBuff/WB_BaseBuffSelectItem.uasset b/Counterattack/Asset/UI/SelectBuff/WB_BaseBuffSelectItem.uasset index 4491e881..d9b35c6e 100644 Binary files a/Counterattack/Asset/UI/SelectBuff/WB_BaseBuffSelectItem.uasset and b/Counterattack/Asset/UI/SelectBuff/WB_BaseBuffSelectItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectBuff/WB_BuffSelectItem.uasset b/Counterattack/Asset/UI/SelectBuff/WB_BuffSelectItem.uasset index af153b26..f11d5cbe 100644 Binary files a/Counterattack/Asset/UI/SelectBuff/WB_BuffSelectItem.uasset and b/Counterattack/Asset/UI/SelectBuff/WB_BuffSelectItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectBuff/WB_SelectBaseBuff.uasset b/Counterattack/Asset/UI/SelectBuff/WB_SelectBaseBuff.uasset index 96799878..06e9134b 100644 Binary files a/Counterattack/Asset/UI/SelectBuff/WB_SelectBaseBuff.uasset and b/Counterattack/Asset/UI/SelectBuff/WB_SelectBaseBuff.uasset differ diff --git a/Counterattack/Asset/UI/SelectBuff/WB_SelectIncrease.uasset b/Counterattack/Asset/UI/SelectBuff/WB_SelectIncrease.uasset index 2c3aea48..bc9acfef 100644 Binary files a/Counterattack/Asset/UI/SelectBuff/WB_SelectIncrease.uasset and b/Counterattack/Asset/UI/SelectBuff/WB_SelectIncrease.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/Item/WB_OtherPartItem.uasset b/Counterattack/Asset/UI/SelectWeapon/Item/WB_OtherPartItem.uasset index 4563e0eb..4542e033 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/Item/WB_OtherPartItem.uasset and b/Counterattack/Asset/UI/SelectWeapon/Item/WB_OtherPartItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponItem.uasset b/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponItem.uasset index 2c46af2e..2ba630b2 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponItem.uasset and b/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponPartItem.uasset b/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponPartItem.uasset index 07e9d732..539aad62 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponPartItem.uasset and b/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponPartItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponSelectItem.uasset b/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponSelectItem.uasset index 05ff8873..68b52ac3 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponSelectItem.uasset and b/Counterattack/Asset/UI/SelectWeapon/Item/WB_WeaponSelectItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset b/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset index 5551b0cf..7aa281c7 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset and b/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SaveWeaponItem.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset b/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset index 37900584..371cee09 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset and b/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_SelectSaveWeapon.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_WeaponType.uasset b/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_WeaponType.uasset index 3de6f559..4df6ab76 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_WeaponType.uasset and b/Counterattack/Asset/UI/SelectWeapon/SaveCustomWeaponItem/WB_WeaponType.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/WB_CustomWeapon.uasset b/Counterattack/Asset/UI/SelectWeapon/WB_CustomWeapon.uasset index f5d43136..6ac3a685 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/WB_CustomWeapon.uasset and b/Counterattack/Asset/UI/SelectWeapon/WB_CustomWeapon.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/WB_ReselectWeaponBtn.uasset b/Counterattack/Asset/UI/SelectWeapon/WB_ReselectWeaponBtn.uasset index 4c53d4c7..70eb556e 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/WB_ReselectWeaponBtn.uasset and b/Counterattack/Asset/UI/SelectWeapon/WB_ReselectWeaponBtn.uasset differ diff --git a/Counterattack/Asset/UI/SelectWeapon/WB_WeaponSelect.uasset b/Counterattack/Asset/UI/SelectWeapon/WB_WeaponSelect.uasset index 248b7bb7..21bc7625 100644 Binary files a/Counterattack/Asset/UI/SelectWeapon/WB_WeaponSelect.uasset and b/Counterattack/Asset/UI/SelectWeapon/WB_WeaponSelect.uasset differ diff --git a/Counterattack/Asset/UI/Settlement/WB_Settlement.uasset b/Counterattack/Asset/UI/Settlement/WB_Settlement.uasset index 35c99040..edc48a30 100644 Binary files a/Counterattack/Asset/UI/Settlement/WB_Settlement.uasset and b/Counterattack/Asset/UI/Settlement/WB_Settlement.uasset differ diff --git a/Counterattack/Asset/UI/Settlement/WB_SettlementItem.uasset b/Counterattack/Asset/UI/Settlement/WB_SettlementItem.uasset index b1ff367f..9c532893 100644 Binary files a/Counterattack/Asset/UI/Settlement/WB_SettlementItem.uasset and b/Counterattack/Asset/UI/Settlement/WB_SettlementItem.uasset differ diff --git a/Counterattack/Asset/UI/Settlement/WB_TeamSettlement.uasset b/Counterattack/Asset/UI/Settlement/WB_TeamSettlement.uasset index f07fa5e4..2f5a5d01 100644 Binary files a/Counterattack/Asset/UI/Settlement/WB_TeamSettlement.uasset and b/Counterattack/Asset/UI/Settlement/WB_TeamSettlement.uasset differ diff --git a/Counterattack/Asset/UI/Settlement/WB_TeamSettlementItem.uasset b/Counterattack/Asset/UI/Settlement/WB_TeamSettlementItem.uasset index 3f8aeec1..10bf4d57 100644 Binary files a/Counterattack/Asset/UI/Settlement/WB_TeamSettlementItem.uasset and b/Counterattack/Asset/UI/Settlement/WB_TeamSettlementItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Currency/WB_Currency.uasset b/Counterattack/Asset/UI/StatusUI/Currency/WB_Currency.uasset index b44b6a02..a30ecf8b 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Currency/WB_Currency.uasset and b/Counterattack/Asset/UI/StatusUI/Currency/WB_Currency.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Currency/WB_GoldAccess.uasset b/Counterattack/Asset/UI/StatusUI/Currency/WB_GoldAccess.uasset index 9d3069be..b381c32d 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Currency/WB_GoldAccess.uasset and b/Counterattack/Asset/UI/StatusUI/Currency/WB_GoldAccess.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeapon.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeapon.uasset index 3c56b303..a99696eb 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeapon.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeapon.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeaponItem.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeaponItem.uasset index be83a78d..86a5a71d 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeaponItem.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/NextWeapon/WB_NextWeaponItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuff.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuff.uasset index 1c940d96..761cb5c5 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuff.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuff.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffItem.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffItem.uasset index 2ecbba84..d011fd10 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffItem.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffSmallItem.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffSmallItem.uasset index 00a1ebc3..fd0ae870 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffSmallItem.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/ShowBuff/WB_ShowBuffSmallItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore.uasset index 23c124ee..55b10794 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_Line.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_Line.uasset index af7ffad9..8334b391 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_Line.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_Line.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode.uasset index 057e207a..646a511d 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode_2.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode_2.uasset index 08fb241f..f4a3cacd 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode_2.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_RoundMode_2.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_TargetScore.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_TargetScore.uasset index c21c95c5..ac06cf88 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_TargetScore.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/TeamScore/W_TeamScore_TargetScore.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_DistanceDefenseLine.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_DistanceDefenseLine.uasset index c51a87d5..17316987 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_DistanceDefenseLine.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_DistanceDefenseLine.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_FightPanel.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_FightPanel.uasset index fff5fa42..c7156ca0 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_FightPanel.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_FightPanel.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HP.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HP.uasset index a876c5bc..61e78719 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HP.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HP.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HeadingInfo.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HeadingInfo.uasset index 6012de00..2bfd9164 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HeadingInfo.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_HeadingInfo.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ShowMechanismEnergy.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ShowMechanismEnergy.uasset index b5b1db10..a8f477a1 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ShowMechanismEnergy.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ShowMechanismEnergy.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ToGod.uasset b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ToGod.uasset index ce9c859c..e1f8ddba 100644 Binary files a/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ToGod.uasset and b/Counterattack/Asset/UI/StatusUI/FightPanel/WB_ToGod.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_RandomSelectPlayerVoteMap.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_RandomSelectPlayerVoteMap.uasset index 33977b38..00b87712 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_RandomSelectPlayerVoteMap.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_RandomSelectPlayerVoteMap.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_SelectDefaultWeapon.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_SelectDefaultWeapon.uasset index f01d9b49..c934dc2f 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_SelectDefaultWeapon.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/WB_SelectDefaultWeapon.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation.uasset index da8e9040..90322fb3 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation_2.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation_2.uasset index 044093b0..92f21af1 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation_2.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_GamePreparation_2.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_RandomSelectMapItem.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_RandomSelectMapItem.uasset index 6ff2a593..3b6e763a 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_RandomSelectMapItem.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_RandomSelectMapItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_SelectMapItem.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_SelectMapItem.uasset index 7c8df9cd..dd032df2 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_SelectMapItem.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_SelectMapItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_WaitPlayJoin.uasset b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_WaitPlayJoin.uasset index 6c5cd16e..632dd289 100644 Binary files a/Counterattack/Asset/UI/StatusUI/GamePreparation/W_WaitPlayJoin.uasset and b/Counterattack/Asset/UI/StatusUI/GamePreparation/W_WaitPlayJoin.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_InductionPlayer.uasset b/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_InductionPlayer.uasset index ca3129d6..a91a42d1 100644 Binary files a/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_InductionPlayer.uasset and b/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_InductionPlayer.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkEnemy.uasset b/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkEnemy.uasset index d466f70b..f6005455 100644 Binary files a/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkEnemy.uasset and b/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkEnemy.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkGodOfWar.uasset b/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkGodOfWar.uasset index 29c2ecdb..2d6f9e60 100644 Binary files a/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkGodOfWar.uasset and b/Counterattack/Asset/UI/StatusUI/MarkPlayerUI/WB_MarkGodOfWar.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_MapOperate.uasset b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_MapOperate.uasset index 5262ea71..1153cd57 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_MapOperate.uasset and b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_MapOperate.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PlaceGameMenu.uasset b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PlaceGameMenu.uasset index 16cc42c7..468a0d8c 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PlaceGameMenu.uasset and b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PlaceGameMenu.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PreviewMap.uasset b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PreviewMap.uasset index 8c881b7d..299131f1 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PreviewMap.uasset and b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_PreviewMap.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_SavedMap.uasset b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_SavedMap.uasset index 34fd3eeb..f3f1896a 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_SavedMap.uasset and b/Counterattack/Asset/UI/StatusUI/PlaceGameMenu/WB_SavedMap.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ImportPlaceCode.uasset b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ImportPlaceCode.uasset index 0ad7233b..cc842282 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ImportPlaceCode.uasset and b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ImportPlaceCode.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlaceItem.uasset b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlaceItem.uasset index cdf32a11..ebfad341 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlaceItem.uasset and b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlaceItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlacePanel.uasset b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlacePanel.uasset index 1a9d2623..70ffd1eb 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlacePanel.uasset and b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_PlacePanel.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_SetRot.uasset b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_SetRot.uasset index c3aaf4e3..a5d55ee8 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_SetRot.uasset and b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_SetRot.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ShowPlaceCode.uasset b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ShowPlaceCode.uasset index 9abf6137..34288bb1 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ShowPlaceCode.uasset and b/Counterattack/Asset/UI/StatusUI/PlacePanel/WB_ShowPlaceCode.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/PlacePanel/Widget_NewEditableText.uasset b/Counterattack/Asset/UI/StatusUI/PlacePanel/Widget_NewEditableText.uasset index 68f5a107..da90d455 100644 Binary files a/Counterattack/Asset/UI/StatusUI/PlacePanel/Widget_NewEditableText.uasset and b/Counterattack/Asset/UI/StatusUI/PlacePanel/Widget_NewEditableText.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMap.uasset b/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMap.uasset index 17e953db..3edeae16 100644 Binary files a/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMap.uasset and b/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMap.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMapItem.uasset b/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMapItem.uasset index 6fc7fd2d..0fd2d199 100644 Binary files a/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMapItem.uasset and b/Counterattack/Asset/UI/StatusUI/ReplaceSavedMap/WB_ReplaceSavedMapItem.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Round/WB_PlaceItemCountInfo.uasset b/Counterattack/Asset/UI/StatusUI/Round/WB_PlaceItemCountInfo.uasset index 7fa337d5..d8629825 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Round/WB_PlaceItemCountInfo.uasset and b/Counterattack/Asset/UI/StatusUI/Round/WB_PlaceItemCountInfo.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Round/WB_RoundFinish.uasset b/Counterattack/Asset/UI/StatusUI/Round/WB_RoundFinish.uasset index 3734c5ec..2b921f83 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Round/WB_RoundFinish.uasset and b/Counterattack/Asset/UI/StatusUI/Round/WB_RoundFinish.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Round/WB_RoundReadyState.uasset b/Counterattack/Asset/UI/StatusUI/Round/WB_RoundReadyState.uasset index 9acf04c3..32f38300 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Round/WB_RoundReadyState.uasset and b/Counterattack/Asset/UI/StatusUI/Round/WB_RoundReadyState.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Round/WB_RoundStartTip.uasset b/Counterattack/Asset/UI/StatusUI/Round/WB_RoundStartTip.uasset index 9a43e7d1..5390297e 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Round/WB_RoundStartTip.uasset and b/Counterattack/Asset/UI/StatusUI/Round/WB_RoundStartTip.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RerunPanel.uasset b/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RerunPanel.uasset index ecf189b3..74d607b8 100644 Binary files a/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RerunPanel.uasset and b/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RerunPanel.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RunMapPanel.uasset b/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RunMapPanel.uasset index 3b8aa8a2..f0d945d4 100644 Binary files a/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RunMapPanel.uasset and b/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_RunMapPanel.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_SaveMap.uasset b/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_SaveMap.uasset index d27452c9..9193d38c 100644 Binary files a/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_SaveMap.uasset and b/Counterattack/Asset/UI/StatusUI/RunMapPanel/WB_SaveMap.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Task/WB_PlayerLevel.uasset b/Counterattack/Asset/UI/StatusUI/Task/WB_PlayerLevel.uasset index 30cd7dc6..43e24971 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Task/WB_PlayerLevel.uasset and b/Counterattack/Asset/UI/StatusUI/Task/WB_PlayerLevel.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Task/WB_Task.uasset b/Counterattack/Asset/UI/StatusUI/Task/WB_Task.uasset index fb59b183..6be47aa2 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Task/WB_Task.uasset and b/Counterattack/Asset/UI/StatusUI/Task/WB_Task.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Task/WB_TaskReward_N.uasset b/Counterattack/Asset/UI/StatusUI/Task/WB_TaskReward_N.uasset index 52631e27..f43dbde1 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Task/WB_TaskReward_N.uasset and b/Counterattack/Asset/UI/StatusUI/Task/WB_TaskReward_N.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/Task/WB_Task_Item.uasset b/Counterattack/Asset/UI/StatusUI/Task/WB_Task_Item.uasset index 607e6d2c..95948dad 100644 Binary files a/Counterattack/Asset/UI/StatusUI/Task/WB_Task_Item.uasset and b/Counterattack/Asset/UI/StatusUI/Task/WB_Task_Item.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/WB_GameEnd.uasset b/Counterattack/Asset/UI/StatusUI/WB_GameEnd.uasset index 432c7b9b..b5f20cdb 100644 Binary files a/Counterattack/Asset/UI/StatusUI/WB_GameEnd.uasset and b/Counterattack/Asset/UI/StatusUI/WB_GameEnd.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/WB_GameUnableToStart.uasset b/Counterattack/Asset/UI/StatusUI/WB_GameUnableToStart.uasset index c66c0379..91e54ddd 100644 Binary files a/Counterattack/Asset/UI/StatusUI/WB_GameUnableToStart.uasset and b/Counterattack/Asset/UI/StatusUI/WB_GameUnableToStart.uasset differ diff --git a/Counterattack/Asset/UI/StatusUI/W_GamePlay.uasset b/Counterattack/Asset/UI/StatusUI/W_GamePlay.uasset index a11b57ba..bd272b62 100644 Binary files a/Counterattack/Asset/UI/StatusUI/W_GamePlay.uasset and b/Counterattack/Asset/UI/StatusUI/W_GamePlay.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_FrontSightTip.uasset b/Counterattack/Asset/UI/Tip/WB_FrontSightTip.uasset index a28e877d..cc9b62d3 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_FrontSightTip.uasset and b/Counterattack/Asset/UI/Tip/WB_FrontSightTip.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_GodOfWarCome.uasset b/Counterattack/Asset/UI/Tip/WB_GodOfWarCome.uasset index da9b4312..9bc44502 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_GodOfWarCome.uasset and b/Counterattack/Asset/UI/Tip/WB_GodOfWarCome.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_GodOfWarDescend.uasset b/Counterattack/Asset/UI/Tip/WB_GodOfWarDescend.uasset index 102b3c52..74253a7e 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_GodOfWarDescend.uasset and b/Counterattack/Asset/UI/Tip/WB_GodOfWarDescend.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_KillingGod.uasset b/Counterattack/Asset/UI/Tip/WB_KillingGod.uasset index 7343a11c..32eff73f 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_KillingGod.uasset and b/Counterattack/Asset/UI/Tip/WB_KillingGod.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip.uasset b/Counterattack/Asset/UI/Tip/WB_Tip.uasset index 1fadf219..45efa84d 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip_2.uasset b/Counterattack/Asset/UI/Tip/WB_Tip_2.uasset index 57b332d9..b3e87ad8 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip_2.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip_2.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip_3.uasset b/Counterattack/Asset/UI/Tip/WB_Tip_3.uasset index d9e0fda4..2dc11e35 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip_3.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip_3.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip_4.uasset b/Counterattack/Asset/UI/Tip/WB_Tip_4.uasset index b967f744..8b3d8d8b 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip_4.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip_4.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip_5.uasset b/Counterattack/Asset/UI/Tip/WB_Tip_5.uasset index 38426d13..519f0925 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip_5.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip_5.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip_6.uasset b/Counterattack/Asset/UI/Tip/WB_Tip_6.uasset index 1985e10d..c4dcbbce 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip_6.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip_6.uasset differ diff --git a/Counterattack/Asset/UI/Tip/WB_Tip_Like.uasset b/Counterattack/Asset/UI/Tip/WB_Tip_Like.uasset index 16afdc47..a9d347d7 100644 Binary files a/Counterattack/Asset/UI/Tip/WB_Tip_Like.uasset and b/Counterattack/Asset/UI/Tip/WB_Tip_Like.uasset differ diff --git a/Counterattack/Asset/UI/Tip/W_TeamTip.uasset b/Counterattack/Asset/UI/Tip/W_TeamTip.uasset index 9e9237d2..2763151e 100644 Binary files a/Counterattack/Asset/UI/Tip/W_TeamTip.uasset and b/Counterattack/Asset/UI/Tip/W_TeamTip.uasset differ diff --git a/Counterattack/Asset/UI/WB_Countdown.uasset b/Counterattack/Asset/UI/WB_Countdown.uasset index 0b883d32..5f813e8f 100644 Binary files a/Counterattack/Asset/UI/WB_Countdown.uasset and b/Counterattack/Asset/UI/WB_Countdown.uasset differ diff --git a/Counterattack/Asset/UI/W_DamageAnim.uasset b/Counterattack/Asset/UI/W_DamageAnim.uasset index ceca9e76..a83ede5a 100644 Binary files a/Counterattack/Asset/UI/W_DamageAnim.uasset and b/Counterattack/Asset/UI/W_DamageAnim.uasset differ diff --git a/Counterattack/Asset/UI/W_InvincibleTime.uasset b/Counterattack/Asset/UI/W_InvincibleTime.uasset index 0f017299..e23913a2 100644 Binary files a/Counterattack/Asset/UI/W_InvincibleTime.uasset and b/Counterattack/Asset/UI/W_InvincibleTime.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset index c9746a53..10142124 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_AvatarFrame_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_CheckBoxButton.uasset b/Counterattack/Asset/UMGTemplate/General_CheckBoxButton.uasset index 71710c72..5cc13623 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_CheckBoxButton.uasset and b/Counterattack/Asset/UMGTemplate/General_CheckBoxButton.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_GameFailure_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_GameFailure_UIBP.uasset index 8070c8c5..b95107b1 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_GameFailure_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_GameFailure_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset index bda0b535..971fd530 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_GameTopBlueTips_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset index 5fa29d1f..cf3b7a99 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_GameTopRedTips_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_GameVictory_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_GameVictory_UIBP.uasset index 4500230d..efddf643 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_GameVictory_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_GameVictory_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset b/Counterattack/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset index db0bd805..163cc0ee 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset and b/Counterattack/Asset/UMGTemplate/General_Ingame_BloodVolButton.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Ingame_RingButton.uasset b/Counterattack/Asset/UMGTemplate/General_Ingame_RingButton.uasset index 833d457e..884bceee 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Ingame_RingButton.uasset and b/Counterattack/Asset/UMGTemplate/General_Ingame_RingButton.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Ingame_SquareButton.uasset b/Counterattack/Asset/UMGTemplate/General_Ingame_SquareButton.uasset index d9c17d8a..4b58ee55 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Ingame_SquareButton.uasset and b/Counterattack/Asset/UMGTemplate/General_Ingame_SquareButton.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset index 45bb4537..15f33966 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_NoticeLeftKillTips_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset index dd472b7b..e8e51ea0 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_NoticeTopTips_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset index 8cb003af..5d88ff3f 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Player_infoBar_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_1.uasset b/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_1.uasset index 3c32bbe9..a21ceeec 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_1.uasset and b/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_1.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_2.uasset b/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_2.uasset index cc8ff7d8..2b455f9c 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_2.uasset and b/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_2.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_3.uasset b/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_3.uasset index 170b61f5..56c54865 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_3.uasset and b/Counterattack/Asset/UMGTemplate/General_SecondLevelButton_3.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset index 5883cb61..253808e5 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Shop/General_Currency_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset index 04f8a52c..2311225c 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopItem_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset index 8b35fe6c..6d01675b 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopMain_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset index 57428b91..0136e479 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPlay_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset index 3216cb4d..44a79cda 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Shop/General_ShopPreviewItem_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_SlideModeButton.uasset b/Counterattack/Asset/UMGTemplate/General_SlideModeButton.uasset index af0ab56d..af935ffa 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_SlideModeButton.uasset and b/Counterattack/Asset/UMGTemplate/General_SlideModeButton.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_SwitchButton.uasset b/Counterattack/Asset/UMGTemplate/General_SwitchButton.uasset index a5f6476a..a1d7f364 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_SwitchButton.uasset and b/Counterattack/Asset/UMGTemplate/General_SwitchButton.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset index 860d25d4..fbe4ee82 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_TMode_Discard_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset b/Counterattack/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset index 12d3e99c..5cc263b5 100644 Binary files a/Counterattack/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/General_Team_ScoreBoard_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset index 8c19a627..e23cb21d 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_EditLocation.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset index 782ca54d..c2ce6f34 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset index 3756bc44..0878eecb 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_ItemSelect_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset index e2bd8d51..95ca0306 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Main_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset index 5d573937..e8adf234 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Playerlist_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset index fec3f03f..e7bed32c 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_PropsItem.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset index cc11bd79..89f822c7 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Props_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset index 8bf53066..7fc4204d 100644 Binary files a/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Peekaboo/Peekaboo_Settlement_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/ReuseList2.uasset b/Counterattack/Asset/UMGTemplate/ReuseList2.uasset index 925c4431..b5ba7942 100644 Binary files a/Counterattack/Asset/UMGTemplate/ReuseList2.uasset and b/Counterattack/Asset/UMGTemplate/ReuseList2.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset index d11ac98c..0b19b68f 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/Common_RankTitleInfo_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset index e7f22cab..e820718b 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDataList_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset index a8850902..769bf8d4 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_BattleDetail_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset index a88556ea..9f5ed31e 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_ListDataBG_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset index aa02ef90..096cf4a6 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeList_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset index 943a1303..ff4a0602 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_Team_ModeMain_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset index 57e70e62..013dbcaf 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_TitleBattleDetail_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset b/Counterattack/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset index 622b68f7..2cf4ea8a 100644 Binary files a/Counterattack/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset and b/Counterattack/Asset/UMGTemplate/Settlement/General_TopBG_UIBP.uasset differ diff --git a/Counterattack/Asset/UMGTemplate/UGC_DragDropTextBox.uasset b/Counterattack/Asset/UMGTemplate/UGC_DragDropTextBox.uasset index f110101f..63aa4295 100644 Binary files a/Counterattack/Asset/UMGTemplate/UGC_DragDropTextBox.uasset and b/Counterattack/Asset/UMGTemplate/UGC_DragDropTextBox.uasset differ diff --git a/Counterattack/Counterattack.ugcproj b/Counterattack/Counterattack.ugcproj index 56dfc0ea..eff2f0ce 100644 --- a/Counterattack/Counterattack.ugcproj +++ b/Counterattack/Counterattack.ugcproj @@ -7,7 +7,7 @@ ProjectShortPath=/Counterattack/ StartMapName=/Game/Maps/PUBG_Baltic/Baltic_Main MapMode=1 bIsBigWorld=0 -Version=1.29.13.13019 +Version=1.29.13.13030 UpdateVersion=5 GameModePath=/Counterattack/Asset/Blueprint/UGCGameMode.UGCGameMode_C DefaultLevelDirectorPath=/Asset/Blueprint/UGCLevelDirector.UGCLevelDirector_C @@ -51,13 +51,13 @@ SwitchesInMaps=((Key="r.Mobile.EnableIBL",Value=0),(Key="s.StreamableDelegateLim PlayBindingArray=[] [JobOption] -LastJobId=600041767 +LastJobId=600042291 LastWindowsJobId=600039234 LastAndroidJobId=600039234 LastIOSJobId=600039234 PakOnly=1 LastSkipBake=True -LastTargetPlatform=LinuxServer+Android_ETC2 +LastTargetPlatform=LinuxServer+WindowsNoEditor+Android_ETC2+IOS+OpenHarmony_ETC2 [UGCUploadOption] PlatformIndex=0 diff --git a/Counterattack/Script/Blueprint/UGCGameState.lua b/Counterattack/Script/Blueprint/UGCGameState.lua index ca830190..3f563c78 100644 --- a/Counterattack/Script/Blueprint/UGCGameState.lua +++ b/Counterattack/Script/Blueprint/UGCGameState.lua @@ -193,14 +193,17 @@ end function UGCGameState:PlayerLogin(PlayerPawn, PlayerKey) UGCLogSystem.Log("[UGCGameState_PlayerLogin] PlayerKey:%s", tostring(PlayerKey)) - -- 更新玩家队伍设置 - self:UpdatePlayerTeam(PlayerKey) - -- 获取玩家信息 - self:GetUserInfo(PlayerKey) - -- 注册玩家得分信息 - PlayerScoreSystem.InitPlayerScoreData(PlayerKey) - -- 增加玩家游玩次数 - self:AddPlayerNumberOfPlays(PlayerKey) + -- 第一次进入则处理 + if self:PlayerIsFirstLogin(PlayerKey) then + -- 更新玩家队伍设置 + self:UpdatePlayerTeam(PlayerKey) + -- 获取玩家信息 + self:GetUserInfo(PlayerKey) + -- 注册玩家得分信息 + PlayerScoreSystem.InitPlayerScoreData(PlayerKey) + -- 增加玩家游玩次数 + self:AddPlayerNumberOfPlays(PlayerKey) + end --UGCEventSystem.SetTimer(self, function() -- UGCLogSystem.Log("[UGCGameState_PlayerLogin] --PlayerKey:%s", tostring(PlayerKey)) @@ -215,6 +218,9 @@ function UGCGameState:PlayerExit(PlayerPawn, PlayerKey) end end +function UGCGameState:PlayerIsFirstLogin(PlayerKey) + return (self.PlayerPersonalInfos[PlayerKey] == nil) +end --- 玩家登录获取玩家数据 @@ -803,7 +809,7 @@ function UGCGameState:UpdatePlayerWeapon(InPlayerKey) end - local PlayerCustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(PlayerKey, ArchiveDataConfig.EArchiveType.CustomWeaponParts) + local PlayerCustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(InPlayerKey, ArchiveDataConfig.EArchiveType.CustomWeaponParts) for i, WeaponID in pairs(WeaponIDs) do local Parts = MyWeaponSystem.GetWeaponBastParts(WeaponID) if PlayerCustomWeaponParts and PlayerCustomWeaponParts[WeaponID] then @@ -1068,27 +1074,27 @@ function UGCGameState:UpdatePlayerTeam(PlayerKey) -- UGCTeamSystem.ChangePlayerTeamID(PlayerKey, NewTeamID) -- UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam] NewTeamID:%s", tostring(NewTeamID)) --end - local PlayerTeamID = UGCPlayerStateSystem.GetTeamID(PlayerKey) - UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam]PlayerTeamID:%s", tostring(PlayerTeamID)) - if PlayerTeamID > 2 then - if self.LastChangeTeamIsTeam1 then - self.LastChangeTeamIsTeam1 = false - UGCTeamSystem.ChangePlayerTeamID(PlayerKey, 2) - else - self.LastChangeTeamIsTeam1 = true - UGCTeamSystem.ChangePlayerTeamID(PlayerKey, 1) - end - PlayerTeamID = UGCPlayerStateSystem.GetTeamID(PlayerKey) - UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam] NewTeamID:%s", tostring(PlayerTeamID)) - end - - local PC = UGCGameSystem.GetPlayerControllerByPlayerKey(PlayerKey) - if PC then - PC:UpdatePlayerStartType() - UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam] Finish") - else - UGCLogSystem.LogError("[UGCGameState_UpdatePlayerTeam] PC is nil") - end + --local PlayerTeamID = UGCPlayerStateSystem.GetTeamID(PlayerKey) + --UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam]PlayerTeamID:%s", tostring(PlayerTeamID)) + --if PlayerTeamID > 2 then + -- if self.LastChangeTeamIsTeam1 then + -- self.LastChangeTeamIsTeam1 = false + -- UGCTeamSystem.ChangePlayerTeamID(PlayerKey, 2) + -- else + -- self.LastChangeTeamIsTeam1 = true + -- UGCTeamSystem.ChangePlayerTeamID(PlayerKey, 1) + -- end + -- PlayerTeamID = UGCPlayerStateSystem.GetTeamID(PlayerKey) + -- UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam] NewTeamID:%s", tostring(PlayerTeamID)) + --end + -- + --local PC = UGCGameSystem.GetPlayerControllerByPlayerKey(PlayerKey) + --if PC then + -- PC:UpdatePlayerStartType() + -- UGCLogSystem.Log("[UGCGameState_UpdatePlayerTeam] Finish") + --else + -- UGCLogSystem.LogError("[UGCGameState_UpdatePlayerTeam] PC is nil") + --end end -- 工程设置------------------------------------------------------------------------------------------------------------- diff --git a/Counterattack/Script/Blueprint/UGCPlayerController.lua b/Counterattack/Script/Blueprint/UGCPlayerController.lua index dab462f8..c28a6203 100644 --- a/Counterattack/Script/Blueprint/UGCPlayerController.lua +++ b/Counterattack/Script/Blueprint/UGCPlayerController.lua @@ -76,6 +76,9 @@ function UGCPlayerController:ReceiveBeginPlay() end + UGCLogSystem.Log("[UGCPlayerController_ReceiveBeginPlay] PC Name:%s", tostring(KismetSystemLibrary.GetObjectName(self))) + + end function UGCPlayerController:ServerRespawnPlayer() @@ -86,8 +89,8 @@ function UGCPlayerController:ServerRespawnPlayer() -- UGCEventSystem.StopTimer(self.AddMagnifyingGlassHandle) --end -- self.AddMagnifyingGlassHandle = UGCEventSystem.SetTimer(self, self.AddMagnifyingGlass, 3) - --self:UpdatePlayerBackPack() - self:UpdatePlayerBackPack_V2() + -- self:UpdatePlayerBackPack() + -- self:UpdatePlayerBackPack_V2() -- 更新增益到Pawn self.bCanAddBuff = false if self.UpdateAlreadyOwnedBuffsHandle then UGCEventSystem.StopTimer(self.UpdateAlreadyOwnedBuffsHandle) end @@ -196,7 +199,10 @@ function UGCPlayerController:UpdatePlayerStartType() self:SetStartPointType(EPlayerStartType.Team2) UGCLogSystem.Log("[UGCPlayerController_UpdatePlayerStartType] 2") end - UGCSystemLibrary.RespawnPlayer(self.PlayerKey) + -- UGCSystemLibrary.RespawnPlayer(self.PlayerKey) + -- 重置位置 + UGCEventSystem.SendEvent(EventEnum.ResetPlayerTransformToPlayerStart, self, UGCGameSystem.GetPlayerPawnByPlayerKey(self.PlayerKey)) + else self:SetStartPointType(EPlayerStartType.Team1) UGCEventSystem.SetTimer(self, self.UpdatePlayerStartType, 0.1) diff --git a/Counterattack/Script/Blueprint/UGCPlayerPawn.lua b/Counterattack/Script/Blueprint/UGCPlayerPawn.lua index f1a0f524..2bf271c3 100644 --- a/Counterattack/Script/Blueprint/UGCPlayerPawn.lua +++ b/Counterattack/Script/Blueprint/UGCPlayerPawn.lua @@ -2,6 +2,8 @@ --Edit Below-- ---@type UGCPlayerPawn_C local UGCPlayerPawn = { + -- 一次背包刷新 + DoOnceUpdateBackPack = false; -- Attr ------------------------- -- 伤害缩放 Attr_DamageScale = 1; @@ -124,6 +126,11 @@ function UGCPlayerPawn:ReceivePossessed(NewController) UGCSystemLibrary.SetPlayerPawnMovable(self, false) end + if not self.DoOnceUpdateBackPack then + self.DoOnceUpdateBackPack = true + MyWeaponSystem.UpdatePlayerBackPack(NewController.PlayerKey) + end + ---- 设置上条命保存的Buff --self.OwnedIncrease = NewController:GetOwnedIncrease() --for IncreaseType, Level in pairs(self.OwnedIncrease) do diff --git a/Counterattack/Script/Blueprint/UGCPlayerStartManager.lua b/Counterattack/Script/Blueprint/UGCPlayerStartManager.lua index 846bc3a9..39578cdf 100644 --- a/Counterattack/Script/Blueprint/UGCPlayerStartManager.lua +++ b/Counterattack/Script/Blueprint/UGCPlayerStartManager.lua @@ -19,6 +19,8 @@ local UGCPlayerStartManager = { function UGCPlayerStartManager:ReceiveBeginPlay() self.SuperClass.ReceiveBeginPlay(self) UGCEventSystem.AddListener(EventEnum.UpdatePlayerStartList, self.UpdatePlayerStartList, self) + UGCEventSystem.AddListener(EventEnum.ResetPlayerTransformToPlayerStart, self.ResetPlayerTransformToPlayerStart, self) + self:UpdatePlayerStartList() end @@ -103,4 +105,20 @@ function UGCPlayerStartManager:GetOverridePlayerStart(PC) return nil end +--- 用于将玩家刷新到出生点的事件 +function UGCPlayerStartManager:ResetPlayerTransformToPlayerStart(InPC, InPawn) + UGCLogSystem.Log("[UGCPlayerStartManager_ResetPlayerTransformToPlayerStart]") + if UE.IsValid(InPC) and UE.IsValid(InPawn) then + local TargetPlayerStart = self:GetUGCModePlayerStart(InPC) + if UE.IsValid(TargetPlayerStart) then + local Pos = TargetPlayerStart:K2_GetActorLocation() + local Rot = TargetPlayerStart:K2_GetActorRotation() + InPawn:K2_SetActorLocation(Pos) + InPC:ClientSetControlRotation(Rot) + else + UGCLogSystem.LogError("[UGCPlayerStartManager_ResetPlayerTransformToPlayerStart] 没有对应出生点") + end + end +end + return UGCPlayerStartManager; \ No newline at end of file diff --git a/Counterattack/Script/Global/Config/MapConfig.lua b/Counterattack/Script/Global/Config/MapConfig.lua index 74baa495..db61139f 100644 --- a/Counterattack/Script/Global/Config/MapConfig.lua +++ b/Counterattack/Script/Global/Config/MapConfig.lua @@ -101,7 +101,7 @@ MapConfig.MapInfo = { CircleIndex = 1, }, SpecialModeType = MapConfig.ESpecialModeType.Default, - ProbabilityOfPlaying = 1, + ProbabilityOfPlaying = 3, } } diff --git a/Counterattack/Script/Global/Config/SignalCircleConfig.lua b/Counterattack/Script/Global/Config/SignalCircleConfig.lua index b25ef29b..52398e20 100644 --- a/Counterattack/Script/Global/Config/SignalCircleConfig.lua +++ b/Counterattack/Script/Global/Config/SignalCircleConfig.lua @@ -126,10 +126,14 @@ function SignalCircleConfig.UpdateNewCircleData() if SignalCircleConfig.IsRandomCircle and CircleLayer > 1 then -- 获取可进行随机的偏移 local RandomDeviation = CircleInfo.blueradius - CircleInfo.whiteradius - local AddRandomX = RandomDeviation * math.random() * 2 - RandomDeviation - local AddRandomY = RandomDeviation * math.random() * 2 - RandomDeviation - -- 设置中心偏移 - CircleCenterPoint = VectorHelper.Add2D(CircleCenterPoint, {X = AddRandomX, Y = AddRandomY} ) + + + --local AddRandomX = RandomDeviation * math.random() * 2 - RandomDeviation + --local AddRandomY = RandomDeviation * math.random() * 2 - RandomDeviation + ---- 设置中心偏移 + --CircleCenterPoint = VectorHelper.Add2D(CircleCenterPoint, {X = AddRandomX, Y = AddRandomY} ) + CircleCenterPoint = math.RandomCirclePoint(RandomDeviation, CircleCenterPoint) + end -- 设置目标白圈的中心 NewCirCleCfg.whitepoint = {X = CircleCenterPoint.X, Y = CircleCenterPoint.Y} diff --git a/Counterattack/Script/Global/EventManager/EventAction/EventAction_PlayerExit.lua b/Counterattack/Script/Global/EventManager/EventAction/EventAction_PlayerExit.lua index cfd7c39d..d75bdc5c 100644 --- a/Counterattack/Script/Global/EventManager/EventAction/EventAction_PlayerExit.lua +++ b/Counterattack/Script/Global/EventManager/EventAction/EventAction_PlayerExit.lua @@ -23,15 +23,15 @@ function EventAction_PlayerExit:Execute(...) PlayerPawn:K2_DestroyActor() else UGCLogSystem.LogError("[EventAction_PlayerExit_Execute] PlayerPawn is nil") - local AllPawn = UGCGameSystem.GetAllPlayerPawn() - local HasNotControlled = false - for k, Pawn in pairs(AllPawn) do - if not Pawn:IsControlled() then - Pawn:K2_DestroyActor() - HasNotControlled = true - end - end - if HasNotControlled == false then UGCLogSystem.LogError("[EventAction_PlayerExit_Execute] HasNotControlled is false") end + --local AllPawn = UGCGameSystem.GetAllPlayerPawn() + --local HasNotControlled = false + --for k, Pawn in pairs(AllPawn) do + -- if not Pawn:IsControlled() then + -- Pawn:K2_DestroyActor() + -- HasNotControlled = true + -- end + --end + --if HasNotControlled == false then UGCLogSystem.LogError("[EventAction_PlayerExit_Execute] HasNotControlled is false") end end diff --git a/Counterattack/Script/Global/EventManager/EventAction/EventAction_RoundBegin.lua b/Counterattack/Script/Global/EventManager/EventAction/EventAction_RoundBegin.lua index 44f046ef..0c8947e2 100644 --- a/Counterattack/Script/Global/EventManager/EventAction/EventAction_RoundBegin.lua +++ b/Counterattack/Script/Global/EventManager/EventAction/EventAction_RoundBegin.lua @@ -121,6 +121,11 @@ function EventAction_RoundBegin:ExecuteOtherLogic() end -- 新增一个增益 PC:AddCanObtainIncreaseCount() + local MaxScore = UGCGameSystem.GameState:GetMaxTeamScore() + if MaxScore == GlobalConfigs.GameSetting.MaxRound // 2 then + -- 赛点额外增加一个增益 + PC:AddCanObtainIncreaseCount() + end end -- 绑定玩家死亡 diff --git a/Counterattack/Script/Global/EventManager/EventConfig.lua b/Counterattack/Script/Global/EventManager/EventConfig.lua index 80d51af2..f9a38d01 100644 --- a/Counterattack/Script/Global/EventManager/EventConfig.lua +++ b/Counterattack/Script/Global/EventManager/EventConfig.lua @@ -47,6 +47,8 @@ EventEnum = { GameWillBegin = 10006, -- 游戏即将开始 PlayerIsAliveIsChange = 10007, -- 玩家存活列表改变 UpdatePlayerInfo = 10008, -- 玩家个人信息更新 + ResetPlayerTransformToPlayerStart = 10009, -- 通知出生点控制器刷新玩家位置，而非重生 InPC InPawn + PlayerWeaponCombinationUpdate = 11001, -- 玩家可选的武器配置列表更新 [PlayerKey] = CombinationType PlayerSelectedWeaponIndexUpdate = 11002, -- 玩家选择的武器配置索引更新 [PlayerKey] = Index @@ -184,9 +186,9 @@ EventConfig.ActionInfo = { -- 等待结束玩家不足时触发的事件 WaitFailureEvent = EventEnum.GameEnd, -- 至少等待时长 - AtLeastWaitingTime = 5, + AtLeastWaitingTime = 10, -- 游戏即将开始提示的时间 - GameWillBeginWaitTime = 5, + GameWillBeginWaitTime = 10, }, }, [EventConfig.ActionType.GamePlay] = { diff --git a/Counterattack/Script/Global/FunctionExtension/MathExtension.lua b/Counterattack/Script/Global/FunctionExtension/MathExtension.lua index c3abf0d0..50491239 100644 --- a/Counterattack/Script/Global/FunctionExtension/MathExtension.lua +++ b/Counterattack/Script/Global/FunctionExtension/MathExtension.lua @@ -26,4 +26,13 @@ function math.isNearlyEqual(a, b, Tolerance) Tolerance = 0.01 end return math.abs(a - b) <= Tolerance +end + +--- 在圆中随机生成一个点 +function math.RandomCirclePoint(Radius, Center) + local angle = math.random() * 2 * math.pi; + local tr = Radius * math.sqrt(math.random()); + local x = Center.X + tr * math.cos(angle); + local y = Center.Y + tr * math.sin(angle); + return { X = x, Y = y }; end \ No newline at end of file diff --git a/Counterattack/Script/Global/GlobalConfigs.lua b/Counterattack/Script/Global/GlobalConfigs.lua index d65e3b3a..4ccedbee 100644 --- a/Counterattack/Script/Global/GlobalConfigs.lua +++ b/Counterattack/Script/Global/GlobalConfigs.lua @@ -11,11 +11,11 @@ GlobalConfigs.GameModeSetting = { --- 队伍模式 TeamModeType = CustomEnum.ETeamMode.TeamSports; --- 队伍所需玩家数 - TeamNeedPlayerNum = 6; + TeamNeedPlayerNum = 4; --- 队伍数量 TeamNum = 2; --- 最大玩家数量 - MaxPlayerNum = 12; + MaxPlayerNum = 8; --- 最小可玩人数 MinPlayerNum = 2; } @@ -27,7 +27,7 @@ GlobalConfigs.GameSetting = { EnablePlayerJoin = false, -- 等待及选地图时间 - WaitTime = 35; + WaitTime = 50; -- 游戏时长 GameTime = 1200; -- 回合时间 diff --git a/Counterattack/Script/Global/System/MyWeaponSystem.lua b/Counterattack/Script/Global/System/MyWeaponSystem.lua index 9156c083..df5069ef 100644 --- a/Counterattack/Script/Global/System/MyWeaponSystem.lua +++ b/Counterattack/Script/Global/System/MyWeaponSystem.lua @@ -173,4 +173,44 @@ end function MyWeaponSystem.GetItemWeaponAmmunitionItemID(WeaponID) return WeaponAmmunitionItem[WeaponID] -end \ No newline at end of file +end + +MyWeaponSystem.BackPackHandle1 = {} +MyWeaponSystem.BackPackHandle2 = {} +MyWeaponSystem.BackPackHandle3 = {} +MyWeaponSystem.BackPackHandle4 = {} + +function MyWeaponSystem.UpdatePlayerBackPack(PlayerKey) + -- 默认武器 + if MyWeaponSystem.BackPackHandle1[PlayerKey] then UGCEventSystem.StopTimer(MyWeaponSystem.BackPackHandle1[PlayerKey]) end + MyWeaponSystem.BackPackHandle1[PlayerKey] = UGCEventSystem.SetTimer(UGCGameSystem.GameState, function() + MyWeaponSystem.BackPackHandle1[PlayerKey] = nil + UGCGameSystem.GameState:UpdatePlayerWeapon(PlayerKey) + end, 1.) + + -- 默认装备 + if MyWeaponSystem.BackPackHandle2[PlayerKey] then UGCEventSystem.StopTimer(MyWeaponSystem.BackPackHandle2[PlayerKey]) end + MyWeaponSystem.BackPackHandle2[PlayerKey] = UGCEventSystem.SetTimer(UGCGameSystem.GameState, function() + MyWeaponSystem.BackPackHandle2[PlayerKey] = nil + local DefaultBackPack = TableHelper.DeepCopy(UGCGameSystem.GameState:GetPlayerBeBornParts(PlayerKey)) + UGCGameSystem.GameState:PlayerAddItemInfo(PlayerKey, DefaultBackPack) + end, 2.) + + -- 校验玩家的武器和配件1次 + if MyWeaponSystem.BackPackHandle3[PlayerKey] then UGCEventSystem.StopTimer(MyWeaponSystem.BackPackHandle3[PlayerKey]) end + MyWeaponSystem.BackPackHandle3[PlayerKey] = UGCEventSystem.SetTimer(UGCGameSystem.GameState, function() + MyWeaponSystem.BackPackHandle3[PlayerKey] = nil + UGCGameSystem.GameState:CheckWeaponAndParts(PlayerKey) + end, 6.) + -- 校验玩家的武器和配件2次 + if MyWeaponSystem.BackPackHandle4[PlayerKey] then UGCEventSystem.StopTimer(MyWeaponSystem.BackPackHandle4[PlayerKey]) end + MyWeaponSystem.BackPackHandle4[PlayerKey] = UGCEventSystem.SetTimer(UGCGameSystem.GameState, function() + MyWeaponSystem.BackPackHandle4[PlayerKey] = nil + UGCGameSystem.GameState:CheckWeaponAndParts(PlayerKey) + end, 8.) + + -- 补满武器弹夹 + UGCEventSystem.SetTimer(UGCGameSystem.GameState, function() + UGCSystemLibrary.PlayerFullBullet(PlayerKey) + end, 3.) +end diff --git a/Counterattack/Script/Global/System/UGCSystemLibrary.lua b/Counterattack/Script/Global/System/UGCSystemLibrary.lua index 17d0a327..079f8213 100644 --- a/Counterattack/Script/Global/System/UGCSystemLibrary.lua +++ b/Counterattack/Script/Global/System/UGCSystemLibrary.lua @@ -360,6 +360,53 @@ function UGCSystemLibrary.RespawnPlayer(PlayerKey, Time) end +function UGCSystemLibrary.RespawnPlayer_V2(PlayerKey, Time) + + -- 不进行瞬时重生，防止同一帧重复调用 + if Time == nil then Time = 0.1 end + local NowTime = UGCSystemLibrary.GetGameTime() + local RespawnHandleInfo = UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey] + if RespawnHandleInfo then + -- 若多次调用则仅采用长的复活时间 + if Time + NowTime <= RespawnHandleInfo.RespawnGameTime then + return + end + end + + -- 删除之前的复活Handle + if UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey] then + UGCEventSystem.StopTimer(UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey].Handle) + end + UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey] = {} + -- 构建新的符合Handle + UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey].Handle = UGCEventSystem.SetTimer(UGCGameSystem.GameState, function() + UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey] = nil + local PlayerPawn = UGCGameSystem.GetPlayerPawnByPlayerKey(PlayerKey) + if UE.IsValid(PlayerPawn) then + PlayerPawn:K2_DestroyActor() + end + local PC = UGCGameSystem.GetPlayerControllerByPlayerKey(PlayerKey) + if UE.IsValid(PC) then + -- UGCGameSystem.GameMode:RestartPlayer(PC) + local DefaultPawnClass = UGCGameSystem.GameMode:GetDefaultPawnClassForController(PC) + if DefaultPawnClass then + local Pawn = UGCGameSystem.SpawnActor(UGCGameSystem.GameState, DefaultPawnClass, VectorHelper.VectorZero(), VectorHelper.RotZero(), VectorHelper.ScaleOne()) + PC:Possess(Pawn) + -- 将玩家重置到出生点 + UGCEventSystem.SendEvent(EventEnum.ResetPlayerTransformToPlayerStart, PC, Pawn) + UGCLogSystem.Log("[UGCSystemLibrary_RespawnPlayer_V2] Finish") + else + UGCLogSystem.LogError("[UGCSystemLibrary_RespawnPlayer_V2]DefaultPawnClass is nil") + end + + else + UGCLogSystem.LogError("[UGCSystemLibrary_RespawnPlayer_V2] [%s]PC is nil", tostring(PlayerKey)) + end + + + end, Time) + UGCSystemLibrary.RespawnPlayerHandlesInfo[PlayerKey].RespawnGameTime = Time + NowTime +end --- Server --- 设置pawn是否可移动 diff --git a/Counterattack/Script/UI/SelectWeapon/WB_ReselectWeaponBtn.lua b/Counterattack/Script/UI/SelectWeapon/WB_ReselectWeaponBtn.lua index 2924a147..c5712e0a 100644 --- a/Counterattack/Script/UI/SelectWeapon/WB_ReselectWeaponBtn.lua +++ b/Counterattack/Script/UI/SelectWeapon/WB_ReselectWeaponBtn.lua @@ -12,6 +12,7 @@ local WB_ReselectWeaponBtn = { function WB_ReselectWeaponBtn:Construct() WidgetLibrary.BindButtonClicked(self.Button_ReselectWeapon, self.ClickBtn, self) + self.LoopCheckDeadShowBtnHandle = UGCEventSystem.SetTimerLoop(self, self.CheckDeadShowBtn, 1) end @@ -21,9 +22,11 @@ function WB_ReselectWeaponBtn:Tick(MyGeometry, InDeltaTime) end end --- function WB_ReselectWeaponBtn:Destruct() - --- end +function WB_ReselectWeaponBtn:Destruct() + if self.LoopCheckDeadShowBtnHandle then + UGCEventSystem.StopTimer(self.LoopCheckDeadShowBtnHandle) + end +end function WB_ReselectWeaponBtn:OnShowPanel() UGCLogSystem.Log("[WB_ReselectWeaponBtn_OnShowPanel]") @@ -57,4 +60,16 @@ function WB_ReselectWeaponBtn:ClickBtn() WidgetManager:ShowPanel(WidgetConfig.EUIType.WeaponSelect) end +function WB_ReselectWeaponBtn:CheckDeadShowBtn() + local LocalPawn = UGCSystemLibrary.GetLocalPlayerPawn() + if not UE.IsValid(LocalPawn) or UGCPawnSystem.HasPawnState(LocalPawn, EPawnState.Dead) then + self:SetVisibility(ESlateVisibility.SelfHitTestInvisible) + else + local NowTime = UGCSystemLibrary.GetGameTime() + if NowTime - self.StartShowTime > self.ShowTime then + self:CloseBtn() + end + end +end + return WB_ReselectWeaponBtn; \ No newline at end of file diff --git a/IWantToHitfour/Script/Blueprint/UGCGameState.lua b/IWantToHitfour/Script/Blueprint/UGCGameState.lua index 45121ed3..9dfc4067 100644 --- a/IWantToHitfour/Script/Blueprint/UGCGameState.lua +++ b/IWantToHitfour/Script/Blueprint/UGCGameState.lua @@ -806,7 +806,7 @@ function UGCGameState:UpdatePlayerWeapon(InPlayerKey) end - local PlayerCustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(PlayerKey, ArchiveDataConfig.EArchiveType.CustomWeaponParts) + local PlayerCustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(InPlayerKey, ArchiveDataConfig.EArchiveType.CustomWeaponParts) for i, WeaponID in pairs(WeaponIDs) do local Parts = MyWeaponSystem.GetWeaponBastParts(WeaponID) if PlayerCustomWeaponParts and PlayerCustomWeaponParts[WeaponID] then diff --git a/IWantToHitfour/Script/Global/Config/SignalCircleConfig.lua b/IWantToHitfour/Script/Global/Config/SignalCircleConfig.lua index 9a219864..a59f7329 100644 --- a/IWantToHitfour/Script/Global/Config/SignalCircleConfig.lua +++ b/IWantToHitfour/Script/Global/Config/SignalCircleConfig.lua @@ -126,10 +126,11 @@ function SignalCircleConfig.UpdateNewCircleData() if SignalCircleConfig.IsRandomCircle and CircleLayer > 1 then -- 获取可进行随机的偏移 local RandomDeviation = CircleInfo.blueradius - CircleInfo.whiteradius - local AddRandomX = RandomDeviation * math.random() * 2 - RandomDeviation - local AddRandomY = RandomDeviation * math.random() * 2 - RandomDeviation - -- 设置中心偏移 - CircleCenterPoint = VectorHelper.Add2D(CircleCenterPoint, {X = AddRandomX, Y = AddRandomY} ) + --local AddRandomX = RandomDeviation * math.random() * 2 - RandomDeviation + --local AddRandomY = RandomDeviation * math.random() * 2 - RandomDeviation + ---- 设置中心偏移 + --CircleCenterPoint = VectorHelper.Add2D(CircleCenterPoint, {X = AddRandomX, Y = AddRandomY} ) + CircleCenterPoint = math.RandomCirclePoint(RandomDeviation, CircleCenterPoint) end -- 设置目标白圈的中心 NewCirCleCfg.whitepoint = {X = CircleCenterPoint.X, Y = CircleCenterPoint.Y} diff --git a/IWantToHitfour/Script/Global/FunctionExtension/MathExtension.lua b/IWantToHitfour/Script/Global/FunctionExtension/MathExtension.lua index c3abf0d0..0ea9eef5 100644 --- a/IWantToHitfour/Script/Global/FunctionExtension/MathExtension.lua +++ b/IWantToHitfour/Script/Global/FunctionExtension/MathExtension.lua @@ -26,4 +26,14 @@ function math.isNearlyEqual(a, b, Tolerance) Tolerance = 0.01 end return math.abs(a - b) <= Tolerance +end + + +--- 在圆中随机生成一个点 +function math.RandomCirclePoint(Radius, Center) + local angle = math.random() * 2 * math.pi; + local tr = Radius * math.sqrt(math.random()); + local x = Center.X + tr * math.cos(angle); + local y = Center.Y + tr * math.sin(angle); + return { X = x, Y = y }; end \ No newline at end of file diff --git a/TwoOnTwo/Script/Blueprint/UGCGameState.lua b/TwoOnTwo/Script/Blueprint/UGCGameState.lua index 4dd1b09c..6e543997 100644 --- a/TwoOnTwo/Script/Blueprint/UGCGameState.lua +++ b/TwoOnTwo/Script/Blueprint/UGCGameState.lua @@ -872,7 +872,7 @@ function UGCGameState:UpdatePlayerWeapon(InPlayerKey) end - local PlayerCustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(PlayerKey, ArchiveDataConfig.EArchiveType.CustomWeaponParts) + local PlayerCustomWeaponParts = ArchiveDataConfig.GetPlayerArchiveDataFromType(InPlayerKey, ArchiveDataConfig.EArchiveType.CustomWeaponParts) for i, WeaponID in pairs(WeaponIDs) do local Parts = MyWeaponSystem.GetWeaponBastParts(WeaponID) if PlayerCustomWeaponParts and PlayerCustomWeaponParts[WeaponID] then diff --git a/TwoOnTwo/Script/Global/Config/SignalCircleConfig.lua b/TwoOnTwo/Script/Global/Config/SignalCircleConfig.lua index 7229e0af..b0d08508 100644 --- a/TwoOnTwo/Script/Global/Config/SignalCircleConfig.lua +++ b/TwoOnTwo/Script/Global/Config/SignalCircleConfig.lua @@ -145,10 +145,12 @@ function SignalCircleConfig.UpdateNewCircleData() if SignalCircleConfig.IsRandomCircle and CircleLayer > 1 then -- 获取可进行随机的偏移 local RandomDeviation = CircleInfo.blueradius - CircleInfo.whiteradius - local AddRandomX = RandomDeviation * math.random() * 2 - RandomDeviation - local AddRandomY = RandomDeviation * math.random() * 2 - RandomDeviation - -- 设置中心偏移 - CircleCenterPoint = VectorHelper.Add2D(CircleCenterPoint, {X = AddRandomX, Y = AddRandomY} ) + --local AddRandomX = RandomDeviation * math.random() * 2 - RandomDeviation + --local AddRandomY = RandomDeviation * math.random() * 2 - RandomDeviation + ---- 设置中心偏移 + --CircleCenterPoint = VectorHelper.Add2D(CircleCenterPoint, {X = AddRandomX, Y = AddRandomY} ) + CircleCenterPoint = math.RandomCirclePoint(RandomDeviation, CircleCenterPoint) + end -- 设置目标白圈的中心 NewCirCleCfg.whitepoint = {X = CircleCenterPoint.X, Y = CircleCenterPoint.Y} diff --git a/TwoOnTwo/Script/Global/FunctionExtension/MathExtension.lua b/TwoOnTwo/Script/Global/FunctionExtension/MathExtension.lua index c3abf0d0..0ea9eef5 100644 --- a/TwoOnTwo/Script/Global/FunctionExtension/MathExtension.lua +++ b/TwoOnTwo/Script/Global/FunctionExtension/MathExtension.lua @@ -26,4 +26,14 @@ function math.isNearlyEqual(a, b, Tolerance) Tolerance = 0.01 end return math.abs(a - b) <= Tolerance +end + + +--- 在圆中随机生成一个点 +function math.RandomCirclePoint(Radius, Center) + local angle = math.random() * 2 * math.pi; + local tr = Radius * math.sqrt(math.random()); + local x = Center.X + tr * math.cos(angle); + local y = Center.Y + tr * math.sin(angle); + return { X = x, Y = y }; end \ No newline at end of file