Compare commits
No commits in common. "4610a9f55f57cb5a10b95226cd8772cb3b345e6d" and "ac3ec882901569bf4a880479099be36fdda457c9" have entirely different histories.
4610a9f55f
...
ac3ec88290
@ -2,40 +2,4 @@
|
||||
|
||||
|
||||
#include "AbilitySystem/AuraAttributeSet.h"
|
||||
#include "AbilitySystemComponent.h"
|
||||
#include "Net/UnrealNetwork.h"
|
||||
|
||||
UAuraAttributeSet::UAuraAttributeSet()
|
||||
{
|
||||
}
|
||||
|
||||
void UAuraAttributeSet::GetLifetimeReplicatedProps(TArray<class FLifetimeProperty>& OutLifetimeProps) const
|
||||
{
|
||||
Super::GetLifetimeReplicatedProps(OutLifetimeProps);
|
||||
|
||||
DOREPLIFETIME_CONDITION_NOTIFY(UAuraAttributeSet, Health, COND_None, REPNOTIFY_Always)
|
||||
DOREPLIFETIME_CONDITION_NOTIFY(UAuraAttributeSet, MaxHealth, COND_None, REPNOTIFY_Always)
|
||||
|
||||
DOREPLIFETIME_CONDITION_NOTIFY(UAuraAttributeSet, Mana, COND_None, REPNOTIFY_Always)
|
||||
DOREPLIFETIME_CONDITION_NOTIFY(UAuraAttributeSet, MaxMana, COND_None, REPNOTIFY_Always)
|
||||
}
|
||||
|
||||
void UAuraAttributeSet::OnRep_Health(const FGameplayAttributeData& OldHealth) const
|
||||
{
|
||||
GAMEPLAYATTRIBUTE_REPNOTIFY(UAuraAttributeSet, Health, OldHealth)
|
||||
}
|
||||
|
||||
void UAuraAttributeSet::OnRep_MaxHealth(const FGameplayAttributeData& OldMaxHealth) const
|
||||
{
|
||||
GAMEPLAYATTRIBUTE_REPNOTIFY(UAuraAttributeSet, MaxHealth, OldMaxHealth)
|
||||
}
|
||||
|
||||
void UAuraAttributeSet::OnRep_Mana(const FGameplayAttributeData& OldMana) const
|
||||
{
|
||||
GAMEPLAYATTRIBUTE_REPNOTIFY(UAuraAttributeSet, Mana, OldMana)
|
||||
}
|
||||
|
||||
void UAuraAttributeSet::OnRep_MaxMana(const FGameplayAttributeData& OldMaxMana) const
|
||||
{
|
||||
GAMEPLAYATTRIBUTE_REPNOTIFY(UAuraAttributeSet, MaxMana, OldMaxMana)
|
||||
}
|
||||
|
@ -3,11 +3,9 @@
|
||||
|
||||
#include "Character/AuraCharacter.h"
|
||||
|
||||
#include "AbilitySystemComponent.h"
|
||||
#include "Camera/CameraComponent.h"
|
||||
#include "GameFramework/CharacterMovementComponent.h"
|
||||
#include "GameFramework/SpringArmComponent.h"
|
||||
#include "Player/AuraPlayerState.h"
|
||||
|
||||
AAuraCharacter::AAuraCharacter()
|
||||
{
|
||||
@ -37,29 +35,3 @@ AAuraCharacter::AAuraCharacter()
|
||||
bUseControllerRotationYaw = false;
|
||||
bUseControllerRotationRoll = false;
|
||||
}
|
||||
|
||||
void AAuraCharacter::PossessedBy(AController* NewController)
|
||||
{
|
||||
Super::PossessedBy(NewController);
|
||||
|
||||
// Init ability actor info for the server
|
||||
InitAbilityActorInfo();
|
||||
}
|
||||
|
||||
void AAuraCharacter::OnRep_PlayerState()
|
||||
{
|
||||
Super::OnRep_PlayerState();
|
||||
|
||||
// Init ability actor info for the server
|
||||
InitAbilityActorInfo();
|
||||
}
|
||||
|
||||
void AAuraCharacter::InitAbilityActorInfo()
|
||||
{
|
||||
AAuraPlayerState *AuraPlayerState = GetPlayerState<AAuraPlayerState>();
|
||||
check(AuraPlayerState);
|
||||
AuraPlayerState->GetAbilitySystemComponent()->InitAbilityActorInfo(AuraPlayerState, this);
|
||||
|
||||
AbilitySystemComponent = AuraPlayerState->GetAbilitySystemComponent();
|
||||
AttributeSet = AuraPlayerState->GetAttributeSet();
|
||||
}
|
||||
|
@ -31,10 +31,3 @@ void AAuraEnemy::UnHighlightActor()
|
||||
GetMesh()->SetRenderCustomDepth(false);
|
||||
Weapon->SetRenderCustomDepth(false);
|
||||
}
|
||||
|
||||
void AAuraEnemy::BeginPlay()
|
||||
{
|
||||
Super::BeginPlay();
|
||||
|
||||
AbilitySystemComponent->InitAbilityActorInfo(this, this);
|
||||
}
|
||||
|
@ -14,31 +14,4 @@ class AURA_API UAuraAttributeSet : public UAttributeSet
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UAuraAttributeSet ();
|
||||
virtual void GetLifetimeReplicatedProps(TArray<class FLifetimeProperty>& OutLifetimeProps) const override;
|
||||
|
||||
UPROPERTY (BlueprintReadOnly, ReplicatedUsing = OnRep_Health, Category = "Vital Attributes")
|
||||
FGameplayAttributeData Health;
|
||||
|
||||
UPROPERTY (BlueprintReadOnly, ReplicatedUsing = OnRep_MaxHealth, Category = "Vital Attributes")
|
||||
FGameplayAttributeData MaxHealth;
|
||||
|
||||
UPROPERTY (BlueprintReadOnly, ReplicatedUsing = OnRep_Mana, Category = "Vital Attributes")
|
||||
FGameplayAttributeData Mana;
|
||||
|
||||
UPROPERTY (BlueprintReadOnly, ReplicatedUsing = OnRep_MaxMana, Category = "Vital Attributes")
|
||||
FGameplayAttributeData MaxMana;
|
||||
|
||||
UFUNCTION ()
|
||||
void OnRep_Health(const FGameplayAttributeData& OldHealth) const;
|
||||
|
||||
UFUNCTION ()
|
||||
void OnRep_MaxHealth(const FGameplayAttributeData& OldMaxHealth) const;
|
||||
|
||||
UFUNCTION ()
|
||||
void OnRep_Mana(const FGameplayAttributeData& OldMana) const;
|
||||
|
||||
UFUNCTION ()
|
||||
void OnRep_MaxMana(const FGameplayAttributeData& OldMaxMana) const;
|
||||
};
|
||||
|
@ -16,8 +16,6 @@ class AURA_API AAuraCharacter : public AAuraCharacterBase
|
||||
|
||||
public:
|
||||
AAuraCharacter ();
|
||||
virtual void PossessedBy(AController* NewController) override;
|
||||
virtual void OnRep_PlayerState() override;
|
||||
|
||||
private:
|
||||
UPROPERTY (EditAnywhere)
|
||||
@ -25,6 +23,4 @@ private:
|
||||
|
||||
UPROPERTY (EditAnywhere)
|
||||
TObjectPtr<UCameraComponent> Camera;
|
||||
|
||||
void InitAbilityActorInfo ();
|
||||
};
|
||||
|
@ -19,7 +19,4 @@ public:
|
||||
AAuraEnemy ();
|
||||
virtual void HighlightActor() override;
|
||||
virtual void UnHighlightActor() override;
|
||||
|
||||
protected:
|
||||
virtual void BeginPlay() override;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user