From b8475c7ba1a5fc6ce63fce04591d5645833f0c42 Mon Sep 17 00:00:00 2001 From: Caleb Buhungiro Date: Thu, 19 Jun 2025 10:19:34 +0800 Subject: [PATCH] some small changes --- Content/Player/CPlayerCharacter_BP.uasset | 4 ++-- .../TempLevel/3/KY/UOQWAMIU584TN0Q98C8DJV.uasset | 4 ++-- .../TempLevel/A/CZ/K8SCVNM0RF07AH95SOWC9O.uasset | 4 ++-- .../TempLevel/A/FB/UP95IBI3VFPOJ7VL1O6XSR.uasset | 4 ++-- .../TempLevel/B/OE/VLBQYEHGWVQFZWEZHOAMAV.uasset | 4 ++-- Source/Crunch/Private/Character/CCharacter.cpp | 4 ++++ Source/Crunch/Private/Player/CPlayerController.cpp | 8 +++----- Source/Crunch/Public/Character/CCharacter.h | 9 ++++++--- Source/Crunch/Public/GAS/CAbilitySystemComponent.h | 1 - Source/Crunch/Public/GAS/CAttributeSet.h | 1 - Source/Crunch/Public/Game/CGameMode.h | 3 --- Source/Crunch/Public/Player/CPlayerController.h | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Content/Player/CPlayerCharacter_BP.uasset b/Content/Player/CPlayerCharacter_BP.uasset index 7ecaa6c..9969f51 100644 --- a/Content/Player/CPlayerCharacter_BP.uasset +++ b/Content/Player/CPlayerCharacter_BP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f01210916c27ea35e27938dd262ffe9ee7c99b2f3f4d6879dc548439726190f9 -size 30336 +oid sha256:77eebe4e07241e471e2bcbef6ad0c5af139c7918c83490af4fd09ff2a18a05bd +size 30245 diff --git a/Content/__ExternalActors__/TempLevel/3/KY/UOQWAMIU584TN0Q98C8DJV.uasset b/Content/__ExternalActors__/TempLevel/3/KY/UOQWAMIU584TN0Q98C8DJV.uasset index 4e28487..93ebe67 100644 --- a/Content/__ExternalActors__/TempLevel/3/KY/UOQWAMIU584TN0Q98C8DJV.uasset +++ b/Content/__ExternalActors__/TempLevel/3/KY/UOQWAMIU584TN0Q98C8DJV.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5947fc1c8e700ab729077d79f883fdc62c34e0d6f5637a653178b7b401acb58e -size 3609 +oid sha256:abe0a977fc99736b026579ffa1adda17a97dad0076e050ec51ed42d9a006c02a +size 3722 diff --git a/Content/__ExternalActors__/TempLevel/A/CZ/K8SCVNM0RF07AH95SOWC9O.uasset b/Content/__ExternalActors__/TempLevel/A/CZ/K8SCVNM0RF07AH95SOWC9O.uasset index e847a54..f2ea131 100644 --- a/Content/__ExternalActors__/TempLevel/A/CZ/K8SCVNM0RF07AH95SOWC9O.uasset +++ b/Content/__ExternalActors__/TempLevel/A/CZ/K8SCVNM0RF07AH95SOWC9O.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec21b47b7a1adeb8a35d24005aaf55feb91cec10d87bb69998b83f61b75e378a -size 5058 +oid sha256:019be4db63b355501f0ac690867897a8c371fe75bc29f3099d9b1415743bfc6c +size 5156 diff --git a/Content/__ExternalActors__/TempLevel/A/FB/UP95IBI3VFPOJ7VL1O6XSR.uasset b/Content/__ExternalActors__/TempLevel/A/FB/UP95IBI3VFPOJ7VL1O6XSR.uasset index 12a1940..ceecd2f 100644 --- a/Content/__ExternalActors__/TempLevel/A/FB/UP95IBI3VFPOJ7VL1O6XSR.uasset +++ b/Content/__ExternalActors__/TempLevel/A/FB/UP95IBI3VFPOJ7VL1O6XSR.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b8c4d7853da707d2df3520116fd95c84e86b9d89395165a245a35e6bf540093 -size 3803 +oid sha256:474aa91c1abcb963f4546ca6de7ca6fdd5d52216141ea1a081751b4dd5d7367f +size 3916 diff --git a/Content/__ExternalActors__/TempLevel/B/OE/VLBQYEHGWVQFZWEZHOAMAV.uasset b/Content/__ExternalActors__/TempLevel/B/OE/VLBQYEHGWVQFZWEZHOAMAV.uasset index e148984..a853098 100644 --- a/Content/__ExternalActors__/TempLevel/B/OE/VLBQYEHGWVQFZWEZHOAMAV.uasset +++ b/Content/__ExternalActors__/TempLevel/B/OE/VLBQYEHGWVQFZWEZHOAMAV.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4445698120bec23943d30f382cbfa8a9588edaaa7f5bdf7bc12822480cfb375b -size 3732 +oid sha256:f966e621665b4ad27821e6f8a88244e83952f629035c2e6b1934db4167cc2a3e +size 3845 diff --git a/Source/Crunch/Private/Character/CCharacter.cpp b/Source/Crunch/Private/Character/CCharacter.cpp index 0a3d7c6..dd277f8 100644 --- a/Source/Crunch/Private/Character/CCharacter.cpp +++ b/Source/Crunch/Private/Character/CCharacter.cpp @@ -14,6 +14,10 @@ ACCharacter::ACCharacter() CAbilitySystemComponent = CreateDefaultSubobject(TEXT("Ability System Component")); CAttributeSet = CreateDefaultSubobject(TEXT("CAttribute Set")); + /** + * This is also valid + * CAttributeSet = CAbilitySystemComponent->GetSet(); + **/ } void ACCharacter::ServerSideInit() diff --git a/Source/Crunch/Private/Player/CPlayerController.cpp b/Source/Crunch/Private/Player/CPlayerController.cpp index a1511b4..4812c08 100644 --- a/Source/Crunch/Private/Player/CPlayerController.cpp +++ b/Source/Crunch/Private/Player/CPlayerController.cpp @@ -1,4 +1,4 @@ -// Multipalyer By Caleb +// Multiplayer By Caleb #include "Crunch/Public/Player/CPlayerController.h" @@ -8,8 +8,7 @@ void ACPlayerController::OnPossess(APawn* InPawn) { Super::OnPossess(InPawn); - CPlayerCharacter = Cast(InPawn); - if (CPlayerCharacter) + if (CPlayerCharacter = Cast(InPawn); IsValid(CPlayerCharacter)) { CPlayerCharacter->ServerSideInit(); } @@ -18,8 +17,7 @@ void ACPlayerController::OnPossess(APawn* InPawn) void ACPlayerController::AcknowledgePossession(class APawn* P) { Super::AcknowledgePossession(P); - CPlayerCharacter = Cast(P); - if (CPlayerCharacter) + if (CPlayerCharacter = Cast(P); IsValid(CPlayerCharacter)) { CPlayerCharacter->ClientSideInit(); } diff --git a/Source/Crunch/Public/Character/CCharacter.h b/Source/Crunch/Public/Character/CCharacter.h index 6552f87..d572f94 100644 --- a/Source/Crunch/Public/Character/CCharacter.h +++ b/Source/Crunch/Public/Character/CCharacter.h @@ -7,6 +7,9 @@ #include "GameFramework/Character.h" #include "CCharacter.generated.h" +class UCAbilitySystemComponent; +class UCAttributeSet; + UCLASS() class CRUNCH_API ACCharacter : public ACharacter, public IAbilitySystemInterface { @@ -24,7 +27,7 @@ public: private: UPROPERTY(EditDefaultsOnly, Category="Gameplay Effects") - class UCAbilitySystemComponent* CAbilitySystemComponent; - UPROPERTY() - class UCAttributeSet* CAttributeSet; + UCAbilitySystemComponent* CAbilitySystemComponent; + UPROPERTY(BlueprintReadOnly, Category="Gameplay Effects", meta=(AllowPrivateAccess=true)) + const UCAttributeSet* CAttributeSet; }; diff --git a/Source/Crunch/Public/GAS/CAbilitySystemComponent.h b/Source/Crunch/Public/GAS/CAbilitySystemComponent.h index 922f098..c039c56 100644 --- a/Source/Crunch/Public/GAS/CAbilitySystemComponent.h +++ b/Source/Crunch/Public/GAS/CAbilitySystemComponent.h @@ -7,7 +7,6 @@ #include "CAbilitySystemComponent.generated.h" - UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) class CRUNCH_API UCAbilitySystemComponent : public UAbilitySystemComponent { diff --git a/Source/Crunch/Public/GAS/CAttributeSet.h b/Source/Crunch/Public/GAS/CAttributeSet.h index 465bf82..c6cf103 100644 --- a/Source/Crunch/Public/GAS/CAttributeSet.h +++ b/Source/Crunch/Public/GAS/CAttributeSet.h @@ -7,7 +7,6 @@ #include "AttributeSet.h" #include "CAttributeSet.generated.h" - /** * This defines a set of helper functions for accessing and initializing attributes, to avoid having to manually write these functions. * It would creates the following functions, for attribute Health diff --git a/Source/Crunch/Public/Game/CGameMode.h b/Source/Crunch/Public/Game/CGameMode.h index 2de8390..10ab051 100644 --- a/Source/Crunch/Public/Game/CGameMode.h +++ b/Source/Crunch/Public/Game/CGameMode.h @@ -6,9 +6,6 @@ #include "GameFramework/GameModeBase.h" #include "CGameMode.generated.h" -/** - * - */ UCLASS() class CRUNCH_API ACGameMode : public AGameModeBase { diff --git a/Source/Crunch/Public/Player/CPlayerController.h b/Source/Crunch/Public/Player/CPlayerController.h index 1d56f75..656ca02 100644 --- a/Source/Crunch/Public/Player/CPlayerController.h +++ b/Source/Crunch/Public/Player/CPlayerController.h @@ -13,7 +13,7 @@ class CRUNCH_API ACPlayerController : public APlayerController public: virtual void OnPossess(APawn* InPawn) override; - virtual void AcknowledgePossession(class APawn* P) override; + virtual void AcknowledgePossession(APawn* P) override; private: UPROPERTY()