A-Rival/Promether
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

머지 완료

Browse Source
This commit is contained in:
HappyTanuki
2023-11-14 02:44:53 +09:00
parent 24932cdd2b
commit 598a21efc3
8 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/BP_DefaultPlayerCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Bp_DefaultplayerController.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/BP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Maps/DevMap.umap (Stored with Git LFS)
View File

Binary file not shown.

2
Source/Promether/GameModeBase/Deathmatch.cpp
View File

@@ -133,7 +133,7 @@ FString ADeathmatch::InitNewPlayer(APlayerController* NewPlayerController, const
//DebugPerpose //DebugPerpose
if (Type == CharacterType::Lukriel) if (Type == CharacterType::Lukriel)
{ {
Type = CharacterType::Lb; Type = CharacterType::Allium;
} }
if (Team == TeamType::Null) if (Team == TeamType::Null)
{ {

20
Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
View File

@@ -248,6 +248,11 @@ void ADefaultPlayerController::SetupInputComponent()
void ADefaultPlayerController::Skill1() void ADefaultPlayerController::Skill1()
{ {
if (!GetWorld())
return;
if (GetWorld()->GetUnpausedTimeSeconds() - GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Skill1]
<= GetPlayerState<ADefaultPlayerState>()->MaxCooldownDuration[(uint8)CooldownType::Skill1])
return;
if (GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 1) if (GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 1)
return; return;
if (!(GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Mana] >= GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skill1Cost])) if (!(GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Mana] >= GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skill1Cost]))
@@ -277,6 +282,11 @@ void ADefaultPlayerController::Skill1()
void ADefaultPlayerController::Skill2() void ADefaultPlayerController::Skill2()
{ {
if (!GetWorld())
return;
if (GetWorld()->GetUnpausedTimeSeconds() - GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Skill2]
<= GetPlayerState<ADefaultPlayerState>()->MaxCooldownDuration[(uint8)CooldownType::Skill2])
return;
if (GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 1) if (GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 1)
return; return;
if (!(GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Mana] >= GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skill2Cost])) if (!(GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Mana] >= GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skill2Cost]))
@@ -304,6 +314,11 @@ void ADefaultPlayerController::Skill2()
void ADefaultPlayerController::Skill3() void ADefaultPlayerController::Skill3()
{ {
if (!GetWorld())
return;
if (GetWorld()->GetUnpausedTimeSeconds() - GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Skill3]
<= GetPlayerState<ADefaultPlayerState>()->MaxCooldownDuration[(uint8)CooldownType::Skill3])
return;
if (GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 1) if (GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 1)
return; return;
if (!(GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Mana] >= GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skill3Cost])) if (!(GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Mana] >= GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skill3Cost]))
@@ -334,6 +349,11 @@ void ADefaultPlayerController::Skill4Triggered()
if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::charging] == 0)//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> true<75><65> <20>ƴ<EFBFBD> <20><> if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::charging] == 0)//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> true<75><65> <20>ƴ<EFBFBD> <20><>
{ {
if (!GetWorld())
return;
if (GetWorld()->GetUnpausedTimeSeconds() - GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Skill4Triggered]
<= GetPlayerState<ADefaultPlayerState>()->MaxCooldownDuration[(uint8)CooldownType::Skill4Triggered])
return;
if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 0) { if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Skillusable] == 0) {
GetPlayerState<ADefaultPlayerState>()->SetState(ECharacterState::Idle); GetPlayerState<ADefaultPlayerState>()->SetState(ECharacterState::Idle);
return; return;

7
Source/Promether/PlayerGeneric/DefaultPlayerState.cpp
View File

@@ -18,6 +18,7 @@ void ADefaultPlayerState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>&
DOREPLIFETIME(ADefaultPlayerState, Team); DOREPLIFETIME(ADefaultPlayerState, Team);
DOREPLIFETIME(ADefaultPlayerState, CooldownDuration); DOREPLIFETIME(ADefaultPlayerState, CooldownDuration);
DOREPLIFETIME(ADefaultPlayerState, MaxCooldownDuration);
DOREPLIFETIME(ADefaultPlayerState, Stats); DOREPLIFETIME(ADefaultPlayerState, Stats);
DOREPLIFETIME(ADefaultPlayerState, MaxStats); DOREPLIFETIME(ADefaultPlayerState, MaxStats);
@@ -35,7 +36,11 @@ void ADefaultPlayerState::InitPlayerStats_Implementation(const TArray<float>& St
MaxStats.Append(StatsValue); MaxStats.Append(StatsValue);
Stats.Append(StatsValue); Stats.Append(StatsValue);
CooldownDuration.Append(CooldownDurationValue); CooldownDuration.Append(CooldownDurationValue);
MaxCooldownDuration.Append(CooldownDurationValue);
for (float Value : CooldownDurationValue)
{
MaxCooldownDuration.Add(0.0f);
}
for (float Value : StatsValue) for (float Value : StatsValue)
{ {

4
Source/Promether/PlayerGeneric/DefaultPlayerState.h
View File

@@ -85,9 +85,9 @@ public:
UPROPERTY(Replicated, Transient, EditAnywhere, BlueprintReadWrite) UPROPERTY(Replicated, Transient, EditAnywhere, BlueprintReadWrite)
TArray<float> MaxStats; TArray<float> MaxStats;
UPROPERTY(Replicated, Transient, BlueprintReadWrite) UPROPERTY(Replicated, Transient, EditAnywhere, BlueprintReadWrite)
TArray<float> CooldownDuration; TArray<float> CooldownDuration;
UPROPERTY(Replicated, Transient, BlueprintReadWrite) UPROPERTY(Replicated, Transient, EditAnywhere, BlueprintReadWrite)
TArray<float> MaxCooldownDuration; TArray<float> MaxCooldownDuration;