diff --git a/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset b/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset index 36ccc48..409de82 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:af298be22c28c813f796ea6c7d191ba99009b83199d669ea3ee99b313596f4d2 -size 105820 +oid sha256:4488490e103b01aef77a20f21e31c8306966f10455e91460afe87da337718754 +size 59842 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 5e1649d..344aeaa 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:76280f59d033687f4420a54ddbef2b6a35cea9770d03d4c816844a8029751237 -size 235213 +oid sha256:f2e72d6cf335fed09d9c92fff5a648a1b5ef2debabe84ec73f2063b63407d390 +size 220304 diff --git a/Content/UI/NameBar_UI/NameBar_UI.uasset b/Content/UI/NameBar_UI/NameBar_UI.uasset deleted file mode 100644 index 15d93bd..0000000 --- a/Content/UI/NameBar_UI/NameBar_UI.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 59d6e45..ceb44e9 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -30,9 +30,6 @@ 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 29e86a5..7f8387d 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h @@ -102,10 +102,6 @@ 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 e54564a..111935d 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -59,11 +59,9 @@ 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 357bfe4..d566af0 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 c85d2cd..e2d31e4 100644 --- a/Source/Promether/PrometherEnum.h +++ b/Source/Promether/PrometherEnum.h @@ -131,22 +131,5 @@ 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