Merge pull request #10 from kookmin-sw/dev

0.0.2

capstone_2024_20/Config/DefaultEngine.ini

@@ -1,9 +1,9 @@
 
 
 [/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Game/Level/level_1.level_1
+GameDefaultMap=/Game/Level/level_Title.level_Title
 GlobalDefaultGameMode=/Game/Blueprints/BP_MyGameModeBase.BP_MyGameModeBase_C
-EditorStartupMap=/Game/Level/level_1.level_1
+EditorStartupMap=/Game/Level/level_Title.level_Title
 
 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12

capstone_2024_20/Source/capstone_2024_20/CannonBall.cpp.rej

@@ -0,0 +1,22 @@
+diff a/capstone_2024_20/Source/capstone_2024_20/CannonBall.cpp b/capstone_2024_20/Source/capstone_2024_20/CannonBall.cpp	(rejected hunks)
+@@ -52,11 +52,19 @@
+ 	// 여기에 충돌 시 필요한 로직을 구현합니다. 예를 들면, 폭발 이펙트 생성, 피해 적용 등이 있습니다.
+ 	// 이 예제에서는 단순히 로그를 출력하는 것으로 처리합니다.
+ 	UE_LOG(LogTemp, Warning, TEXT("Projectile hit: %s"), *OtherActor->GetName());
++	GEngine->AddOnScreenDebugMessage(-1,
++	                                 60.f, FColor::Emerald, TEXT("On Hit!!"));
+ 	if (WaterSplashEffect)
+ 	{
+ 		FVector Scale(3.0f, 3.0f, 3.0f);
+ 		UGameplayStatics::SpawnEmitterAtLocation(GetWorld(), WaterSplashEffect, Hit.ImpactPoint, FRotator(0.0f), Scale);
+ 	}
+ 	// 충돌 후 발사체를 제거합니다.
+-	Destroy();
++
++
++	if (GetWorld())
++	{
++		FTimerHandle TimerHandle;
++		GetWorld()->GetTimerManager().SetTimer(TimerHandle, this, &ThisClass::DestroyDelay, destroyDelayTime, false);
++	}
+ }

capstone_2024_20/Source/capstone_2024_20/CannonControlStrategy.cpp

@@ -2,9 +2,9 @@
 
 
 #include "CannonControlStrategy.h"
-
-#include "MyCannon.h"
 #include "MyPlayerController.h"
+#include "MyCannon.h"
+
 
 void CannonControlStrategy::Move(const FInputActionInstance& Instance, AActor* Actor,APlayerController* PlayerController, float DeltaTime)
 {
@@ -22,7 +22,7 @@ void CannonControlStrategy::Move(const FInputActionInstance& Instance, AActor* A
 		//Cannon->M_ShooterMesh->SetRelativeRotation(NewRotation);
 
 		AMyPlayerController* Controller = Cast<AMyPlayerController>(PlayerController);
-		Controller->ServerRPC_MoveCannon(Cannon, NewRotation);
+		Controller->ServerRPC_RotateCannon(Cannon, NewRotation);
 
 
 	}

capstone_2024_20/Source/capstone_2024_20/EnemyShip/EnemyShip.cpp

@@ -0,0 +1,39 @@
+#include "EnemyShip.h"
+#include "../MyShip.h"
+
+AEnemyShip::AEnemyShip(): StaticMesh(nullptr)
+{
+	// TODO@autumn - This is a temporary mesh, replace it with the actual mesh from data
+	StaticMesh = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("StaticMesh"));
+	StaticMesh->SetStaticMesh(LoadObject<UStaticMesh>(nullptr, TEXT("/Script/Engine.StaticMesh'/Game/GameObjects/FlatShip/Ship_Ship.Ship_Ship'")));
+	RootComponent = StaticMesh;
+}
+
+void AEnemyShip::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void AEnemyShip::LookAtMyShip(const AMyShip* MyShip)
+{
+	const auto Direction = MyShip->GetActorLocation() - GetActorLocation();
+	const auto Rotation = FRotationMatrix::MakeFromX(Direction).Rotator();
+	SetActorRotation(Rotation);
+}
+
+void AEnemyShip::MoveToMyShip(const AMyShip* MyShip)
+{
+	const auto MyShipLocation = MyShip->GetActorLocation();
+	const auto Direction = MyShipLocation - GetActorLocation();
+
+	// Todo@autumn - This is a temporary solution, replace it with data.
+	if (Direction.Size() < 4000.0f)
+	{
+		return;
+	}
+
+	const auto NormalizedDirection = Direction.GetSafeNormal();
+	constexpr auto Speed = 2500.0f; // Todo@autumn - This is a temporary solution, replace it with data.
+	const auto NewLocation = GetActorLocation() + NormalizedDirection * Speed * GetWorld()->DeltaTimeSeconds;
+	SetActorLocation(NewLocation);
+}

capstone_2024_20/Source/capstone_2024_20/EnemyShip/EnemyShip.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "EnemyShip.generated.h"
+
+class AMyShip;
+
+UCLASS()
+class AEnemyShip : public AActor
+{
+	GENERATED_BODY()
+
+public:
+	AEnemyShip();
+	virtual void BeginPlay() override;
+
+	void LookAtMyShip(const AMyShip* MyShip);
+	void MoveToMyShip(const AMyShip* MyShip);
+
+private:
+	UPROPERTY(EditAnywhere)
+	UStaticMeshComponent* StaticMesh;
+};

capstone_2024_20/Source/capstone_2024_20/Event/Event.cpp

@@ -0,0 +1,14 @@
+#include "Event.h"
+
+AEvent::AEvent(): StaticMesh(nullptr)
+{
+	// TODO@autumn - This is a temporary mesh, replace it with the actual mesh from data
+	StaticMesh = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("StaticMesh"));
+	StaticMesh->SetStaticMesh(LoadObject<UStaticMesh>(nullptr, TEXT("/Script/Engine.StaticMesh'/Game/GameObjects/Wood/wood_mesh.wood_mesh'")));
+	RootComponent = StaticMesh;
+}
+
+void AEvent::BeginPlay()
+{
+	Super::BeginPlay();
+}

capstone_2024_20/Source/capstone_2024_20/Event/Event.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
+#include "Event.generated.h"
+
+UCLASS()
+class CAPSTONE_2024_20_API AEvent : public AActor
+{
+	GENERATED_BODY()
+
+public:
+	AEvent();
+
+	virtual void BeginPlay() override;
+
+private:
+	UPROPERTY(EditAnywhere)
+	UStaticMeshComponent* StaticMesh;
+};

capstone_2024_20/Source/capstone_2024_20/IControlStrategy.h

@@ -4,7 +4,6 @@
 
 #include "CoreMinimal.h"
 #include "InputAction.h"
-
 /**
  * 
  */

capstone_2024_20/Source/capstone_2024_20/MyCannon.cpp

@@ -64,12 +64,23 @@ void AMyCannon::MultiCastRPC_FireCannon_Implementation()
 	// 발사체에 추가적인 로직이 필요하면 여기에 작성
 }
 
-void AMyCannon::MoveCannon(FRotator newRot)
+void AMyCannon::RotateCannon(FRotator newRot)
 {
-	MultiCastRPC_MoveCannon(newRot);
+	MultiCastRPC_RotateCannon(newRot);
 }
 
-void AMyCannon::MultiCastRPC_MoveCannon_Implementation(FRotator newRot)
+void AMyCannon::MultiCastRPC_RotateCannon_Implementation(FRotator newRot)
 {
 	M_ShooterMesh->SetRelativeRotation(newRot);
 }
+
+bool AMyCannon::GetIsLoad()
+{
+	return IsLoad;
+}
+
+void AMyCannon::SetIsLoad(bool b)
+{
+	IsLoad = b;
+}
+

capstone_2024_20/Source/capstone_2024_20/MyCannon.h

@@ -19,6 +19,9 @@ class CAPSTONE_2024_20_API AMyCannon : public AActor
 	// Called when the game starts or when spawned
 	virtual void BeginPlay() override;
 
+private:
+	bool IsLoad = false;
+
 public:	
 	// Called every frame
 	virtual void Tick(float DeltaTime) override;
@@ -49,10 +52,12 @@ class CAPSTONE_2024_20_API AMyCannon : public AActor
 	void MultiCastRPC_FireCannon();
 
 	UFUNCTION()
-	void MoveCannon(FRotator newRot);
+	void RotateCannon(FRotator newRot);
 
 	UFUNCTION(NetMulticast, Reliable)
-	void MultiCastRPC_MoveCannon(FRotator newRot);
+	void MultiCastRPC_RotateCannon(FRotator newRot);
 
+	bool GetIsLoad();
+	void SetIsLoad(bool b);
 
 };