Skip to content

Feature&Fix/GameSystem: 사망 판정 이상현상 베이스 설계, AnomalyID에 따라서 상호작용 변하도록 수정 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KaneBigNose merged 12 commits into from
Jan 10, 2026
Merged

Feature&Fix/GameSystem: 사망 판정 이상현상 베이스 설계, AnomalyID에 따라서 상호작용 변하도록 수정 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
507a6e9
Fix: 이상현상 상호작용 구별되도록 수정
kwkim526 Jan 8, 2026
8e18922
Merge branch 'Develop' into Feature/GameSystem
kwkim526 Jan 9, 2026
ee80628
Feat: 플레이어 사망 로직 추가
kwkim526 Jan 9, 2026
32ea58e
FIx: 사망 판정 모션 대기 시간 추가
kwkim526 Jan 9, 2026
bfeaa32
Fix: 사망 초 수정
kwkim526 Jan 9, 2026
72b9683
FIx: 오르골 이상현상
kwkim526 Jan 9, 2026
6e71234
Fix: 리뷰 기반으로 수정
kwkim526 Jan 10, 2026
b2b6808
Merge branch 'Develop' into Feature/GameSystem
kwkim526 Jan 10, 2026
7bc3d90
Merge branch 'Develop' into Feature/GameSystem
kwkim526 Jan 10, 2026
8f6db83
Refactor: 불필요한 함수 제거
kwkim526 Jan 10, 2026
42dbd5e
Fis: 머지받고 생긴 오류 수정
kwkim526 Jan 10, 2026
11b9a5f
Fix: 머지하면서 과거 버전으로 된 코드들 수정
kwkim526 Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Content/EndlessHotel/Anomaly/Object/MusicBox/BP_Anomaly_Object_MusicBox.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/EndlessHotel/Anomaly/Object/MusicBox/MyAnomaly_Object_MusicBox.uasset
View file
Open in desktop
Copy link
Collaborator

@KaneBigNose KaneBigNose Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

무슨 파일인지 정확하게는 모르겠으나 블루프린트라면 네이밍 컨벤션이 적용되지 않았습니다

Copy link
Collaborator Author

@kwkim526 kwkim526 Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

해당 파일 이름은 수정하겠습니다.

Binary file not shown.
Binary file modified Content/EndlessHotel/Data/DT_AnomalyData.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/__ExternalActors__/EndlessHotel/Map/Hotel/2/DW/R728HUIMNQBC4YHSF5QR69.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/__ExternalActors__/EndlessHotel/Map/Hotel/5/1C/ACELQB6F4EKYS6UDW79TMZ.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/__ExternalActors__/EndlessHotel/Map/Hotel/5/B4/WSDUH3GOQQDQ1F067NSRLF.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/__ExternalActors__/EndlessHotel/Map/Hotel/C/81/Z4UWUSZR2E9BJ6ET23EROR.uasset
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions Source/Endless_Hotel/Anomaly/Base/Anomaly_Base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <Kismet/GameplayStatics.h>
#include <Components/BoxComponent.h>

FAnomalyDelegate AAnomaly_Base::AnomalyDelegate;

#pragma region Base

AAnomaly_Base::AAnomaly_Base(const FObjectInitializer& ObjectInitializer)
Expand Down Expand Up @@ -85,4 +87,13 @@ void AAnomaly_Base::StartImmediate()
StartAnomalyAction();
}

#pragma endregion

#pragma region Player

void AAnomaly_Base::KillPlayer()
{
AnomalyDelegate.Broadcast(false);
}

#pragma endregion
20 changes: 14 additions & 6 deletions Source/Endless_Hotel/Anomaly/Base/Anomaly_Base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@

#include "Actor/EHActor.h"
#include <CoreMinimal.h>
#include <Delegates/DelegateCombinations.h>
#include <Anomaly_Base.generated.h>

#pragma region Declare

class AAnomaly_Object_Base;

DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FAnomalyDelegate, bool, bIsStart);

#pragma endregion

UCLASS(Blueprintable, BlueprintType)
Expand Down Expand Up @@ -44,6 +47,8 @@ class ENDLESS_HOTEL_API AAnomaly_Base : public AEHActor
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Anomaly|ID")
uint8 AnomalyID = -1;

static FAnomalyDelegate AnomalyDelegate;

protected:
TFunction<void(class AAnomaly_Object_Base*)> AnomalyAction;

Expand All @@ -52,14 +57,10 @@ class ENDLESS_HOTEL_API AAnomaly_Base : public AEHActor
#pragma region Verdicts

public:
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Anomaly|Verdict")
bool bIsCorrectElevator = false;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Anomaly|Verdict")
bool bIsSolved = false;

protected:

UFUNCTION()
void SetVerdictMode(EAnomalyVerdictMode NewMode);

Expand All @@ -68,8 +69,8 @@ class ENDLESS_HOTEL_API AAnomaly_Base : public AEHActor
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) PURE_VIRTUAL(AAnomaly_Base::ActivateAnomaly, ;);
virtual void DisableAnomaly(uint8 Anomaly_ID) {}
virtual void ActivateAnomaly() PURE_VIRTUAL(AAnomaly_Base::ActivateAnomaly, ;);
virtual void DisableAnomaly() {}

#pragma endregion

Expand Down Expand Up @@ -103,4 +104,11 @@ class ENDLESS_HOTEL_API AAnomaly_Base : public AEHActor

#pragma endregion

#pragma region Player

protected:
virtual void KillPlayer();

#pragma endregion

};
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/Base/Anomaly_Base_EightExit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void AAnomaly_Base_EightExit::BeginPlay()
#pragma region Activities

// Anomaly_Base_EightExit.cpp
void AAnomaly_Base_EightExit::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Base_EightExit::ActivateAnomaly()
{
// Activites
UE_LOG(LogTemp, Log, TEXT("[EightExit] AnomalyID: %d Activated."), AnomalyID);
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/Base/Anomaly_Base_EightExit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ENDLESS_HOTEL_API AAnomaly_Base_EightExit : public AAnomaly_Base
#pragma region Activities

protected:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/Base/Anomaly_Base_Neapolitan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void AAnomaly_Base_Neapolitan::BeginPlay()
SetVerdictMode(EAnomalyVerdictMode::Both_AND); // VerdictMode Setting
}

void AAnomaly_Base_Neapolitan::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Base_Neapolitan::ActivateAnomaly()
{
// Activites
UE_LOG(LogTemp, Log, TEXT("[Neapolitan] Activated."));
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/Base/Anomaly_Base_Neapolitan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ENDLESS_HOTEL_API AAnomaly_Base_Neapolitan : public AAnomaly_Base
public:
virtual void InteractSolveVerdict(); //상호작용 이상현상 판정
protected:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
4 changes: 2 additions & 2 deletions Source/Endless_Hotel/Anomaly/EightExit/Blur/Anomaly_Blur.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ AAnomaly_Blur::AAnomaly_Blur(const FObjectInitializer& ObjectInitializer)

#pragma region Activity

void AAnomaly_Blur::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Blur::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

FTimerHandle StartHandle;
GetWorld()->GetTimerManager().SetTimer(StartHandle, FTimerDelegate::CreateWeakLambda(this, [this]()
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Blur/Anomaly_Blur.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ENDLESS_HOTEL_API AAnomaly_Blur : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
8 changes: 4 additions & 4 deletions Source/Endless_Hotel/Anomaly/EightExit/Ceiling/Anomaly_Ceiling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

#pragma region Activity

void AAnomaly_Ceiling::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Ceiling::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

switch (Anomaly_ID)
switch (AnomalyID)
{
case 11:
AnomalyAction = ([](AAnomaly_Object_Base* AnomalyObject)
Expand All @@ -19,7 +19,7 @@ void AAnomaly_Ceiling::ActivateAnomaly(uint8 Anomaly_ID)
break;
}

StartAnomalyAction();
StartImmediate();
}

#pragma endregion
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Ceiling/Anomaly_Ceiling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ENDLESS_HOTEL_API AAnomaly_Ceiling : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
4 changes: 2 additions & 2 deletions Source/Endless_Hotel/Anomaly/EightExit/Cry/Anomaly_Cry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ AAnomaly_Cry::AAnomaly_Cry(const FObjectInitializer& ObjectInitializer)

#pragma region Activity

void AAnomaly_Cry::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Cry::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

FTimerHandle SoundHandle;
GetWorld()->GetTimerManager().SetTimer(SoundHandle, FTimerDelegate::CreateWeakLambda(this, [this]()
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Cry/Anomaly_Cry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ENDLESS_HOTEL_API AAnomaly_Cry : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
6 changes: 3 additions & 3 deletions Source/Endless_Hotel/Anomaly/EightExit/Door/Anomaly_Door.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ AAnomaly_Door::AAnomaly_Door(const FObjectInitializer& ObjectInitializer)

#pragma region Activity

void AAnomaly_Door::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Door::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

switch (Anomaly_ID)
switch (AnomalyID)
{
case 4:
AnomalyAction = ([](AAnomaly_Object_Base* AnomalyObject)
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Door/Anomaly_Door.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ENDLESS_HOTEL_API AAnomaly_Door : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
6 changes: 3 additions & 3 deletions Source/Endless_Hotel/Anomaly/EightExit/FootStep/Anomaly_FootStep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include "Kismet/GameplayStatics.h"
#include "Components/SkeletalMeshComponent.h"

void AAnomaly_FootStep::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_FootStep::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

switch (Anomaly_ID) {
switch (AnomalyID) {
case 15:
FootStep();
break;
Expand Down
5 changes: 1 addition & 4 deletions Source/Endless_Hotel/Anomaly/EightExit/FootStep/Anomaly_FootStep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
#include "Anomaly/Base/Anomaly_Base_EightExit.h"
#include "Anomaly_FootStep.generated.h"

/**
*
*/
UCLASS()
class ENDLESS_HOTEL_API AAnomaly_FootStep : public AAnomaly_Base_EightExit
{
Expand All @@ -17,7 +14,7 @@ class ENDLESS_HOTEL_API AAnomaly_FootStep : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
8 changes: 4 additions & 4 deletions Source/Endless_Hotel/Anomaly/EightExit/Ghost/Anomaly_Ghost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Copyright by 2025-2 WAP Game 2 team
// Copyright by 2025-2 WAP Game 2 team

#include "Anomaly/EightExit/Ghost/Anomaly_Ghost.h"
#include "Anomaly/Object/Ghost/Anomaly_Object_Ghost.h"

void AAnomaly_Ghost::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Ghost::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

switch (Anomaly_ID)
switch (AnomalyID)
{
case 28:
AnomalyAction = [](AAnomaly_Object_Base* Obj)
Expand Down
4 changes: 2 additions & 2 deletions Source/Endless_Hotel/Anomaly/EightExit/Ghost/Anomaly_Ghost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright by 2025-2 WAP Game 2 team
// Copyright by 2025-2 WAP Game 2 team

#pragma once

Expand All @@ -15,7 +15,7 @@ class ENDLESS_HOTEL_API AAnomaly_Ghost : public AAnomaly_Base_EightExit
GENERATED_BODY()

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;
};


6 changes: 3 additions & 3 deletions Source/Endless_Hotel/Anomaly/EightExit/GhostHand/Anomaly_GhostHand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright by 2025-2 WAP Game 2 team
// Copyright by 2025-2 WAP Game 2 team


#include "Anomaly/EightExit/GhostHand/Anomaly_GhostHand.h"
Expand Down Expand Up @@ -37,9 +37,9 @@ void AAnomaly_GhostHand::EndPlay(const EEndPlayReason::Type EndPlayReason)
#pragma endregion

#pragma region Activity
void AAnomaly_GhostHand::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_GhostHand::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();
ExecuteGhostHand();
}
#pragma endregion
Expand Down
4 changes: 2 additions & 2 deletions Source/Endless_Hotel/Anomaly/EightExit/GhostHand/Anomaly_GhostHand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright by 2025-2 WAP Game 2 team
// Copyright by 2025-2 WAP Game 2 team

#pragma once

Expand All @@ -22,7 +22,7 @@ class ENDLESS_HOTEL_API AAnomaly_GhostHand : public AAnomaly_Base_EightExit

#pragma region Activity
public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;
#pragma endregion

#pragma region GhostHand
Expand Down
4 changes: 2 additions & 2 deletions Source/Endless_Hotel/Anomaly/EightExit/Hair/Anomaly_Hair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ void AAnomaly_Hair::BeginPlay()
HairTimeline->AddInterpFloat(Curve_HairOpacity, UpdateDelegate);
}

void AAnomaly_Hair::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Hair::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

ActiveTrigger();

Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Hair/Anomaly_Hair.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ENDLESS_HOTEL_API AAnomaly_Hair : public AAnomaly_Base_EightExit
virtual void BeginPlay() override;

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;


#pragma region Trigger
Expand Down
6 changes: 3 additions & 3 deletions Source/Endless_Hotel/Anomaly/EightExit/Light/Anomaly_Light.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ AAnomaly_Light::AAnomaly_Light(const FObjectInitializer& ObjectInitializer)

#pragma region Activity

void AAnomaly_Light::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Light::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

switch (Anomaly_ID)
switch (AnomalyID)
{
case 2:
AnomalyAction = ([](AAnomaly_Object_Base* AnomalyObject)
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Light/Anomaly_Light.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ENDLESS_HOTEL_API AAnomaly_Light : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion

Expand Down
6 changes: 3 additions & 3 deletions Source/Endless_Hotel/Anomaly/EightExit/Plant/Anomaly_Plant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

#pragma region Activity

void AAnomaly_Plant::ActivateAnomaly(uint8 Anomaly_ID)
void AAnomaly_Plant::ActivateAnomaly()
{
Super::ActivateAnomaly(Anomaly_ID);
Super::ActivateAnomaly();

switch (Anomaly_ID)
switch (AnomalyID)
{
case 10:
AnomalyAction = ([](AAnomaly_Object_Base* AnomalyObject)
Expand Down
2 changes: 1 addition & 1 deletion Source/Endless_Hotel/Anomaly/EightExit/Plant/Anomaly_Plant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ENDLESS_HOTEL_API AAnomaly_Plant : public AAnomaly_Base_EightExit
#pragma region Activity

public:
virtual void ActivateAnomaly(uint8 Anomaly_ID) override;
virtual void ActivateAnomaly() override;

#pragma endregion
};
Loading