diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 358f10d..0af9a3b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -304,7 +304,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: -70, z: 0} --- !u!1 &52890058 GameObject: @@ -343,7 +343,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.81000006, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.8600006, y: 26} + m_AnchoredPosition: {x: 0.85998535, y: 26} m_SizeDelta: {x: -2, y: 45} m_Pivot: {x: 0.5, y: 0} --- !u!114 &52890060 @@ -621,7 +621,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &137465972 GameObject: @@ -1088,7 +1088,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 70, z: 0} --- !u!1 &243041992 GameObject: @@ -1764,7 +1764,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &392850835 GameObject: @@ -2176,141 +2176,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &499317129 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 499317135} - - component: {fileID: 499317134} - - component: {fileID: 499317133} - - component: {fileID: 499317132} - - component: {fileID: 499317131} - - component: {fileID: 499317130} - m_Layer: 0 - m_Name: Adena - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &499317130 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499317129} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7fa9a36f8ebb0f4fa2ea09dac222d2d, type: 3} - m_Name: - m_EditorClassIdentifier: - dialogueController: {fileID: 363264314} - m_spawnQuestID: 1 - m_name: Adena ---- !u!114 &499317131 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499317129} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e094f9bc596c66e4e9f7e29a0f136248, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!65 &499317132 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499317129} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &499317133 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499317129} - m_Enabled: 1 - 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 &499317134 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499317129} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &499317135 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499317129} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.76, y: 3.1, z: 0.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &523992348 GameObject: @@ -2417,7 +2283,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &523992353 MonoBehaviour: @@ -2431,6 +2297,67 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e094f9bc596c66e4e9f7e29a0f136248, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &552024428 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1870273300618322397, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_Name + value: Amadeus + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalPosition.x + value: 1.6384237 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2634127 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalPosition.z + value: -0.7413459 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7731217770752160392, guid: 599cc90e543b1e245b6343415a04da55, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 599cc90e543b1e245b6343415a04da55, type: 3} --- !u!1 &582177624 GameObject: m_ObjectHideFlags: 0 @@ -2507,140 +2434,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 582177624} m_CullTransparentMesh: 1 ---- !u!1 &590463037 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 590463042} - - component: {fileID: 590463041} - - component: {fileID: 590463040} - - component: {fileID: 590463039} - - component: {fileID: 590463038} - - component: {fileID: 590463043} - m_Layer: 0 - m_Name: Derk - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &590463038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590463037} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e094f9bc596c66e4e9f7e29a0f136248, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!65 &590463039 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590463037} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &590463040 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590463037} - m_Enabled: 1 - 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 &590463041 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590463037} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &590463042 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590463037} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.95, y: 3.1, z: -1.02} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &590463043 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590463037} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7fa9a36f8ebb0f4fa2ea09dac222d2d, type: 3} - m_Name: - m_EditorClassIdentifier: - dialogueController: {fileID: 363264314} - m_spawnQuestID: 0 - m_name: Derk --- !u!1 &600693544 GameObject: m_ObjectHideFlags: 0 @@ -2879,7 +2672,7 @@ Transform: m_Children: - {fileID: 1676075840} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &646912192 GameObject: @@ -3015,140 +2808,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646912192} m_CullTransparentMesh: 1 ---- !u!1 &648390671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 648390677} - - component: {fileID: 648390676} - - component: {fileID: 648390675} - - component: {fileID: 648390674} - - component: {fileID: 648390673} - - component: {fileID: 648390672} - m_Layer: 0 - m_Name: Rufus - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &648390672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 648390671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7fa9a36f8ebb0f4fa2ea09dac222d2d, type: 3} - m_Name: - m_EditorClassIdentifier: - dialogueController: {fileID: 363264314} - m_spawnQuestID: 1 - m_name: Rufus ---- !u!114 &648390673 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 648390671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e094f9bc596c66e4e9f7e29a0f136248, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!65 &648390674 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 648390671} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &648390675 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 648390671} - m_Enabled: 1 - 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 &648390676 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 648390671} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &648390677 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 648390671} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.78, y: 3.1, z: 0.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &653815781 GameObject: m_ObjectHideFlags: 0 @@ -3225,6 +2884,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 653815781} m_CullTransparentMesh: 1 +--- !u!1001 &700560451 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalPosition.x + value: 0.20577693 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalPosition.y + value: 1.6103325 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalPosition.z + value: -0.5997834 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6753687320438571134, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_Name + value: El Gato + objectReference: {fileID: 0} + - target: {fileID: 6753687320438571134, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} --- !u!1 &731093319 GameObject: m_ObjectHideFlags: 0 @@ -3260,7 +2984,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.7665403} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 5.589859} + m_AnchoredPosition: {x: 0, y: 5.5898438} m_SizeDelta: {x: -46, y: -23} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &731093321 @@ -3675,6 +3399,71 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &951782450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalPosition.x + value: 0.18752909 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalPosition.y + value: 2.27 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalPosition.z + value: -0.7125578 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2748479570830409726, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6096406778207906987, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_Name + value: Rufus + objectReference: {fileID: 0} + - target: {fileID: 6096406778207906987, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 370c5c8959fc36f4ba551a36dd124f01, type: 3} --- !u!1 &969431951 GameObject: m_ObjectHideFlags: 0 @@ -4186,6 +3975,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1266112450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3699144090576527421, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_Name + value: Derk + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalPosition.x + value: -4.1400595 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2634118 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalPosition.z + value: -1.9082265 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4750094475895944040, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} --- !u!1 &1271143075 GameObject: m_ObjectHideFlags: 0 @@ -5138,6 +4988,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1493783870} m_CullTransparentMesh: 1 +--- !u!1001 &1507897762 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalPosition.x + value: -2.6193154 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalPosition.y + value: 2.13 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalPosition.z + value: -0.7618141 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 748548715319309381, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709160301237413648, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_Name + value: Adena + objectReference: {fileID: 0} + - target: {fileID: 8709160301237413648, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 77b11eaf3e8d39f44bdab1b2f57720db, type: 3} --- !u!1001 &1543225912 PrefabInstance: m_ObjectHideFlags: 0 @@ -5386,140 +5301,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1596269577 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1596269583} - - component: {fileID: 1596269582} - - component: {fileID: 1596269581} - - component: {fileID: 1596269580} - - component: {fileID: 1596269579} - - component: {fileID: 1596269578} - m_Layer: 0 - m_Name: Amadeus - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1596269578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596269577} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7fa9a36f8ebb0f4fa2ea09dac222d2d, type: 3} - m_Name: - m_EditorClassIdentifier: - dialogueController: {fileID: 363264314} - m_spawnQuestID: 0 - m_name: Amadeus ---- !u!114 &1596269579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596269577} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e094f9bc596c66e4e9f7e29a0f136248, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!65 &1596269580 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596269577} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1596269581 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596269577} - m_Enabled: 1 - 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 &1596269582 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596269577} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1596269583 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596269577} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.3, y: 3.1, z: 0.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1604646670 GameObject: m_ObjectHideFlags: 0 @@ -6164,7 +5945,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.77936023} m_AnchorMax: {x: 0.28434756, y: 1} - m_AnchoredPosition: {x: 7.3424835, y: -8.04248} + m_AnchoredPosition: {x: 7.3424683, y: -8.04248} m_SizeDelta: {x: -16.714996, y: -15.714996} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1806738461 @@ -6587,7 +6368,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &2002200564 GameObject: @@ -6907,140 +6688,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020681401} m_CullTransparentMesh: 1 ---- !u!1 &2057319577 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2057319583} - - component: {fileID: 2057319582} - - component: {fileID: 2057319581} - - component: {fileID: 2057319580} - - component: {fileID: 2057319579} - - component: {fileID: 2057319578} - m_Layer: 0 - m_Name: El GAto - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &2057319578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057319577} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7fa9a36f8ebb0f4fa2ea09dac222d2d, type: 3} - m_Name: - m_EditorClassIdentifier: - dialogueController: {fileID: 363264314} - m_spawnQuestID: 2 - m_name: Adventure Cat ---- !u!114 &2057319579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057319577} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e094f9bc596c66e4e9f7e29a0f136248, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!65 &2057319580 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057319577} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &2057319581 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057319577} - m_Enabled: 1 - 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 &2057319582 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057319577} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &2057319583 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057319577} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.22, y: 3.1, z: -0.16} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2069816766 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 967aee3..321cd79 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -13,6 +14,7 @@ public class GameManager : MonoBehaviour private float m_fadeTotal; [SerializeField] private bool m_showFade = false; [SerializeField] private float m_fadeDuration = 1; + private Action m_fadeCallback; private void Awake() { @@ -36,6 +38,8 @@ public class GameManager : MonoBehaviour m_fadeT += Time.deltaTime; } else { + m_fadeCallback?.Invoke(); + m_fadeCallback = null; m_fadeT -= Time.deltaTime; } m_fadeTotal += Time.deltaTime; @@ -55,8 +59,9 @@ public class GameManager : MonoBehaviour } - public void FadePingPong() + public void FadePingPong(Action callback = null) { + m_fadeCallback = callback; m_fadeTotal = 0; m_showFade = true; } diff --git a/Assets/Scripts/QuestManager.cs b/Assets/Scripts/QuestManager.cs index dbdcfae..3672d36 100644 --- a/Assets/Scripts/QuestManager.cs +++ b/Assets/Scripts/QuestManager.cs @@ -60,6 +60,17 @@ public class QuestManager : MonoBehaviour return true; } + public void SpawnAdventurers() + { + foreach (var adventurer in Resources.FindObjectsOfTypeAll()) + { + if (adventurer.m_spawnQuestID == activeQuest) + { + adventurer.gameObject.SetActive(true); + } + } + } + public void NextQuest() { activeQuest++; @@ -68,14 +79,8 @@ public class QuestManager : MonoBehaviour Debug.Log("All quests completed"); } - foreach (var adventurer in Resources.FindObjectsOfTypeAll()) - { - if (adventurer.m_spawnQuestID == activeQuest) - { - adventurer.gameObject.SetActive(true); - } - } - GameManager.Instance.FadePingPong(); + + GameManager.Instance.FadePingPong(SpawnAdventurers); } public void RetryQuest()