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

이상한 맵 삭제 및 abp 구조 수정

Browse Source
This commit is contained in:
HappyTanuki
2023-10-07 20:45:53 +09:00
parent 326ae353d3
commit deef14d8b5
7 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
Content/Character/Lb/BP_Lb.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.

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

Binary file not shown.

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

@@ -220,8 +220,8 @@ void ADefaultPlayerController::SetupInputComponent()
EnhancedInputComponent->BindAction(Skill1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill1); EnhancedInputComponent->BindAction(Skill1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill1);
EnhancedInputComponent->BindAction(Skill2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill2); EnhancedInputComponent->BindAction(Skill2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill2);
EnhancedInputComponent->BindAction(Skill3Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill3); EnhancedInputComponent->BindAction(Skill3Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill3);
EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill4); EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill4Triggered);
EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Completed, this, &ADefaultPlayerController::Skill4); EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Completed, this, &ADefaultPlayerController::Skill4Completed);
EnhancedInputComponent->BindAction(RuneSpell1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell1); EnhancedInputComponent->BindAction(RuneSpell1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell1);
EnhancedInputComponent->BindAction(RuneSpell2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell2); EnhancedInputComponent->BindAction(RuneSpell2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell2);
EnhancedInputComponent->BindAction(WardAction.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Ward); EnhancedInputComponent->BindAction(WardAction.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Ward);
@@ -261,13 +261,22 @@ void ADefaultPlayerController::Skill3()
GetPlayerState<ADefaultPlayerState>()->SetAttackType(CooldownType::Skill3); GetPlayerState<ADefaultPlayerState>()->SetAttackType(CooldownType::Skill3);
} }
void ADefaultPlayerController::Skill4(const FInputActionValue& Value) void ADefaultPlayerController::Skill4Triggered()
{ {
Server_SetRotation(GetMouseHitLocation()); Server_SetRotation(GetMouseHitLocation());
UE_LOG(LogTemp, Warning, TEXT("Skill4 %x"), Value); UE_LOG(LogTemp, Warning, TEXT("Skill4 Triggered"));
GetPlayerState<ADefaultPlayerState>()->SetState(ECharacterState::Attack); GetPlayerState<ADefaultPlayerState>()->SetState(ECharacterState::Attack);
GetPlayerState<ADefaultPlayerState>()->SetAttackType(CooldownType::Skill4Started); GetPlayerState<ADefaultPlayerState>()->SetAttackType(CooldownType::Skill4Triggered);
}
void ADefaultPlayerController::Skill4Completed()
{
Server_SetRotation(GetMouseHitLocation());
UE_LOG(LogTemp, Warning, TEXT("Skill4 Completed"));
GetPlayerState<ADefaultPlayerState>()->SetState(ECharacterState::Attack);
GetPlayerState<ADefaultPlayerState>()->SetAttackType(CooldownType::Skill4Comlpleted);
} }
void ADefaultPlayerController::RuneSpell1() void ADefaultPlayerController::RuneSpell1()

3
Source/Promether/PlayerGeneric/DefaultPlayerController.h
View File

@@ -34,7 +34,8 @@ public:
void Skill1(); void Skill1();
void Skill2(); void Skill2();
void Skill3(); void Skill3();
void Skill4(const FInputActionValue& Value); void Skill4Triggered();
void Skill4Completed();
void RuneSpell1(); void RuneSpell1();
void RuneSpell2(); void RuneSpell2();
void Ward(); void Ward();

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

@@ -6,7 +6,6 @@ ADefaultPlayerState::ADefaultPlayerState()
CharacterBPRef = nullptr;; CharacterBPRef = nullptr;;
Team = TeamType::Null; Team = TeamType::Null;
State = ECharacterState::Idle; State = ECharacterState::Idle;
InitPlayerStats();
} }
void ADefaultPlayerState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const void ADefaultPlayerState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const