Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
Copy link
Collaborator

Choose a reason for hiding this comment

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

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

Copy link
Collaborator Author

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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Plugins
8 changes: 2 additions & 6 deletions Source/Endless_Hotel/Anomaly/Base/Anomaly_Base.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,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 +64,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
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
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
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
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
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
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
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 Down
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
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
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
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
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
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
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
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
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;
};


4 changes: 2 additions & 2 deletions Source/Endless_Hotel/Anomaly/EightExit/Hair/Anomaly_Hair.cpp
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
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
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
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
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
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
};
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Copyright by 2025-2 WAP Game 2 team
// Copyright by 2025-2 WAP Game 2 team


#include "Anomaly/EightExit/ShelfBook/Anomaly_ShelfBook.h"
#include "Anomaly/Object/ShelfBook/Anomaly_Object_ShelfBook.h"

#pragma region Activitiy

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

switch (Anomaly_ID)
switch (AnomalyID)
{
case 9:
AnomalyAction = ([](AAnomaly_Object_Base* AnomlayObject)
Expand Down
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 @@ -14,7 +14,7 @@ class ENDLESS_HOTEL_API AAnomaly_ShelfBook : public AAnomaly_Base_EightExit
#pragma region Activitiy

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

#pragma endregion
};
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ void AAnomaly_Shrink::BeginPlay()

#pragma region Activity

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

FTimerHandle StartHandle;
GetWorld()->GetTimerManager().SetTimer(StartHandle, FTimerDelegate::CreateWeakLambda(this, [this]()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ENDLESS_HOTEL_API AAnomaly_Shrink : public AAnomaly_Base_EightExit
#pragma region Activity

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

#pragma endregion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

#pragma region Activity

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

switch (Anomaly_ID)
switch (AnomalyID)
{
case 89:
AnomalyAction = ([](AAnomaly_Object_Base* Clock)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ENDLESS_HOTEL_API AAnomaly_Clock : public AAnomaly_Base_Neapolitan
#pragma region Activity

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

#pragma endregion

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Copyright by 2025-2 WAP Game 2 team
// Copyright by 2025-2 WAP Game 2 team


#include "Anomaly/Neapolitan/Float/Anomaly_Float.h"
#include "Anomaly/Object/Float/Anomaly_Object_Float.h"

#pragma region Activity

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

switch (Anomaly_ID)
switch (AnomalyID)
{
case 88:
AnomalyAction = ([](AAnomaly_Object_Base* Float)
Expand Down
Loading