pcy35549
/
D2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[박치영] 추가작업

main
pcyoung 2024-04-03 07:56:18 +09:00
parent 3e70ac69c0
commit 205538211f
9 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/DefaultEngine.ini
View File

@ -1,8 +1,8 @@
[/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Maps/GameStartupMap.GameStartupMap
EditorStartupMap=/Game/Maps/GameStartupMap.GameStartupMap
GameDefaultMap=/Game/Maps/MainStageMap.MainStageMap
EditorStartupMap=/Game/Maps/MainStageMap.MainStageMap
TransitionMap=/Game/Maps/TransitionMap.TransitionMap
[/Script/WindowsTargetPlatform.WindowsTargetSettings]

BIN
Content/D2Contents/Blueprints/BP_D2BaseCharacter.uasset
View File

Binary file not shown.

BIN
Content/D2Contents/Blueprints/HUD/WBP_OverheadWidget.uasset
View File

Binary file not shown.

BIN
Content/D2Contents/Blueprints/HUD/WBP_PickupWidget.uasset 100644
View File

Binary file not shown.

BIN
Content/D2Contents/Blueprints/Weapon/BP_Weapon.uasset
View File

Binary file not shown.

BIN
Content/Maps/MainStageMap.umap
View File

Binary file not shown.

2
Source/D2/Character/D2BaseCharacter.h
View File

@ -18,7 +18,7 @@ public:
protected:
virtual void BeginPlay() override;
public:
virtual void Tick(float DeltaTime) override;
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;

26
Source/D2/Weapon/Weapon.cpp
View File

@ -3,7 +3,9 @@
#include "Weapon/Weapon.h"
#include "Character/D2BaseCharacter.h"
#include "Components/SphereComponent.h"
#include "Components/WidgetComponent.h"
AWeapon::AWeapon()
{
@ -23,16 +25,30 @@ AWeapon::AWeapon()
AreaSphere->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
AreaSphere->SetCollisionEnabled(ECollisionEnabled::NoCollision);
if(HasAuthority())
{
AreaSphere->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics);
AreaSphere->SetCollisionResponseToChannel(ECollisionChannel::ECC_Pawn, ECollisionResponse::ECR_Overlap);
}
PickupWidget = CreateDefaultSubobject<UWidgetComponent>(TEXT("PickupWidget"));
PickupWidget->SetupAttachment(RootComponent);
}
void AWeapon::BeginPlay()
{
Super::BeginPlay();
if(HasAuthority())
{
AreaSphere->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics);
AreaSphere->SetCollisionResponseToChannel(ECollisionChannel::ECC_Pawn, ECollisionResponse::ECR_Overlap);
AreaSphere->OnComponentBeginOverlap.AddDynamic(this, &AWeapon::OnSphereOverlap);
}
if(PickupWidget)
PickupWidget->SetVisibility(false);
}
void AWeapon::OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
{
AD2BaseCharacter* BaseCharacter = Cast<AD2BaseCharacter>(OtherActor);
if(BaseCharacter && PickupWidget)
PickupWidget->SetVisibility(true);
}
void AWeapon::Tick(float DeltaTime)

9
Source/D2/Weapon/Weapon.h
View File

@ -26,7 +26,9 @@ public:
protected:
virtual void BeginPlay() override;
UFUNCTION()
virtual void OnSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult);
public:
virtual void Tick(float DeltaTime) override;
@ -37,6 +39,9 @@ private:
UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
TObjectPtr<class USphereComponent> AreaSphere;
UPROPERTY(VisibleAnywhere)
UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
EWeaponState WeaponState;
UPROPERTY(VisibleAnywhere, Category = "Weapon Properties")
TObjectPtr<class UWidgetComponent> PickupWidget;
};