diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/CombatBehavior.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/CombatBehavior.cs index de3a0f113687ae29b73e7778aa5889a7b0bf1ece..ab763fb4ffbe92f6ab2c291a6598c762813cf59a 100644 --- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/CombatBehavior.cs +++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/CombatBehavior.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Data.Common; using System.Threading; using UnityEngine; using UnityEngine.SceneManagement; @@ -21,6 +22,11 @@ public class CombatBehavior : MonoBehaviour { health -= damage; + if (gameObject.name != "MainPlayer") + { + GameManager.EnemyDamaged(health, maxHealth, gameObject.tag); + } + if (health <= 0) { if (gameObject.name == "MainPlayer") diff --git a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/GameManager.cs b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/GameManager.cs index 893774026b395faa99977909d46dc4c5e435d562..5069cc60cfd526eb36b4c9848aefd44b042bba4d 100644 --- a/IF3210-2024-Unity-AFK/Assets/Code/Scripts/GameManager.cs +++ b/IF3210-2024-Unity-AFK/Assets/Code/Scripts/GameManager.cs @@ -16,6 +16,12 @@ public class GameManager : MonoBehaviour, IDataPersistence PlayerPrefs.SetInt("kill_count", PlayerPrefs.GetInt("kill_count") + 1); } + public static event Action<int, int, string> OnEnemyDamaged; + public static void EnemyDamaged(int remHealth, int maxHealth, string tag) + { + OnEnemyDamaged?.Invoke(remHealth, maxHealth, tag); + } + public static event Action<string> OnStartQuest; public static void StartQuest(string id) { diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Environment/Barrier.prefab b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Environment/Barrier.prefab index a5c426e09625904c52803459754d28bce3f7311b..ceb593247ef1d96a321d83ad98e6e7d7ec8dd80c 100644 --- a/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Environment/Barrier.prefab +++ b/IF3210-2024-Unity-AFK/Assets/Level/Prefabs/Environment/Barrier.prefab @@ -9,6 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8498376491828176079} + - component: {fileID: 3360643358609907337} + - component: {fileID: 3965335817849620461} + - component: {fileID: 8332505657385747732} m_Layer: 0 m_Name: Barrier m_TagString: Untagged @@ -26,8 +29,80 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 700, y: 300, z: 0} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3360643358609907337 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842488736505890084} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3965335817849620461 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842488736505890084} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &8332505657385747732 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842488736505890084} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity index fea27797e6e73eff7f296b531e8488bad8cc0dd7..184f6e5f96cfd7855d373cd7bca54fb0409f411f 100644 --- a/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity +++ b/IF3210-2024-Unity-AFK/Assets/Level/Scenes/Main 2.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.10493205, g: 0.1865589, b: 0.23119539, a: 1} + m_IndirectSpecularColor: {r: 0.10526762, g: 0.18650743, b: 0.23125023, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1531,6 +1531,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c31bf8ec8e29cd74f9fb9a970fde7a53, type: 3} +--- !u!4 &157856504 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + m_PrefabInstance: {fileID: 2144017785} + m_PrefabAsset: {fileID: 0} --- !u!1001 &163768376 PrefabInstance: m_ObjectHideFlags: 0 @@ -1614,6 +1619,41 @@ Transform: m_CorrespondingSourceObject: {fileID: 4424112051086032, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3} m_PrefabInstance: {fileID: 1358774071} m_PrefabAsset: {fileID: 0} +--- !u!1 &173039252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 173039253} + m_Layer: 0 + m_Name: Quest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &173039253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173039252} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 320.49463, y: 69.253784, z: 329.3701} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1023134610} + - {fileID: 886540130} + - {fileID: 324038824} + - {fileID: 157856504} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &179925001 PrefabInstance: m_ObjectHideFlags: 0 @@ -2931,6 +2971,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 21a364ddeffc797439f2a5721660b0e6, type: 3} +--- !u!4 &324038824 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + m_PrefabInstance: {fileID: 514367525} + m_PrefabAsset: {fileID: 0} --- !u!4 &325575347 stripped Transform: m_CorrespondingSourceObject: {fileID: 4424112051086032, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3} @@ -4739,7 +4784,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 173039253} m_Modifications: - target: {fileID: 2842173668133271164, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: questInfoForPoint @@ -4747,15 +4792,15 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 6527b3979efd2394eb71d63c82bf8585, type: 2} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalPosition.x - value: 41.53 + value: -278.96463 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalPosition.y - value: 76.1 + value: 6.8462143 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalPosition.z - value: 281.57 + value: -47.80008 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.w @@ -4763,15 +4808,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5286,7 +5331,7 @@ Transform: m_PrefabAsset: {fileID: 0} --- !u!4 &575655397 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + m_CorrespondingSourceObject: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} m_PrefabInstance: {fileID: 5050632880354728091} m_PrefabAsset: {fileID: 0} --- !u!1001 &577929210 @@ -6494,6 +6539,37 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 939e176c84eb9af4d8aff0d14144f490, type: 3} +--- !u!1 &743883002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 743883003} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &743883003 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 743883002} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 28.392048, y: 107.94791, z: 87.71596} + 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} --- !u!1001 &757487110 PrefabInstance: m_ObjectHideFlags: 0 @@ -6706,18 +6782,6 @@ PrefabInstance: propertyPath: m_Name value: WorldBarrier 2 objectReference: {fileID: 0} - - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - propertyPath: m_LocalScale.x - value: 700 - objectReference: {fileID: 0} - - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - propertyPath: m_LocalScale.y - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - propertyPath: m_LocalScale.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalPosition.x value: 558 @@ -6761,16 +6825,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - insertIndex: -1 - addedObject: {fileID: 1750754138} - - targetCorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - insertIndex: -1 - addedObject: {fileID: 1750754137} - - targetCorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - insertIndex: -1 - addedObject: {fileID: 1750754136} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} --- !u!1001 &797618460 PrefabInstance: @@ -7230,6 +7285,11 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 34, y: 49, z: 56} m_Center: {x: -0.6, y: -19.41439, z: 27.881649} +--- !u!4 &886540130 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + m_PrefabInstance: {fileID: 1757980132} + m_PrefabAsset: {fileID: 0} --- !u!1001 &901573149 PrefabInstance: m_ObjectHideFlags: 0 @@ -8177,6 +8237,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 65c6fec096cc69643b5869d0ed9de0be, type: 3} m_PrefabInstance: {fileID: 1735784463} m_PrefabAsset: {fileID: 0} +--- !u!4 &1023134610 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} + m_PrefabInstance: {fileID: 1874589717} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1031941496 PrefabInstance: m_ObjectHideFlags: 0 @@ -11795,88 +11860,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5381386135662447605, guid: 21a364ddeffc797439f2a5721660b0e6, type: 3} m_PrefabInstance: {fileID: 1402010168} m_PrefabAsset: {fileID: 0} ---- !u!1 &1410026625 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - m_PrefabInstance: {fileID: 1730608838} - m_PrefabAsset: {fileID: 0} --- !u!4 &1410026626 stripped Transform: m_CorrespondingSourceObject: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} m_PrefabInstance: {fileID: 1730608838} m_PrefabAsset: {fileID: 0} ---- !u!64 &1410026627 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410026625} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1410026628 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410026625} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1410026629 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410026625} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1417376804 PrefabInstance: m_ObjectHideFlags: 0 @@ -12194,6 +12182,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1581ee4338b23da42bfae3b6f623493c, type: 3} m_PrefabInstance: {fileID: 541384666} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1510746889 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1963196827} + m_Modifications: + - target: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_Name + value: WorldBarrier 4 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalPosition.x + value: -111 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalPosition.y + value: 257.29877 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalPosition.z + value: 626 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} +--- !u!4 &1510746890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} + m_PrefabInstance: {fileID: 1510746889} + m_PrefabAsset: {fileID: 0} --- !u!4 &1536905196 stripped Transform: m_CorrespondingSourceObject: {fileID: 400004, guid: 939e176c84eb9af4d8aff0d14144f490, type: 3} @@ -13954,18 +14004,6 @@ PrefabInstance: propertyPath: m_Name value: WorldBarrier 3 objectReference: {fileID: 0} - - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - propertyPath: m_LocalScale.x - value: 700 - objectReference: {fileID: 0} - - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - propertyPath: m_LocalScale.y - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - propertyPath: m_LocalScale.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalPosition.x value: 235 @@ -14009,16 +14047,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - insertIndex: -1 - addedObject: {fileID: 1410026629} - - targetCorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - insertIndex: -1 - addedObject: {fileID: 1410026628} - - targetCorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - insertIndex: -1 - addedObject: {fileID: 1410026627} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} --- !u!4 &1732628596 stripped Transform: @@ -14280,88 +14309,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5381386135662447605, guid: 21a364ddeffc797439f2a5721660b0e6, type: 3} m_PrefabInstance: {fileID: 1953279402} m_PrefabAsset: {fileID: 0} ---- !u!1 &1750754134 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} - m_PrefabInstance: {fileID: 790835968} - m_PrefabAsset: {fileID: 0} --- !u!4 &1750754135 stripped Transform: m_CorrespondingSourceObject: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} m_PrefabInstance: {fileID: 790835968} m_PrefabAsset: {fileID: 0} ---- !u!64 &1750754136 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750754134} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1750754137 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750754134} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1750754138 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750754134} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1752152407 GameObject: m_ObjectHideFlags: 0 @@ -14533,7 +14485,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 173039253} m_Modifications: - target: {fileID: 2842173668133271164, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: questInfoForPoint @@ -14541,15 +14493,15 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 170b8be828def4843ba3194453ee011e, type: 2} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalPosition.x - value: 130.3 + value: -190.19463 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalPosition.y - value: 83 + value: 13.746216 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalPosition.z - value: 125 + value: -204.37009 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.w @@ -14557,15 +14509,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15581,19 +15533,19 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 173039253} m_Modifications: - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -320.49463 objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -69.253784 objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -329.3701 objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalRotation.w @@ -15601,15 +15553,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 574979458172031078, guid: e9e67d9167f69d84e90b4c6dd7a29313, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16545,6 +16497,7 @@ Transform: - {fileID: 575655397} - {fileID: 1750754135} - {fileID: 1410026626} + - {fileID: 1510746890} - {fileID: 1889536341} - {fileID: 1879176701} m_Father: {fileID: 0} @@ -17378,6 +17331,71 @@ Transform: m_CorrespondingSourceObject: {fileID: 4424112051086032, guid: ebd56a6d944d9a446986d0cb28d5338d, type: 3} m_PrefabInstance: {fileID: 2140816831} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2144017785 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 173039253} + m_Modifications: + - target: {fileID: 2842173668133271164, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: questInfoForPoint + value: + objectReference: {fileID: 11400000, guid: 26df97da6add24d4cac24e808d9bc599, type: 2} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalPosition.x + value: 35.00537 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalPosition.y + value: 23.046219 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalPosition.z + value: 6.2299194 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4686374226871248949, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5680052802426733874, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_Name + value: FourthQuestPoint + objectReference: {fileID: 0} + - target: {fileID: 8681015309532129299, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} + propertyPath: m_Radius + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e4d896ed1f197e439bb48231f4bbc54, type: 3} --- !u!1001 &2145851150 PrefabInstance: m_ObjectHideFlags: 0 @@ -17760,96 +17778,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c51bfb2818e56144a78eb0a723406a8, type: 3} ---- !u!1001 &3455358209990053141 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3614688502589247029, guid: 5ddee63852f56514dad5a9e1740480de, type: 3} - propertyPath: player - value: - objectReference: {fileID: 803879370} - - target: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_Name - value: OrbHeal - objectReference: {fileID: 0} - - target: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalPosition.x - value: 12.79 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalPosition.y - value: 80.49 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalPosition.z - value: -10.82 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3473621234624128252, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: player - value: - objectReference: {fileID: 803879370} - - target: {fileID: 3473621234624128252, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: Weapons.Array.data[0] - value: - objectReference: {fileID: 236008272} - - target: {fileID: 3473621234624128252, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: Weapons.Array.data[1] - value: - objectReference: {fileID: 705761236} - - target: {fileID: 3473621234624128252, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: Weapons.Array.data[2] - value: - objectReference: {fileID: 8450388614318271695} - - target: {fileID: 3614688502589247029, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - propertyPath: player - value: - objectReference: {fileID: 803879370} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} ---- !u!1 &3455358209990053142 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100008, guid: 68f6db1b2fbfdfc489f82573e32a13d5, type: 3} - m_PrefabInstance: {fileID: 3455358209990053141} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4950877034845451912 PrefabInstance: m_ObjectHideFlags: 0 @@ -17932,47 +17860,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1963196827} m_Modifications: - - target: {fileID: 1411714781010600252, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 7842488736505890084, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_Name - value: WorldBarrier 1 + value: Barrier objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalPosition.x value: 229.27658 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalPosition.y value: 257.29877 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalPosition.z value: 289.94125 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalRotation.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 180 objectReference: {fileID: 0} - - target: {fileID: 7150054425748697890, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + - target: {fileID: 8498376491828176079, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -17980,7 +17908,7 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf5be08a7e69c0047b38c98beb52bca6, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 584197c36ba0c3740a6b9d444dc1ebcf, type: 3} --- !u!1001 &6710267532553091767 PrefabInstance: m_ObjectHideFlags: 0 @@ -18285,7 +18213,7 @@ PrefabInstance: - target: {fileID: 2710870401587581456, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3} propertyPath: orbs.Array.data[2] value: - objectReference: {fileID: 3455358209990053142} + objectReference: {fileID: 0} - target: {fileID: 3777290212366644686, guid: aa6f29a441791614eb4b0f78ec563f40, type: 3} propertyPath: terrain value: @@ -18559,7 +18487,7 @@ PrefabInstance: - target: {fileID: 2502025964239066860, guid: 96674196a45debf4ba0a3fada63f2b22, type: 3} propertyPath: orbs.Array.data[2] value: - objectReference: {fileID: 3455358209990053142} + objectReference: {fileID: 0} - target: {fileID: 3639945069243096317, guid: 96674196a45debf4ba0a3fada63f2b22, type: 3} propertyPath: m_Name value: MainPlayer @@ -18601,7 +18529,6 @@ SceneRoots: - {fileID: 7721921063603110246} - {fileID: 294113759} - {fileID: 449399895} - - {fileID: 3455358209990053141} - {fileID: 803241245} - {fileID: 84448838} - {fileID: 1096088233} @@ -18610,9 +18537,6 @@ SceneRoots: - {fileID: 1625868737} - {fileID: 1398637095} - {fileID: 1856751779} - - {fileID: 1874589717} - - {fileID: 1757980132} - - {fileID: 514367525} - {fileID: 1963196827} - {fileID: 676286358} - {fileID: 1752152410} @@ -18629,3 +18553,5 @@ SceneRoots: - {fileID: 697611184958665259} - {fileID: 1363711749} - {fileID: 1324482148} + - {fileID: 173039253} + - {fileID: 743883003} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset index ff448436d352aedf7e4f32602a1a3b96ad55af3c..e2f038aa516f720b6a69d2e6cce1a1b8ce21e237 100644 --- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FirstPart/FirstPartQuest.asset @@ -17,7 +17,5 @@ MonoBehaviour: questPrereq: [] questSteps: - {fileID: 3109361365139701332, guid: a02f625a2336b2f46bf2e7d22b55b7aa, type: 3} - - {fileID: 2059339404615624799, guid: b2394b63df3c0d94791c0c777c1d7ac4, type: 3} - - {fileID: 7388949460918184852, guid: cb256c09fe674564f9fcc7f9ad09c9a4, type: 3} reward: 200 startCutScene: {fileID: 6495384598351137644, guid: b6925bc607ad6d048abbd233d30db451, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart.meta new file mode 100644 index 0000000000000000000000000000000000000000..d61b711820352564e022bb2163b13abd0562ea20 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbf22569523e2244bb1ce5f8323dac72 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset new file mode 100644 index 0000000000000000000000000000000000000000..b826db81be8c5d7db96c81f08f30382729bcf6fb --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf70103ae5540742891c039e66415a2, type: 3} + m_Name: FourthPartQuest + m_EditorClassIdentifier: + <id>k__BackingField: FourthPartQuest + displayName: Fourth Part + questPrereq: + - {fileID: 11400000, guid: 1455f982b19c4af419f86c590974bd95, type: 2} + questSteps: + - {fileID: 9034925817477878778, guid: 137a152eb8c9a73439af804b7dd2abd1, type: 3} + - {fileID: 2533058413809311019, guid: a5ea5898a9226dd4a961038170b1dcb4, type: 3} + - {fileID: 8277191341983839390, guid: 532749565fc31f74e90f150eac15ce21, type: 3} + reward: 800 + startCutScene: {fileID: 6495384598351137644, guid: 7ed84912ace90cb43b7b72e643b1f18b, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..1c4d71460d01512d2efadc6c382c010b702740e5 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/FourthPartQuest.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26df97da6add24d4cac24e808d9bc599 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene.meta new file mode 100644 index 0000000000000000000000000000000000000000..dc2a8198c7cea1c75d0b613aa2127f967e805b9f --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 009aba4fa057d3c418f25ee36ccdc029 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/Start.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/Start.prefab new file mode 100644 index 0000000000000000000000000000000000000000..5640763f5e574440ab794c8aca2bbda51613ff3b --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/Start.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9034925817477878778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057373269129374672} + - component: {fileID: 387771486229844798} + m_Layer: 0 + m_Name: Start + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2057373269129374672 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9034925817477878778} + serializedVersion: 2 + 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} +--- !u!114 &387771486229844798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9034925817477878778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee0a3c09a55b26e44afeca875c1ca0f4, type: 3} + m_Name: + m_EditorClassIdentifier: + finishCutScene: {fileID: 6495384598351137644, guid: 294ca1ad8a2766049a9f630620b92221, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/Start.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/Start.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..109f33ef875fa0364cb7a1771b00b9d878ef8909 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/Start.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 137a152eb8c9a73439af804b7dd2abd1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartCutScene.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartCutScene.prefab new file mode 100644 index 0000000000000000000000000000000000000000..f5fa5b3dc47d07c1683ff0c341d991823af02f45 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartCutScene.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6499768542513180538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6734429439583254, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Name + value: StartCutScene + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.size + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[0] + value: "Haneffar: What happened to this place\u2026 everything is\u2026 dead\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[1] + value: 'Haneffar: *Saw a silhouette of a big person*' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[2] + value: "?: So\u2026 you\u2019re the one who\u2019ve been causing the ruckus" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[3] + value: 'Haneffar: Who are you and why did you attack my village?' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[4] + value: "Bandit King: You know\u2026 your \u201Cvillage\u201D was in the way + of my plan, so\u2026 I needed it to be taken care of" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[5] + value: "Bandit King: and now\u2026 you\u2019re the one in my way\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[6] + value: "Bandit King: that means\u2026 You\u2019re going to die\u2026 in\u2026 + my\u2026 hands\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[7] + value: "Haneffar: You tried taking my village, and you failed. It\u2019s time + for you to meet your end\u2026" + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8137313a78c676347b871b908814e608, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartCutScene.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartCutScene.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..229e2400e11040c6f0fb13713d232c84ee308c70 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartCutScene.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 294ca1ad8a2766049a9f630620b92221 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartFourthQuestStep.cs b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartFourthQuestStep.cs new file mode 100644 index 0000000000000000000000000000000000000000..874e48e201799b566b322d8810327ae949d9c3ae --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartFourthQuestStep.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class StartFourthQuestStep : QuestStep +{ + override public void InitializeQuestStep(string questId) + { + base.InitializeQuestStep(questId); + FinishQuestStep(); + } +} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartFourthQuestStep.cs.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartFourthQuestStep.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..5c2a85fcec73bc1188106b4def73f1bba9e451ba --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StartCutScene/StartFourthQuestStep.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee0a3c09a55b26e44afeca875c1ca0f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne.meta new file mode 100644 index 0000000000000000000000000000000000000000..25f5582540f45c0c3485d119b07620fe442d9b20 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97240532c3f41464b8e996811fa7abde +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/FourthStepOneScript.cs b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/FourthStepOneScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..d83fe46d601d532ea566e64b6c6800022d13b50a --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/FourthStepOneScript.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FourthStepOneScript : QuestStep +{ + private EnemyController enemyController; + + private void OnEnable() + { + enemyController = GameObject.Find("Controller").GetComponent<EnemyController>(); + } + + override public void InitializeQuestStep(string questId) + { + base.InitializeQuestStep(questId); + GameManager.OnEnemyDamaged += EnemyDamaged; + + enemyController.generalCountMax = 1; + } + + override protected void FinishQuestStep() + { + base.FinishQuestStep(); + GameManager.OnEnemyDamaged -= EnemyDamaged; + } + + private void EnemyDamaged(int remHealth, int maxHealth, string tag) + { + // TODO: Change to king + if (tag == "General") + { + if (remHealth <= 0.25 * maxHealth) + { + FinishQuestStep(); + } + } + } +} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/FourthStepOneScript.cs.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/FourthStepOneScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..2770dc8d4fb8cd5c6fa439a2feee0f98d4e0010c --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/FourthStepOneScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5277a66cb79942c4b8753318fcb6009d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOne.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOne.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1c516ead618464d4a32e87c8dfa337a60f4bbda4 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOne.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2533058413809311019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6859606318751814915} + - component: {fileID: 5097333378141457321} + m_Layer: 0 + m_Name: StepOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6859606318751814915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2533058413809311019} + serializedVersion: 2 + 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} +--- !u!114 &5097333378141457321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2533058413809311019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5277a66cb79942c4b8753318fcb6009d, type: 3} + m_Name: + m_EditorClassIdentifier: + finishCutScene: {fileID: 6495384598351137644, guid: d6b902494d06cb349932e7b1d07e1054, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOne.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOne.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..8f47c7cd63198ca85090e1894d712e47a15d67a0 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOne.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a5ea5898a9226dd4a961038170b1dcb4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOneCutScene.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOneCutScene.prefab new file mode 100644 index 0000000000000000000000000000000000000000..ed42433d2c6a6e9d5b37d3e347ab597691ab2b44 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOneCutScene.prefab @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6499768542513180538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6734429439583254, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Name + value: StepOneCutScene + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[0] + value: "Bandit King: ugh\u2026 you\u2019re pretty tough for a little guy\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[1] + value: "Bandit King: let\u2019s take it up a notch\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[2] + value: "Haneffar: Bring it\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[3] + value: "Bandit King: You know\u2026 your \u201Cvillage\u201D was in the way + of my plan, so\u2026 I needed it to be taken care of. Bandit King: and now\u2026 + you\u2019re the one in my way\u2026 " + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[4] + value: "Bandit King: that means\u2026 You\u2019re going to die\u2026 in\u2026 + my\u2026 hands\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[5] + value: "Haneffar: You tried taking my village, and you failed. It\u2019s time + for you to meet your end\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[6] + value: "Haneffar: You tried taking my village, and you failed. It\u2019s time + for you to meet your end\u2026" + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8137313a78c676347b871b908814e608, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOneCutScene.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOneCutScene.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..76381dae05e4a2dc617c08bd7948349b0b0bc935 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepOne/StepOneCutScene.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6b902494d06cb349932e7b1d07e1054 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree.meta new file mode 100644 index 0000000000000000000000000000000000000000..b511390d651ed9ed68aa73648b439c0dfe200772 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d365680d860a7647adad6f60767bc51 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/FourthStepThreeScript.cs b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/FourthStepThreeScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..5bd5ea07a5769cef8be14a19cc4572cd2f9611c5 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/FourthStepThreeScript.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FourthStepThreeScript : QuestStep +{ + override public void InitializeQuestStep(string questId) + { + base.InitializeQuestStep(questId); + + Transform playerTransform = GameObject.Find("MainPlayer").transform; + playerTransform.position = new Vector3(17.93f, 80.75f, -11.15f); + + FinishQuestStep(); + } +} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/FourthStepThreeScript.cs.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/FourthStepThreeScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..be140cce4d055936bd313fdd62190aa112fa41c8 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/FourthStepThreeScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b2edba8946fea04987893900bf1cb14 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThree.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThree.prefab new file mode 100644 index 0000000000000000000000000000000000000000..c42baaa388f8a49aa64771632c1091be8f2dbc65 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThree.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4419727373730916708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8881644705644375112} + - component: {fileID: -6251063800260006197} + m_Layer: 0 + m_Name: StepThree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8881644705644375112 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4419727373730916708} + serializedVersion: 2 + 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} +--- !u!114 &-6251063800260006197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4419727373730916708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b2edba8946fea04987893900bf1cb14, type: 3} + m_Name: + m_EditorClassIdentifier: + finishCutScene: {fileID: 6495384598351137644, guid: bc7ce8457e19b2f4c9eb4e669a9541fa, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThree.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThree.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..1936228bfaa0a03f3dca02aded9dafb4ce164404 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThree.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e856fa67a2c0044da4cbb1864de28e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThreeCutScene.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThreeCutScene.prefab new file mode 100644 index 0000000000000000000000000000000000000000..3387f7d20274de617fe8acffc1a91dac7af5b854 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThreeCutScene.prefab @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6499768542513180538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6734429439583254, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Name + value: StepThreeCutScene + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.size + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[0] + value: '*Haneffar came back to the village*' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[1] + value: 'Villagers: There he is! The Hero!!' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[2] + value: "Village Chief: Thank you Haneffar, for everything you\u2019ve done + for us" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[3] + value: "Haneffar: this is as much your home as it is mine\u2026 and I take + care of my home\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[4] + value: '*Haneffar and the village chief shake hands with the villagers cheering*' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[5] + value: "Haneffar: You tried taking my village, and you failed. It\u2019s time + for you to meet your end\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[6] + value: "Haneffar: You tried taking my village, and you failed. It\u2019s time + for you to meet your end\u2026" + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8137313a78c676347b871b908814e608, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThreeCutScene.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThreeCutScene.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..c54fb2140117e4fe45283f8d734646bb45efcc0f --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepThree/StepThreeCutScene.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bc7ce8457e19b2f4c9eb4e669a9541fa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo.meta new file mode 100644 index 0000000000000000000000000000000000000000..e4e4ab7a538562d1c05fef1b409e91f5637835f5 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21b5dcfcddb36f44892bd32467c1a381 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/FourthStepTwoScript.cs b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/FourthStepTwoScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..9b3ed722c710a42a60bf8abe8d35bbee2ea5b56d --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/FourthStepTwoScript.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FourthStepTwoScript : QuestStep +{ + override public void InitializeQuestStep(string questId) + { + base.InitializeQuestStep(questId); + GameManager.OnEnemyKilled += EnemyKilled; + + // TODO: Change to king + int kingCount = GameObject.FindGameObjectsWithTag("General").Length; + Debug.Log("General count " + kingCount); + if (kingCount <= 0) + { + FinishQuestStep(); + } + } + + override protected void FinishQuestStep() + { + base.FinishQuestStep(); + GameManager.OnEnemyKilled -= EnemyKilled; + } + + private void EnemyKilled(string tag) + { + // TODO: Change to king + if (tag == "General") + { + FinishQuestStep(); + } + } +} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/FourthStepTwoScript.cs.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/FourthStepTwoScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..0002b47ea1978bde2b9a894d2d80d120826991ad --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/FourthStepTwoScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 66d15b9b18aaa9f498f6cdb45ae276fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwo.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwo.prefab new file mode 100644 index 0000000000000000000000000000000000000000..71161377f0b81e02afc5724ebd8b555ecf60ff3f --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwo.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8277191341983839390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 189930187172371237} + - component: {fileID: 7765054475742506787} + m_Layer: 0 + m_Name: StepTwo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &189930187172371237 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8277191341983839390} + serializedVersion: 2 + 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} +--- !u!114 &7765054475742506787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8277191341983839390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66d15b9b18aaa9f498f6cdb45ae276fd, type: 3} + m_Name: + m_EditorClassIdentifier: + finishCutScene: {fileID: 6495384598351137644, guid: 6852f128e24e32546a851962936aedad, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwo.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwo.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..9735d65587339ab3380dc76a1e773712b5b57b6c --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwo.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 532749565fc31f74e90f150eac15ce21 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwoCutScene.prefab b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwoCutScene.prefab new file mode 100644 index 0000000000000000000000000000000000000000..b0e04f627ddf7719c391ce127d42bdaff461ee37 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwoCutScene.prefab @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6499768542513180538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6734429439583254, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Name + value: StepTwoCutScene + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: canGoNext + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[0] + value: 'Bandit King: *bleeding*' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[1] + value: "Bandit King: huh\u2026 pretty good kid, but this is not the end\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[2] + value: "Bandit King: someone else will come and replace me\u2026 and you\u2019ll + be right back where you started" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[3] + value: "Haneffar: I\u2019ll make sure I give them a warm welcome\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[4] + value: '*Haneffar came back to the village*' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[5] + value: 'Villagers: There he is! The Hero!!' + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[6] + value: "Village Chief: Thank you Haneffar, for everything you\u2019ve done + for us" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[7] + value: "Haneffar: this is as much your home as it is mine\u2026 and I take + care of my home\u2026" + objectReference: {fileID: 0} + - target: {fileID: 753608043676559249, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: dialogues.Array.data[8] + value: '*Haneffar and the village chief shake hands with the villagers cheering*' + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2352176183680375524, guid: 8137313a78c676347b871b908814e608, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8137313a78c676347b871b908814e608, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwoCutScene.prefab.meta b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwoCutScene.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..13d37794fb5705e350f1e0671765723cbbed5665 --- /dev/null +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/FourthPart/StepTwo/StepTwoCutScene.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6852f128e24e32546a851962936aedad +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset index 287ae4ac73fee31ba4b60744517f581d96afe9c0..86884d11f83c721fc80f5fcb413ca900c04374c6 100644 --- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/SecondPart/SecondPartQuest.asset @@ -15,10 +15,8 @@ MonoBehaviour: <id>k__BackingField: SecondPartQuest displayName: Second Part questPrereq: - - {fileID: 11400000, guid: 1455f982b19c4af419f86c590974bd95, type: 2} + - {fileID: 11400000, guid: 6527b3979efd2394eb71d63c82bf8585, type: 2} questSteps: - {fileID: 2190299236600376276, guid: d46e6cf568afe9a489b4956888b44680, type: 3} - - {fileID: 1940443205054926610, guid: 04c1665d17db44c45981ca470731b060, type: 3} - - {fileID: 4409694400009113235, guid: 6397dfdb8fb00074fbb06ca46c01c064, type: 3} - reward: 200 + reward: 400 startCutScene: {fileID: 6495384598351137644, guid: 7ed84912ace90cb43b7b72e643b1f18b, type: 3} diff --git a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset index c8c6295f52df1c27cfb4fe6106eb25e9c517bec0..bce1302235651f4a90481c5530ef0c4229c0d8a5 100644 --- a/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset +++ b/IF3210-2024-Unity-AFK/Assets/Resources/Quest/ThirdPart/ThirdPartQuest.asset @@ -18,7 +18,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 170b8be828def4843ba3194453ee011e, type: 2} questSteps: - {fileID: 7049229370314528892, guid: 4182b65f595954540b54f86ae4df11a7, type: 3} - - {fileID: 851398358463362485, guid: 110cf3434a8edde4db5378d5ac7bcd29, type: 3} - - {fileID: 2358154313255904229, guid: 84b26a40b00f91f48bd50806b593b064, type: 3} - reward: 200 + reward: 600 startCutScene: {fileID: 6495384598351137644, guid: 7ed84912ace90cb43b7b72e643b1f18b, type: 3}