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

맵 병합

Browse Source
This commit is contained in:
HappyTanuki
2023-11-15 03:41:11 +09:00
parent a1d0304ea8
commit 8276b4f3f0
7 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Config/DefaultEngine.ini
View File

@@ -1,8 +1,9 @@
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Maps/DevMap.DevMap GameDefaultMap=/Game/Maps/MiniMap.MiniMap
EditorStartupMap=/Game/Maps/DevMap.DevMap EditorStartupMap=/Game/Maps/MiniMap.MiniMap
GameInstanceClass=/Script/Promether.DefaultGameInstance GameInstanceClass=/Script/Promether.DefaultGameInstance
ServerDefaultMap=/Game/Maps/DevMap.DevMap ServerDefaultMap=/Game/Maps/MiniMap.MiniMap
TransitionMap=/Game/Maps/MiniMap.MiniMap
[/Script/WindowsTargetPlatform.WindowsTargetSettings] [/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12

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

Binary file not shown.

BIN
Content/Character/Lb/EskillBuff.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Maps/MiniMap.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::Riana; Type = CharacterType::Lb;
} }
if (Team == TeamType::Null) if (Team == TeamType::Null)
{ {

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

@@ -486,11 +486,12 @@ void ADefaultPlayerController::Move()
{ {
EndAttack(); EndAttack();
ObjectSelect(); ObjectSelect();
if (GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget() != GetPawn<AActor>() && if (GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget() != GetPawn<AActor>() &&
Cast<ADefaultPlayerCharacter>(GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget())) Cast<ADefaultPlayerCharacter>(GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget()))
{ {
if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Attackable] == 0) return; if (!GetPlayerState<ADefaultPlayerState>()->Stats[(uint8)EStats::Attackable] == 0) return;
BeginAttack(); BeginAttack();
} }
else else
@@ -705,6 +706,8 @@ void ADefaultPlayerController::Attack()
{ {
if ((GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Attack] != 0)) if ((GetPlayerState<ADefaultPlayerState>()->CooldownDuration[(uint8)CooldownType::Attack] != 0))
return; return;
UE_LOG(LogTemp, Warning, TEXT("asdf:%s"), *GetPlayerState<ADefaultPlayerState>()->GetCurrentAttackTarget()->GetName());
FVector Location = GetPawn()->GetActorLocation(); FVector Location = GetPawn()->GetActorLocation();
Location.X = 0; Location.X = 0;

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

@@ -39,9 +39,11 @@ void ADefaultPlayerState::InitPlayerStats_Implementation(const TArray<float>& St
for (float Value : CooldownDurationValue) for (float Value : CooldownDurationValue)
{ {
CooldownDuration.Add(0.0f); CooldownDuration.Add(-100000.0f);
} }
CooldownDuration[(uint8)CooldownType::Attack] = 0;
for (float Value : StatsValue) for (float Value : StatsValue)
{ {
UE_LOG(LogTemp, Warning, TEXT("Values: %f"), Value); UE_LOG(LogTemp, Warning, TEXT("Values: %f"), Value);