From 16ec5833ddb60b6120f602ca95c70f2eccc27129 Mon Sep 17 00:00:00 2001
From: Addin Munawwar <91366027+moonawar@users.noreply.github.com>
Date: Sat, 11 May 2024 05:08:51 +0700
Subject: [PATCH] polish: add orb pickup sound and pop up text
---
.vscode/settings.json | 2 +-
.../Effects/mario-power-up-epic-sound-fx.mp3 | Bin 0 -> 14183 bytes
.../mario-power-up-epic-sound-fx.mp3.meta | 23 +++
Assets/Prefabs/AudioManager.prefab | 16 +++
Assets/Prefabs/UIs/Text Pop Up.prefab | 136 ++++++++++++++++++
Assets/Prefabs/UIs/Text Pop Up.prefab.meta | 7 +
Assets/Scenes/Main 1.unity | 75 +++++++++-
Assets/Scripts/Audio/AudioManager.cs | 36 +++++
Assets/Scripts/Cutscene/TimelineManager.cs | 1 -
.../Orbs/Increase Damage/IncreaseDamage.cs | 6 +
.../Orbs/Increase Speed/IncreaseSpeed.cs | 6 +
Assets/Scripts/Orbs/Orb.cs | 8 +-
.../Orbs/Restore Health/RestoreHealth.cs | 6 +
Assets/Scripts/Quest/QuestManager.cs | 35 +++--
Assets/Scripts/UI/TextPopUpManager.cs | 89 ++++++++++++
Assets/Scripts/UI/TextPopUpManager.cs.meta | 11 ++
16 files changed, 439 insertions(+), 18 deletions(-)
create mode 100644 Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3
create mode 100644 Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3.meta
create mode 100644 Assets/Prefabs/UIs/Text Pop Up.prefab
create mode 100644 Assets/Prefabs/UIs/Text Pop Up.prefab.meta
create mode 100644 Assets/Scripts/UI/TextPopUpManager.cs
create mode 100644 Assets/Scripts/UI/TextPopUpManager.cs.meta
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b2449923..daa9bf8f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,5 +51,5 @@
"temp/": true,
"Temp/": true
},
- "dotnet.defaultSolution": "if3210-2024-unity-ngk.sln"
+ "dotnet.defaultSolution": "GamePBD.sln"
}
\ No newline at end of file
diff --git a/Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3 b/Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..52eafc5cb58eb6b06778eabf271063a8646ed80c
GIT binary patch
literal 14183
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
wYg2=hRS;h%k
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π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
Z|FbauALO^v(EH#1dl`LH`0oth{{jR4^w$6Y
literal 0
HcmV?d00001
diff --git a/Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3.meta b/Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3.meta
new file mode 100644
index 00000000..f65e5ed6
--- /dev/null
+++ b/Assets/Audio/Effects/mario-power-up-epic-sound-fx.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 51b9dccfd554bf947867209b8233cd27
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/AudioManager.prefab b/Assets/Prefabs/AudioManager.prefab
index 2ee76aae..6e70474f 100644
--- a/Assets/Prefabs/AudioManager.prefab
+++ b/Assets/Prefabs/AudioManager.prefab
@@ -52,24 +52,40 @@ MonoBehaviour:
Pitch: 1
Loop: 1
FadeDuration: 2
+ Type: 0
+ AudioSource: {fileID: 0}
- Name: Night
Clip: {fileID: 8300000, guid: cd824cba38f4bb847884440ffc6d9614, type: 3}
Volume: 0.04
Pitch: 1
Loop: 1
FadeDuration: 1.1
+ Type: 0
+ AudioSource: {fileID: 0}
- Name: Doom
Clip: {fileID: 8300000, guid: b265e1e2dc139eb49be6288b8f9b145b, type: 3}
Volume: 0.5
Pitch: 1
Loop: 1
FadeDuration: 1.1
+ Type: 0
+ AudioSource: {fileID: 0}
- Name: Termini
Clip: {fileID: 8300000, guid: aab5b1d4ba129e446907daf7129d67f0, type: 3}
Volume: 0.5
Pitch: 1
Loop: 1
FadeDuration: 1.1
+ Type: 0
+ AudioSource: {fileID: 0}
+ - Name: PowerUp
+ Clip: {fileID: 8300000, guid: 51b9dccfd554bf947867209b8233cd27, type: 3}
+ Volume: 0.5
+ Pitch: 1
+ Loop: 0
+ FadeDuration: 1.1
+ Type: 1
+ AudioSource: {fileID: 0}
--- !u!82 &3748856617707953316
AudioSource:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/UIs/Text Pop Up.prefab b/Assets/Prefabs/UIs/Text Pop Up.prefab
new file mode 100644
index 00000000..7995c0b1
--- /dev/null
+++ b/Assets/Prefabs/UIs/Text Pop Up.prefab
@@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5872306537687327695
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7088162887710753096}
+ - component: {fileID: 6718563646789644985}
+ - component: {fileID: 6649177100147590294}
+ m_Layer: 5
+ m_Name: Text Pop Up
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7088162887710753096
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5872306537687327695}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 340, y: 320}
+ m_SizeDelta: {x: 500, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6718563646789644985
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5872306537687327695}
+ m_CullTransparentMesh: 1
+--- !u!114 &6649177100147590294
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5872306537687327695}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: + Health!
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: b84a314e2fd609d468e86fefe98285cb, type: 2}
+ m_sharedMaterial: {fileID: -4785108331157109069, guid: b84a314e2fd609d468e86fefe98285cb, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4288868779
+ m_fontColor: {r: 0.6694455, g: 0.9433962, b: 0.6363475, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 36
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
diff --git a/Assets/Prefabs/UIs/Text Pop Up.prefab.meta b/Assets/Prefabs/UIs/Text Pop Up.prefab.meta
new file mode 100644
index 00000000..0ce5657a
--- /dev/null
+++ b/Assets/Prefabs/UIs/Text Pop Up.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: eb993e4c91cffaf4c836e0b7419fa9a8
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Main 1.unity b/Assets/Scenes/Main 1.unity
index 402d27a6..5c16cf1d 100644
--- a/Assets/Scenes/Main 1.unity
+++ b/Assets/Scenes/Main 1.unity
@@ -5838,6 +5838,55 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 428812970}
m_CullTransparentMesh: 1
+--- !u!1 &430794421
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 430794422}
+ - component: {fileID: 430794423}
+ m_Layer: 5
+ m_Name: TextPopUpManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &430794422
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 430794421}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 878613039}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &430794423
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 430794421}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 549d1446a0f7c4844b514c0e63b112c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ textPopUpPrefab: {fileID: 7088162887710753096, guid: eb993e4c91cffaf4c836e0b7419fa9a8, type: 3}
--- !u!1 &436685819
GameObject:
m_ObjectHideFlags: 0
@@ -11286,6 +11335,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 430794422}
- {fileID: 1612420044}
- {fileID: 1560957795}
- {fileID: 154434726}
@@ -25075,6 +25125,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 861f98f7583822c4abf4e734c516b17b, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &1734600111 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 35636913108109566, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
+ m_PrefabInstance: {fileID: 1734600097}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1734600098}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2f63ff02fc610a44b8a3af5fb2403b87, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1738628409
GameObject:
m_ObjectHideFlags: 0
@@ -28327,6 +28388,18 @@ PrefabInstance:
propertyPath: petSpawner
value:
objectReference: {fileID: 1668337493}
+ - target: {fileID: 4498850462545079711, guid: 52eff72d3b1cec44ebdcabc26791c5b6, type: 3}
+ propertyPath: ui.bagasText
+ value:
+ objectReference: {fileID: 35880654}
+ - target: {fileID: 4498850462545079711, guid: 52eff72d3b1cec44ebdcabc26791c5b6, type: 3}
+ propertyPath: playerBalance
+ value:
+ objectReference: {fileID: 1734600111}
+ - target: {fileID: 4498850462545079711, guid: 52eff72d3b1cec44ebdcabc26791c5b6, type: 3}
+ propertyPath: ui.javierText
+ value:
+ objectReference: {fileID: 1689318111}
- target: {fileID: 5611320276677058579, guid: 52eff72d3b1cec44ebdcabc26791c5b6, type: 3}
propertyPath: m_Name
value: Table_with_weapon
@@ -30044,6 +30117,7 @@ SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1692862994}
+ - {fileID: 878613039}
- {fileID: 1120270614}
- {fileID: 1734600097}
- {fileID: 2036252846}
@@ -30054,5 +30128,4 @@ SceneRoots:
- {fileID: 4401420999633289391}
- {fileID: 1026069216}
- {fileID: 797983394}
- - {fileID: 878613039}
- {fileID: 1668337494}
diff --git a/Assets/Scripts/Audio/AudioManager.cs b/Assets/Scripts/Audio/AudioManager.cs
index 6469eab7..8c487aee 100644
--- a/Assets/Scripts/Audio/AudioManager.cs
+++ b/Assets/Scripts/Audio/AudioManager.cs
@@ -2,6 +2,12 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+public enum AudioType
+{
+ BGM,
+ SFX
+}
+
[System.Serializable]
public class Sound
{
@@ -11,6 +17,8 @@ public class Sound
[Range(0.1f, 3f)] public float Pitch = 1f;
public bool Loop = true;
public float FadeDuration = 4f;
+ public AudioType Type = AudioType.BGM;
+ [HideInInspector] public AudioSource AudioSource;
}
public class AudioManager : MonoBehaviour
@@ -41,6 +49,22 @@ public class AudioManager : MonoBehaviour
DontDestroyOnLoad(gameObject);
audioSource = GetComponent<AudioSource>();
+
+ foreach (Sound sound in sounds)
+ {
+ sound.Clip.LoadAudioData();
+ if (sound.Type == AudioType.SFX)
+ {
+ sound.AudioSource = gameObject.AddComponent<AudioSource>();
+ sound.AudioSource.clip = sound.Clip;
+ sound.AudioSource.volume = sound.Volume;
+ sound.AudioSource.pitch = sound.Pitch;
+ sound.AudioSource.loop = sound.Loop;
+ } else
+ {
+ sound.AudioSource = audioSource;
+ }
+ }
}
public void PlayBGMOverwrite(string soundName)
@@ -87,6 +111,18 @@ public class AudioManager : MonoBehaviour
}
}
+ public void PlaySFX(string soundName)
+ {
+ Sound sound = System.Array.Find(sounds, s => s.Name == soundName);
+ if (sound == null)
+ {
+ Debug.LogWarning("Sound: " + soundName + " not found!");
+ return;
+ }
+
+ sound.AudioSource.Play();
+ }
+
private IEnumerator Crossfade(Sound sound)
{
Sound active = System.Array.Find(sounds, s => s.Name == activeBGM);
diff --git a/Assets/Scripts/Cutscene/TimelineManager.cs b/Assets/Scripts/Cutscene/TimelineManager.cs
index c55123d9..a5810658 100644
--- a/Assets/Scripts/Cutscene/TimelineManager.cs
+++ b/Assets/Scripts/Cutscene/TimelineManager.cs
@@ -62,7 +62,6 @@ public class TimelineManager : MonoBehaviour
}
public void NextTimeline() {
- Debug.Log("Time: " + playableDirector.time);
currentMarkIndex++;
playableDirector.Resume();
isPlaying = true;
diff --git a/Assets/Scripts/Orbs/Increase Damage/IncreaseDamage.cs b/Assets/Scripts/Orbs/Increase Damage/IncreaseDamage.cs
index d402b7eb..7d46b6ef 100644
--- a/Assets/Scripts/Orbs/Increase Damage/IncreaseDamage.cs
+++ b/Assets/Scripts/Orbs/Increase Damage/IncreaseDamage.cs
@@ -6,6 +6,7 @@ public class IncreaseDamage : Orb
protected override void OnTriggerEnter(Collider other)
{
+ base.OnTriggerEnter(other);
if (other.gameObject.CompareTag("Player"))
{
// Attempt to get the PlayerEffectable component from the player object
@@ -23,4 +24,9 @@ public class IncreaseDamage : Orb
Destroy(gameObject); // Destroy the orb after applying the effect
}
}
+
+ protected override string GetTextPopUpMessage()
+ {
+ return "+ Damage!";
+ }
}
diff --git a/Assets/Scripts/Orbs/Increase Speed/IncreaseSpeed.cs b/Assets/Scripts/Orbs/Increase Speed/IncreaseSpeed.cs
index c6d1f5ff..4aa3ff29 100644
--- a/Assets/Scripts/Orbs/Increase Speed/IncreaseSpeed.cs
+++ b/Assets/Scripts/Orbs/Increase Speed/IncreaseSpeed.cs
@@ -6,6 +6,7 @@ public class IncreaseSpeed : Orb
protected override void OnTriggerEnter(Collider other)
{
+ base.OnTriggerEnter(other);
if (other.gameObject.CompareTag("Player"))
{
Debug.Log("Speed: ");
@@ -14,4 +15,9 @@ public class IncreaseSpeed : Orb
Destroy(gameObject);
}
}
+
+ protected override string GetTextPopUpMessage()
+ {
+ return "+ Speed!";
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Orbs/Orb.cs b/Assets/Scripts/Orbs/Orb.cs
index d0919a85..f2382dc5 100644
--- a/Assets/Scripts/Orbs/Orb.cs
+++ b/Assets/Scripts/Orbs/Orb.cs
@@ -17,9 +17,9 @@ public abstract class Orb : MonoBehaviour
protected virtual void OnTriggerEnter(Collider other)
{
- if (other.gameObject.CompareTag("Player"))
- {
- Destroy(gameObject);
- }
+ AudioManager.Instance.PlaySFX("PowerUp");
+ TextPopUpManager.Instance.CreateTextPopUp(GetTextPopUpMessage(), 2f);
}
+
+ protected abstract string GetTextPopUpMessage();
}
\ No newline at end of file
diff --git a/Assets/Scripts/Orbs/Restore Health/RestoreHealth.cs b/Assets/Scripts/Orbs/Restore Health/RestoreHealth.cs
index f5868a13..1684dce2 100644
--- a/Assets/Scripts/Orbs/Restore Health/RestoreHealth.cs
+++ b/Assets/Scripts/Orbs/Restore Health/RestoreHealth.cs
@@ -8,6 +8,7 @@ public class RestoreHealth : Orb
protected override void OnTriggerEnter(Collider other)
{
+ base.OnTriggerEnter(other);
if (other.gameObject.CompareTag("Player"))
{
Debug.Log("healthh");
@@ -25,4 +26,9 @@ public class RestoreHealth : Orb
target.RemoveEffect(healEffect);
}
}
+
+ protected override string GetTextPopUpMessage()
+ {
+ return "+ Health!";
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs
index e1602bd1..687a908d 100644
--- a/Assets/Scripts/Quest/QuestManager.cs
+++ b/Assets/Scripts/Quest/QuestManager.cs
@@ -24,7 +24,6 @@ public class QuestManager : MonoBehaviour
public SphereRadius ParentHouse;
public SphereRadius Forest;
public OrbsSpawner orbsSpawner;
- public PlayerBalance Player;
public static QuestManager Instance { get; private set; }
public List<Quest> quests;
@@ -93,10 +92,15 @@ public class QuestManager : MonoBehaviour
}
}, onQuestStarted: () => {
TimelineManager.Instance.NextTimeline();
- OrbsSpawner.Instance.spawnFlag = true;
+ //OrbsSpawner.Instance.spawnFlag = true;
}, onQuestCompleted: () => {
+ foreach (var item in GameObject.FindGameObjectsWithTag("Enemy"))
+ {
+ Destroy(item);
+ }
+ TimelineManager.Instance.NextTimeline();
AudioManager.Instance.PlayBGMCrossfade("Night");
- OrbsSpawner.Instance.spawnFlag = false;
+ //OrbsSpawner.Instance.spawnFlag = false;
}));
// QUEST 3
@@ -109,7 +113,7 @@ public class QuestManager : MonoBehaviour
{
new SpawnerData
{
- SpawnArea = new SpawnArea { Origin = spawnTransform, Radius = 50},
+ SpawnArea = new SpawnArea { Origin = spawnTransform, Radius = 36},
Mob = General,
MobCount = 5,
SpawnInterval = 2f
@@ -117,11 +121,11 @@ public class QuestManager : MonoBehaviour
}
}, onQuestStarted: () => {
AudioManager.Instance.PlayBGMCrossfade("Doom");
- OrbsSpawner.Instance.spawnFlag = true;
+ //OrbsSpawner.Instance.spawnFlag = true;
StartSpawning();
}, onQuestCompleted: () => {
AudioManager.Instance.PlayBGMCrossfade("Night");
- OrbsSpawner.Instance.spawnFlag = false;
+ //OrbsSpawner.Instance.spawnFlag = false;
}));
// QUEST 4
@@ -129,11 +133,21 @@ public class QuestManager : MonoBehaviour
new GoalKill("Kill The Genderuwo", 1, EnemyType.Boss)
}, 200, new WaveData
{
+ Spawners = new List<SpawnerData>
+ {
+ new SpawnerData
+ {
+ SpawnArea = new SpawnArea { Origin = spawnTransform, Radius = 36},
+ Mob = General,
+ MobCount = 12,
+ SpawnInterval = 11f
+ },
+ }
}, onQuestStarted: () => {
TimelineManager.Instance.NextTimeline();
}, onQuestCompleted: () => {
AudioManager.Instance.PlayBGMCrossfade("Night");
- OrbsSpawner.Instance.spawnFlag = false;
+ //OrbsSpawner.Instance.spawnFlag = false;
}));
}
@@ -141,7 +155,6 @@ public class QuestManager : MonoBehaviour
public void StartQuest(int index)
{
GameObject.Find("Gameplay UI/GameOver UI/GameOverPanel").SetActive(false);
- Debug.Log("Starting quest " + index);
if (index < quests.Count)
{
Quest currentQuest = quests[index];
@@ -159,6 +172,7 @@ public class QuestManager : MonoBehaviour
{
waveSpawner.spawnFlag = true;
waveSpawner.SpawnWave(quests[currentQuestIndex].waveData);
+ OrbsSpawner.Instance.spawnFlag = true;
}
@@ -188,10 +202,9 @@ public class QuestManager : MonoBehaviour
QuestUI.Instance.ResetQuestUI();
waveSpawner.spawnFlag = false;
waveSpawner.DestroyAllMobs();
- Player.AddBalance(currentQuest.reward);
+ OrbsSpawner.Instance.spawnFlag = false;
+ currentQuest.onQuestCompleted?.Invoke();
}
-
- currentQuest.onQuestCompleted?.Invoke();
}
void Update()
diff --git a/Assets/Scripts/UI/TextPopUpManager.cs b/Assets/Scripts/UI/TextPopUpManager.cs
new file mode 100644
index 00000000..e7ed4093
--- /dev/null
+++ b/Assets/Scripts/UI/TextPopUpManager.cs
@@ -0,0 +1,89 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEditor;
+using UnityEngine;
+
+public class TextPopUpManager : MonoBehaviour
+{
+ public static TextPopUpManager Instance { get; private set; }
+ public RectTransform textPopUpPrefab;
+
+ private void Awake()
+ {
+ if (Instance == null)
+ {
+ Instance = this;
+ }
+ else
+ {
+ Destroy(gameObject);
+ }
+ }
+
+ public void CreateTextPopUp(string text, float duration = 1f)
+ {
+ StartCoroutine(CreateTextPopUpCoroutine(text, duration));
+ }
+
+ public IEnumerator CreateTextPopUpCoroutine(string text, float duration)
+ {
+
+ GameObject textPopUp = Instantiate(textPopUpPrefab.gameObject, Vector3.zero, Quaternion.identity, transform);
+ TextMeshProUGUI textMesh = textPopUp.GetComponent<TextMeshProUGUI>();
+ textMesh.text = text;
+
+ Vector3 halfPosition = textPopUpPrefab.transform.position;
+
+ Vector3 initialPosition = textPopUpPrefab.transform.position;
+ initialPosition.y -= 100;
+
+ textPopUp.transform.position = initialPosition;
+
+ Vector3 targetPosition = textPopUpPrefab.transform.position;
+ targetPosition.y += 100;
+
+ float timer = 0;
+ float halfDuration = duration / 2;
+ float alpha;
+
+ // First, fade in
+ while (timer < halfDuration)
+ {
+ timer += Time.deltaTime;
+ alpha = Mathf.Lerp(0, 1, timer / halfDuration);
+ textPopUp.transform.position = Vector3.Lerp(initialPosition, halfPosition, timer / halfDuration);
+ textMesh.color = new Color(textMesh.color.r, textMesh.color.g, textMesh.color.b, alpha);
+ yield return null;
+ }
+
+ // Then, fade out
+ timer = 0;
+ while (timer < halfDuration)
+ {
+ timer += Time.deltaTime;
+ alpha = Mathf.Lerp(1, 0, timer / halfDuration);
+ textPopUp.transform.position = Vector3.Lerp(halfPosition, targetPosition, timer / halfDuration);
+ textMesh.color = new Color(textMesh.color.r, textMesh.color.g, textMesh.color.b, alpha);
+ yield return null;
+ }
+
+ Destroy(textPopUp);
+ }
+}
+
+#if UNITY_EDITOR
+[CustomEditor(typeof(TextPopUpManager))]
+public class TextPopUpManagerEditor : Editor
+{
+ public override void OnInspectorGUI()
+ {
+ base.OnInspectorGUI();
+ TextPopUpManager textPopUpManager = (TextPopUpManager)target;
+ if (GUILayout.Button("Create Text Pop Up"))
+ {
+ textPopUpManager.CreateTextPopUp("Hello World");
+ }
+ }
+}
+#endif
\ No newline at end of file
diff --git a/Assets/Scripts/UI/TextPopUpManager.cs.meta b/Assets/Scripts/UI/TextPopUpManager.cs.meta
new file mode 100644
index 00000000..d521a1ee
--- /dev/null
+++ b/Assets/Scripts/UI/TextPopUpManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 549d1446a0f7c4844b514c0e63b112c2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab