From 69852b9541c192c2d096d6de7f47a5da349cdded Mon Sep 17 00:00:00 2001 From: HappyTanuki Date: Sun, 8 Oct 2023 05:12:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=83=AF=EC=9D=B4=20=EC=9D=B4?= =?UTF-8?q?=EC=A0=9C=20stats=EC=99=80=20=EB=8F=99=EA=B8=B0=ED=99=94?= =?UTF-8?q?=EB=90=A9=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Character/BP_Folder/DefaultClass.uasset | 4 ++-- Content/Character/Lb/BP_Lb.uasset | 4 ++-- Content/Maps/DevMap.umap | 4 ++-- .../PlayerGeneric/DefaultPlayerCharacter.cpp | 11 ++-------- .../PlayerGeneric/DefaultPlayerCharacter.h | 2 +- .../PlayerGeneric/DefaultPlayerController.cpp | 21 ++++++++++++++----- .../PlayerGeneric/DefaultPlayerState.cpp | 7 +++++++ 7 files changed, 32 insertions(+), 21 deletions(-) diff --git a/Content/Character/BP_Folder/DefaultClass.uasset b/Content/Character/BP_Folder/DefaultClass.uasset index 290e04d..53535d1 100644 --- a/Content/Character/BP_Folder/DefaultClass.uasset +++ b/Content/Character/BP_Folder/DefaultClass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5ed77da0ce480dc769b0b85a288efb92533d78c89c87e099f1113df2782f898 -size 18108 +oid sha256:25cdab2bc7f4974adf1757b7cb5f49a1992c2138539efa84aa91d1ed1e1f402d +size 12818 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 0dbe4c5..d2c87a9 100644 --- a/Content/Character/Lb/BP_Lb.uasset +++ b/Content/Character/Lb/BP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db33b12578b5bbcc1544836fae0157f4325c361d7d93695a0433d2e36b340805 -size 144292 +oid sha256:63d3f35b7f189a662443e477ef6bd4c89528cdb668328ba598fbc880c77a7ca6 +size 140743 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 6244900..8d398db 100644 --- a/Content/Maps/DevMap.umap +++ b/Content/Maps/DevMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5d16e9758c041479bd4f6b7e3562a337a11384d9e0dac49b9199c91bc6df50b -size 185559 +oid sha256:b3391b09e0fe249eefa23c146088dae77f17837c30ce0cb5facd2f9c910a5f98 +size 115131 diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index 1d393db..65f655d 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -24,16 +24,9 @@ ADefaultPlayerCharacter::ADefaultPlayerCharacter() Camera = CreateDefaultSubobject(TEXT("Camera")); Camera->SetupAttachment(CameraSpringArm, USpringArmComponent::SocketName); - - const UEnum* CharStateEnum = FindObject(ANY_PACKAGE, TEXT("EStats"), true); - if (!CharStateEnum) - { - UE_LOG(LogTemp, Error, TEXT("EStats Missing")); - return; - } - + for (uint8 i = 0; i < (uint8)EStats::SIZE; i++) - DefaultStats.Add(*CharStateEnum->GetNameByValue((uint8)i).ToString(), 0.0f); + DefaultStats.Add((EStats)i, 0.0f); for (uint8 i = 0; i < (uint8)CooldownType::SIZE; i++) CooldownDuration.Add((CooldownType)i, 0.0f); diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h index 406f534..84a3dc8 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h @@ -90,7 +90,7 @@ public: void NetMulticast_Skill7(); UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Stats") - TMap DefaultStats; + TMap DefaultStats; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Stats") TMap CooldownDuration; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 5653128..c34de91 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -20,12 +20,10 @@ void ADefaultPlayerController::BeginPlay() ULocalPlayer* LocalPlayer = Cast(Player); if (!LocalPlayer) return; + UEnhancedInputLocalPlayerSubsystem* InputSystem = LocalPlayer->GetSubsystem(); if (!InputSystem) return; - ADefaultPlayerCharacter* ControlledPawn = GetPawn(); - if (!ControlledPawn) return; - ADefaultPlayerState* MyPlayerState = GetPlayerState(); - if (!MyPlayerState) return; + if (PlayerInputMapping.IsNull()) { UE_LOG(LogTemp, Error, TEXT("AddMappingContext Failed")); @@ -34,7 +32,6 @@ void ADefaultPlayerController::BeginPlay() InputSystem->AddMappingContext(PlayerInputMapping.LoadSynchronous(), 0); this->bShowMouseCursor = true; - //MyPlayerState->InitPlayerStats(ControlledPawn->DefaultStats, ControlledPawn->CooldownDuration); } void ADefaultPlayerController::OnPossess(APawn* aPawn) @@ -53,6 +50,20 @@ void ADefaultPlayerController::OnPossess(APawn* aPawn) SetViewTarget(PlayerCamera); UE_LOG(LogTemp, Warning, TEXT("SetViewTarget Success : %s"), *GetPlayerState()->GetPlayerCamera()->GetName()); + + ADefaultPlayerCharacter* ControlledPawn = GetPawn(); + if (!ControlledPawn) return; + + ADefaultPlayerState* MyPlayerState = GetPlayerState(); + if (!MyPlayerState) return; + + TArray DefaultStatsValue; + TArray CooldownDurationValue; + + ControlledPawn->DefaultStats.GenerateValueArray(DefaultStatsValue); + ControlledPawn->CooldownDuration.GenerateValueArray(CooldownDurationValue); + + MyPlayerState->InitPlayerStats(DefaultStatsValue, CooldownDurationValue); } void ADefaultPlayerController::OnUnPossess() diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp index c7e2448..1159af6 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp @@ -31,6 +31,13 @@ void ADefaultPlayerState::InitPlayerStats_Implementation(const TArray& St MaxStats.Append(StatsValue); Stats.Append(StatsValue); CooldownDuration.Append(CooldownDurationValue); + MaxCooldownDuration.Append(CooldownDurationValue); + + + for (float Value : StatsValue) + { + UE_LOG(LogTemp, Warning, TEXT("Values: %f"), Value); + } } void ADefaultPlayerState::NetMulticast_SetAttackType_Implementation(CooldownType Value)