kingsmedia
/
blaster
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

126 - Cooldown Announcement

This commit is contained in:
Kingsmedia 2022-05-10 15:29:00 +02:00
parent fa53d656d9
commit ad556e0523
7 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/GameModes/BP_BlasterGameMode.uasset
View File

Binary file not shown.

BIN
Content/Blueprints/HUD/WBP_Announcement.uasset
View File

Binary file not shown.

4
Source/Blaster/GameMode/BlasterGameMode.cpp
View File

@ -47,6 +47,10 @@ void ABlasterGameMode::Tick(float DeltaSeconds)
SetMatchState(MatchState::Cooldown);
}
}
else if (MatchState == MatchState::Cooldown)
{
CountDownTime = CooldownTime + WarmupTime + MatchTime - GetWorld()->GetTimeSeconds() + LevelStartingTime;
}
}
void ABlasterGameMode::OnMatchStateSet()

3
Source/Blaster/GameMode/BlasterGameMode.h
View File

@ -44,4 +44,7 @@ protected:
private:
float CountDownTime = 0.f;
public:
FORCEINLINE float GetCountdownTime() const { return CountDownTime; }
};

2
Source/Blaster/HUD/Announcement.h
View File

@ -20,7 +20,7 @@ public:
class UTextBlock* AnnouncementText;
UPROPERTY(meta = (BindWidget))
UTextBlock* WarmupTime;
UTextBlock* CountdownText;
UPROPERTY(meta = (BindWidget))
UTextBlock* AnnouncementMessage;

44
Source/Blaster/PlayerController/BlasterPlayerController.cpp
View File

@ -95,8 +95,16 @@ void ABlasterPlayerController::HandleCooldown()
if (BlasterHUD)
{
BlasterHUD->CharacterOverlay->RemoveFromParent();
if (BlasterHUD->Announcement)
bool bHUDValid =
BlasterHUD->Announcement &&
BlasterHUD->Announcement->AnnouncementText &&
BlasterHUD->Announcement->AnnouncementMessage;
if (bHUDValid)
{
const FString AnnouncementText("New match starts in:");
BlasterHUD->Announcement->AnnouncementText->SetText(FText::FromString(AnnouncementText));
BlasterHUD->Announcement->AnnouncementMessage->SetText(FText());
BlasterHUD->Announcement->SetVisibility(ESlateVisibility::Visible);
}
}
@ -136,17 +144,19 @@ void ABlasterPlayerController::ServerCheckMatchState_Implementation()
LevelStartingTime = GameMode->LevelStartingTime;
WarmupTime = GameMode->WarmupTime;
MatchTime = GameMode->MatchTime;
CooldownTime = GameMode->CooldownTime;
MatchState = GameMode->GetMatchState();
ClientJoinMidGame(MatchState, WarmupTime, MatchTime, LevelStartingTime);
ClientJoinMidGame(MatchState, WarmupTime, MatchTime, CooldownTime, LevelStartingTime);
}
}
void ABlasterPlayerController::ClientJoinMidGame_Implementation(FName StateOfMatch, float Warmup, float Match, float StartingTime)
void ABlasterPlayerController::ClientJoinMidGame_Implementation(FName StateOfMatch, float Warmup, float Match, float Cooldown, float StartingTime)
{
LevelStartingTime = StartingTime;
WarmupTime = Warmup;
MatchTime = Match;
CooldownTime = Cooldown;
MatchState = StateOfMatch;
OnMatchStateSet(MatchState);
@ -175,11 +185,21 @@ void ABlasterPlayerController::SetHUDTime()
float TimeLeft = 0.f;
if (MatchState == MatchState::WaitingToStart) TimeLeft = WarmupTime - GetServerTime() + LevelStartingTime;
else if (MatchState == MatchState::InProgress) TimeLeft = WarmupTime + MatchTime - GetServerTime() + LevelStartingTime;
else if (MatchState == MatchState::Cooldown) TimeLeft = WarmupTime + MatchTime + CooldownTime - GetServerTime() + LevelStartingTime;
uint32 SecondsLeft = FMath::CeilToInt(TimeLeft);
if (HasAuthority())
{
BlasterGameMode = BlasterGameMode == nullptr ? Cast<ABlasterGameMode>(UGameplayStatics::GetGameMode(this)) : BlasterGameMode;
if (BlasterGameMode)
{
SecondsLeft = FMath::CeilToInt(BlasterGameMode->GetCountdownTime() + LevelStartingTime);
}
}
const uint32 SecondsLeft = FMath::CeilToInt(TimeLeft);
if (CountdownInt != SecondsLeft)
{
if (MatchState == MatchState::WaitingToStart) SetHUDAnnouncementCountdown(TimeLeft);
if (MatchState == MatchState::WaitingToStart || MatchState == MatchState::Cooldown) SetHUDAnnouncementCountdown(TimeLeft);
if (MatchState == MatchState::InProgress) SetHUDMatchCountdown(TimeLeft);
}
@ -288,6 +308,11 @@ void ABlasterPlayerController::SetHUDMatchCountdown(float CountdownTime)
if (bHUDValid)
{
if (CountdownTime < 0.f)
{
BlasterHUD->CharacterOverlay->MatchCountdownText->SetText(FText());
return;
}
const int32 Minutes = FMath::FloorToInt(CountdownTime / 60);
const int32 Seconds = CountdownTime - Minutes * 60;
@ -303,14 +328,19 @@ void ABlasterPlayerController::SetHUDAnnouncementCountdown(float CountdownTime)
BlasterHUD &&
BlasterHUD->Announcement &&
BlasterHUD->Announcement->AnnouncementText &&
BlasterHUD->Announcement->WarmupTime;
BlasterHUD->Announcement->CountdownText;
if (bHUDValid)
{
if (CountdownTime < 0.f)
{
BlasterHUD->Announcement->CountdownText->SetText(FText());
return;
}
const int32 Minutes = FMath::FloorToInt(CountdownTime / 60);
const int32 Seconds = CountdownTime - Minutes * 60;
const FString CountdownText = FString::Printf(TEXT("%02d:%02d"), Minutes, Seconds);
BlasterHUD->Announcement->WarmupTime->SetText(FText::FromString(CountdownText));
BlasterHUD->Announcement->CountdownText->SetText(FText::FromString(CountdownText));
}
}

6
Source/Blaster/PlayerController/BlasterPlayerController.h
View File

@ -65,15 +65,19 @@ protected:
void ServerCheckMatchState();
UFUNCTION(Client, Reliable)
void ClientJoinMidGame(FName StateOfMatch, float Warmup, float Match, float StartingTime);
void ClientJoinMidGame(FName StateOfMatch, float Warmup, float Match, float Cooldown, float StartingTime);
private:
UPROPERTY()
class ABlasterHUD* BlasterHUD;
UPROPERTY()
class ABlasterGameMode* BlasterGameMode;
float LevelStartingTime = 0.f;
float MatchTime = 0.f;
float WarmupTime = 0.f;
float CooldownTime = 0.f;
uint32 CountdownInt = 0;
UPROPERTY(ReplicatedUsing=OnRep_MatchState)