menuscreen thumbs up and reload sound

Developer-The-Great · Jan 17, 2022 · 17af410 · 17af410
1 parent ce97574
commit 17af410
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 2 deletions.
diff --git a/ProjectManus/Content/BP/FlyingCharacterPawnBP.uasset b/ProjectManus/Content/BP/FlyingCharacterPawnBP.uasset
diff --git a/ProjectManus/Content/BP/RestartCheckerActorBP.uasset b/ProjectManus/Content/BP/RestartCheckerActorBP.uasset
diff --git a/ProjectManus/Content/Level/ArtMap.umap b/ProjectManus/Content/Level/ArtMap.umap
diff --git a/ProjectManus/Content/Level/Menu.umap b/ProjectManus/Content/Level/Menu.umap
diff --git a/...ectManus/Content/Videos/FlyAnimUnreal.m4v → ...ectManus/Content/Movies/FlyAnimUnreal.m4v b/...ectManus/Content/Videos/FlyAnimUnreal.m4v → ...ectManus/Content/Movies/FlyAnimUnreal.m4v
diff --git a/ProjectManus/Content/Movies/Flying-Tutorial.mp4 b/ProjectManus/Content/Movies/Flying-Tutorial.mp4
diff --git a/...ctManus/Content/Videos/GunAnimUnreal2.mp4 → ...ctManus/Content/Movies/GunAnimUnreal2.mp4 b/...ctManus/Content/Videos/GunAnimUnreal2.mp4 → ...ctManus/Content/Movies/GunAnimUnreal2.mp4
diff --git a/ProjectManus/Content/Movies/Reload-Tutorial.mp4 b/ProjectManus/Content/Movies/Reload-Tutorial.mp4
diff --git a/ProjectManus/Content/Movies/Shield-Tutorial.mp4 b/ProjectManus/Content/Movies/Shield-Tutorial.mp4
diff --git a/ProjectManus/Content/Movies/Shooting-Tutorial.mp4 b/ProjectManus/Content/Movies/Shooting-Tutorial.mp4
diff --git a/ProjectManus/Content/Sounds/Alienship_Reload_Effect.uasset b/ProjectManus/Content/Sounds/Alienship_Reload_Effect.uasset
diff --git a/ProjectManus/Content/Sounds/Alienship_Reload_Effect.wav b/ProjectManus/Content/Sounds/Alienship_Reload_Effect.wav
diff --git a/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Flying-Tutorial.uasset b/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Flying-Tutorial.uasset
diff --git a/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Reload_Tutorial-New.uasset b/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Reload_Tutorial-New.uasset
diff --git a/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Reload_Tutorial.uasset b/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Reload_Tutorial.uasset
diff --git a/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Shield-Tutorial.uasset b/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Shield-Tutorial.uasset
diff --git a/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Shooting-Tutorial.uasset b/ProjectManus/Content/UserInterface/Assets/New_UI/Video/Shooting-Tutorial.uasset
diff --git a/ProjectManus/Content/UserInterface/MenuScreen.uasset b/ProjectManus/Content/UserInterface/MenuScreen.uasset
diff --git a/ProjectManus/Content/UserInterface/TutorialScreen.uasset b/ProjectManus/Content/UserInterface/TutorialScreen.uasset
diff --git a/ProjectManus/Source/ProjectManus/Private/ShooterComponent.cpp b/ProjectManus/Source/ProjectManus/Private/ShooterComponent.cpp
@@ -61,6 +61,24 @@ void UShooterComponent::EndFire()
 	GetOwner()->GetWorldTimerManager().ClearTimer(projectileFiringTimeHandle);
 }
 
+void UShooterComponent::ClearReloadTime()
+{
+	currentReloadTime = 0.0f;
+	OnEndReload.Broadcast();
+}
+
+void UShooterComponent::AddReloadTime(float dt)
+{
+	if (currentReloadTime == 0.0f && currentAmno < defaultAmno)
+	{
+		OnBeginReload.Broadcast();
+	}
+
+	currentReloadTime += dt;
+
+
+}
+
 // Sets default values for this component's properties
 UShooterComponent::UShooterComponent()
 {

diff --git a/ProjectManus/Source/ProjectManus/Public/FlyingCharacterPawn.h b/ProjectManus/Source/ProjectManus/Public/FlyingCharacterPawn.h
@@ -165,6 +165,7 @@ class PROJECTMANUS_API AFlyingCharacterPawn : public APawn
 	UFUNCTION(BlueprintImplementableEvent, Category = "Shooting")
 		void OnHitShield();
 
+
 protected:
 	// Called when the game starts or when spawned
 	virtual void BeginPlay() override;

diff --git a/ProjectManus/Source/ProjectManus/Public/ShooterComponent.h b/ProjectManus/Source/ProjectManus/Public/ShooterComponent.h
@@ -10,6 +10,9 @@ class AProjectile;
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnProjectileShootSignature);
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FBeginReloadSignature);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FEndReloadSignature);
+
 UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )
 class PROJECTMANUS_API UShooterComponent : public USceneComponent
 {
@@ -61,8 +64,8 @@ class PROJECTMANUS_API UShooterComponent : public USceneComponent
 	void FireProjectile();
 	void EndFire();
 
-	void ClearReloadTime() { currentReloadTime = 0.0f; }
-	void AddReloadTime(float dt){ currentReloadTime += dt; }
+	void ClearReloadTime();
+	void AddReloadTime(float dt);
 	void Reload() 
 	{
 		currentAmno = defaultAmno; 
@@ -89,5 +92,11 @@ class PROJECTMANUS_API UShooterComponent : public USceneComponent
 
 	UPROPERTY(BlueprintAssignable, Category = "Events")
 		FOnProjectileShootSignature OnShootProjectile;
+
+	UPROPERTY(BlueprintAssignable, Category = "Events")
+		FBeginReloadSignature OnBeginReload;
+
+	UPROPERTY(BlueprintAssignable, Category = "Events")
+		FEndReloadSignature OnEndReload;
 
 };