diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset index 97cd9f6..dea1c4e 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:171ea1cf164c199c6fe3889f80872f46d074fbe863e4aef86cd695654a8dfb60 -size 708102 +oid sha256:c9cc6abd5a196b4bcfe5082adc9a5bde867f1dbe91649927fd113aea889d7bf9 +size 722516 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/GameplayAbilitySystem/GameplayEffects/GE_XP20Gain.uasset b/Elistria_Calling/Content/MAIN_CONTENT/GameplayAbilitySystem/GameplayEffects/GE_XP20Gain.uasset index ec53f7b..259fbf5 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/GameplayAbilitySystem/GameplayEffects/GE_XP20Gain.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/GameplayAbilitySystem/GameplayEffects/GE_XP20Gain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f204ed985bfc0ee3c5f44a2e5771d7ebdfe0b3050eca6504c697a4e5b4a1463 -size 13092 +oid sha256:f63b7c2355724b8d6eebe1a128ed90ad79428d110f8b39769c2d140f8f1e2410 +size 13476 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress.uasset b/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress.uasset index a6068c5..014cfbf 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdac82707eef815ea933250125d73a551a77a07afbf21bd2aa6a7885b3d26322 -size 20590 +oid sha256:1ab62b7c0e16c367153a0ee2bf7ec953904680eb8e8d30bdad6be76db2bdfe20 +size 21850 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress_Inst.uasset b/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress_Inst.uasset new file mode 100644 index 0000000..2c5746c --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/UI/Materials/M_RadialProgress_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90a48c48a59ccd89ee81752437cde5beea9f04eceed603a4cadca311d7f36e2d +size 6779 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset b/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset index 94e3c1d..8996614 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23dfa959501f06b435b2afe4f3c16812099ff7e80f3f8de1ce8934109814a60b -size 347900 +oid sha256:f2c5f3265a3f3e57ec0b48fee385a8e4e384643ff71e660bd2104a1c0a4b925e +size 378106 diff --git a/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset b/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset index a9c59a6..5dd7b41 100644 --- a/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e4d29566853dff28656c57968876d7f867e251ea5e84244f1f54baf8204e081 -size 15406 +oid sha256:4c6ebbf076d324135c3e433d826fcfc2da522de6b11f085215504b78d7ef29c4 +size 15316 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 92464ec..03f8c1b 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6508bf757758e45ab9a6473c64e1875f8742b786534e42773f959d58a9f6fbfc -size 1449351 +oid sha256:d349596c41196a344495235d570b05b68be237375acf511170b87a807d87fb7f +size 1428731 diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp index e5d003c..5713abd 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp +++ b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp @@ -112,6 +112,6 @@ void ULevelAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCallb SetLevel(static_cast(Lvl)); SetXP(FMath::Clamp(GetXP(),0.0f,ComputeXPForLevel(Lvl))); SetXPToNextLevel(ComputeXPForLevel(Lvl)); - OnXPToNextLevelChanged.Broadcast(this, OldValue.GetCurrentValue(), XPToNextLevel.GetCurrentValue()); + OnXPToNextLevelChanged.Broadcast(this, XPToNextLevel.GetCurrentValue(), XPToNextLevel.GetCurrentValue()); } } diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp index 913f53d..2f75a73 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp +++ b/Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp @@ -45,7 +45,7 @@ void UStaminaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCal if (OldStamina!=NewStamina) { SetStamina(NewStamina); - OnMaxStaminaChanged.Broadcast(this, OldMaxStamina, NewMaxStamina); + OnMaxStaminaChanged.Broadcast(this, OldStamina, NewStamina); } SetDrain(0.0f); } @@ -58,7 +58,7 @@ void UStaminaAttributeSet::PostGameplayEffectExecute(const FGameplayEffectModCal if (OldStamina!=NewStamina) { SetStamina(NewStamina); - OnMaxStaminaChanged.Broadcast(this, OldMaxStamina, NewMaxStamina); + OnMaxStaminaChanged.Broadcast(this, OldStamina, NewStamina); } } } \ No newline at end of file diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp index 58e8716..019954c 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp +++ b/Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp @@ -33,6 +33,7 @@ void AMagickPlayerState::GetLifetimeReplicatedProps(TArray& O DOREPLIFETIME_CONDITION_NOTIFY(AMagickPlayerState, ManaSet, COND_None, REPNOTIFY_Always); DOREPLIFETIME_CONDITION_NOTIFY(AMagickPlayerState, HealthSet, COND_None, REPNOTIFY_Always); DOREPLIFETIME_CONDITION_NOTIFY(AMagickPlayerState, StaminaSet, COND_None, REPNOTIFY_Always); + DOREPLIFETIME_CONDITION_NOTIFY(AMagickPlayerState, LevelSet, COND_None, REPNOTIFY_Always); } void AMagickPlayerState::SetupAbilityActorInfo() diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h index bcef487..b351967 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h +++ b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h @@ -9,8 +9,6 @@ /** * */ -DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, - float, NewValue); #define ATTRIBUTE_ACCESSORS(ClassName, PropertyName) \ GAMEPLAYATTRIBUTE_PROPERTY_GETTER(ClassName, PropertyName) \ GAMEPLAYATTRIBUTE_VALUE_GETTER(PropertyName) \ diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h b/Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h index 33420d9..f8ade03 100644 --- a/Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h +++ b/Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h @@ -31,7 +31,7 @@ public: void SetupAbilityActorInfo(); protected: - UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Abilities, Replicated) + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Abilities, ReplicatedUsing = OnRep_ElistriaAbilitySystemComponent) TObjectPtr ElistriaAbilitySystemComponent; UPROPERTY(Replicated) @@ -46,6 +46,8 @@ protected: UPROPERTY(Replicated) TObjectPtr LevelSet; + UFUNCTION() + void OnRep_ElistriaAbilitySystemComponent(); private: };