From 1e14efdea46fc6a1e5db65dcfe6b162ce84f0fe2 Mon Sep 17 00:00:00 2001 From: SJW1024 Date: Sun, 15 Oct 2023 23:06:32 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8F=89=ED=83=80=20=EC=95=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=EC=A6=98=20=EC=B5=9C=EC=A2=85(duration=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94/=EC=A0=81=20=EC=BA=90=EB=A6=AD=ED=84=B0?= =?UTF-8?q?=EB=A7=8C=20=EC=A7=80=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=ED=95=84=EC=9A=94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BP_Folder/BP_DefaultPlayerCharacter.uasset | 4 ++-- Content/Character/Lb/BP_Lb.uasset | 4 ++-- Content/Effect/LB/Arrow/Arrow_Flash.uasset | 4 ++-- Content/UI/NameBar_UI/NameBar_UI.uasset | 3 +++ .../PlayerGeneric/DefaultPlayerCharacter.cpp | 3 +++ .../PlayerGeneric/DefaultPlayerCharacter.h | 4 ++++ .../PlayerGeneric/DefaultPlayerController.cpp | 2 ++ .../PlayerGeneric/DefaultPlayerState.h | 2 +- Source/Promether/PrometherEnum.h | 17 +++++++++++++++++ 9 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 Content/UI/NameBar_UI/NameBar_UI.uasset diff --git a/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset b/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset index 409de82..36ccc48 100644 --- a/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset +++ b/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4488490e103b01aef77a20f21e31c8306966f10455e91460afe87da337718754 -size 59842 +oid sha256:af298be22c28c813f796ea6c7d191ba99009b83199d669ea3ee99b313596f4d2 +size 105820 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 344aeaa..5e1649d 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:f2e72d6cf335fed09d9c92fff5a648a1b5ef2debabe84ec73f2063b63407d390 -size 220304 +oid sha256:76280f59d033687f4420a54ddbef2b6a35cea9770d03d4c816844a8029751237 +size 235213 diff --git a/Content/Effect/LB/Arrow/Arrow_Flash.uasset b/Content/Effect/LB/Arrow/Arrow_Flash.uasset index 3bc7ca9..6fc4b39 100644 --- a/Content/Effect/LB/Arrow/Arrow_Flash.uasset +++ b/Content/Effect/LB/Arrow/Arrow_Flash.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:073ecf1386b299aba1eea78a1405a835471356d9a0bb4106425c140e4dba7319 -size 893601 +oid sha256:7036040b1e2cba274c767596dc14415dd1a2c06a807a85081475c8b14935617b +size 892797 diff --git a/Content/UI/NameBar_UI/NameBar_UI.uasset b/Content/UI/NameBar_UI/NameBar_UI.uasset new file mode 100644 index 0000000..15d93bd --- /dev/null +++ b/Content/UI/NameBar_UI/NameBar_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d320189d8221430088b1955a74d9d7c2a7484bd9ce2ff00a82ee4e124a256e4f +size 76073 diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index ceb44e9..59d6e45 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -30,6 +30,9 @@ ADefaultPlayerCharacter::ADefaultPlayerCharacter() for (uint8 i = 0; i < (uint8)CooldownType::SIZE; i++) CooldownDuration.Add((CooldownType)i, 0.0f); + + for (uint8 i = 0; i < (uint8)EMaxStats::SIZE; i++) + DefaultMaxStats.Add((EMaxStats)i, 0.0f); } void ADefaultPlayerCharacter::Tick(float DeltaTime) diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h index 7f8387d..29e86a5 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h @@ -102,6 +102,10 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Stats") TMap CooldownDuration; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Stats") + TMap DefaultMaxStats; + protected: UPROPERTY(EditAnywhere) USpringArmComponent* CameraSpringArm; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 111935d..e54564a 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -59,9 +59,11 @@ void ADefaultPlayerController::OnPossess(APawn* aPawn) TArray DefaultStatsValue; TArray CooldownDurationValue; + TArray DefaultMaxStatsValue; ControlledPawn->DefaultStats.GenerateValueArray(DefaultStatsValue); ControlledPawn->CooldownDuration.GenerateValueArray(CooldownDurationValue); + ControlledPawn->DefaultMaxStats.GenerateValueArray(DefaultMaxStatsValue); MyPlayerState->InitPlayerStats(DefaultStatsValue, CooldownDurationValue); } diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerState.h b/Source/Promether/PlayerGeneric/DefaultPlayerState.h index d566af0..357bfe4 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerState.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerState.h @@ -55,7 +55,7 @@ public: UFUNCTION(BlueprintCallable, NetMulticast, Reliable) void NetMulticast_SetAttackType(CooldownType Value); UFUNCTION(BlueprintCallable) - CooldownType GetAttackType() const { return AttackType; } + CooldownType GetAttackType() const { return AttackType; } UFUNCTION(BlueprintCallable) int32 GetCharacterLevel() const; diff --git a/Source/Promether/PrometherEnum.h b/Source/Promether/PrometherEnum.h index e2d31e4..c85d2cd 100644 --- a/Source/Promether/PrometherEnum.h +++ b/Source/Promether/PrometherEnum.h @@ -131,5 +131,22 @@ enum class EStats : uint8 Skill2Cost, Skill3Cost, Skill4Cost, + Skill1Level, + Skill2Level, + Skill3Level, + Skill4Level, + Exp, + PlayerLevel, + SkillPoint, + SIZE +}; + +UENUM(BlueprintType) +enum class EMaxStats : uint8 +{ + HealthMax, + ManaMax, + EnergyMax, + ExpMax, SIZE }; \ No newline at end of file