From edf82b433733148dde20ad1013a48547aa97e528 Mon Sep 17 00:00:00 2001 From: Nim-XD <165881403+IndieDevDungeon@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:56:25 +0530 Subject: [PATCH] quests fix resources --- .DS_Store | Bin 14340 -> 14340 bytes .vscode/settings.json | 2 +- Assets/.DS_Store | Bin 18436 -> 18436 bytes Assets/LostNpc.cs | 126 +++ Assets/LostNpc.cs.meta | 11 + Assets/ResourceQuestScript.cs | 8 + Assets/ResourceQuestScript.cs.meta | 11 + Assets/Resources/.DS_Store | Bin 6148 -> 6148 bytes Assets/Resources/quests/CookQuest.asset | 7 +- .../quests/{Quest_4.asset => LostNpc.asset} | 13 +- ...{Quest_4.asset.meta => LostNpc.asset.meta} | 0 Assets/Resources/quests/Quest_3.asset | 11 +- Assets/Scenes/Game.unity | 866 ++++++++++++++++-- Assets/Script/QuestAction.cs | 61 +- Assets/Script/npcScript.cs | 6 +- Assets/Script/playerNetwork.cs | 2 +- Assets/autoDisableGameObj.cs | 21 + Assets/autoDisableGameObj.cs.meta | 11 + Packages/packages-lock.json | 35 +- 19 files changed, 1065 insertions(+), 126 deletions(-) create mode 100644 Assets/LostNpc.cs create mode 100644 Assets/LostNpc.cs.meta create mode 100644 Assets/ResourceQuestScript.cs create mode 100644 Assets/ResourceQuestScript.cs.meta rename Assets/Resources/quests/{Quest_4.asset => LostNpc.asset} (69%) rename Assets/Resources/quests/{Quest_4.asset.meta => LostNpc.asset.meta} (100%) create mode 100644 Assets/autoDisableGameObj.cs create mode 100644 Assets/autoDisableGameObj.cs.meta diff --git a/.DS_Store b/.DS_Store index 25ce763fd3add6e150ceb8144da79315cf69f283..e5d3f92bdb2d38326805077ee7ffe15fb93edf44 100644 GIT binary patch delta 440 zcmZoEXeromRglH#;dHCXHwER`*0nBsA~j+1UqJ=UIkz7?lA3VLk%57Moxz78lOc(r zh#?V(D+@9VgOl@f3xG0AwsRRKy9qfvWE=zXSb*yC8PXYwbMswXl5+BsfMOgS&5z#* zK+HjsPeGI4d{XEYGg}DbgcV#9CO;Gt+k9SZ6LVZ*y$jgb5QbEST!sQ?~rll>DmA5gGlWHY_h12ky!f5n+hOqcyO&r%6x(>n6MXc^RSHU>wAVjxUq YC;5Cboctu97{{+uO~!_OU~`b< zQ_$o$pA>q<%(j0K*S{y-lOKwSZ9Xryi8;e6FxkgNZ(O~mgF>^xzX8|3w delta 98 zcmZpfz}PZ@aRa9)lXKi;Zc!OF?<N}wXZ diff --git a/Assets/LostNpc.cs b/Assets/LostNpc.cs new file mode 100644 index 00000000..2bd12b7d --- /dev/null +++ b/Assets/LostNpc.cs @@ -0,0 +1,126 @@ +using System.Collections; +using System.Collections.Generic; +using Assets.HeroEditor4D.Common.Scripts.CharacterScripts; +using Assets.HeroEditor4D.Common.Scripts.Enums; +using UnityEngine; + +public class LostNpc : MonoBehaviour +{ + //check if the quest is active on local player + public Character4D character; + [SerializeField] private bool _isQuestActive; + public QuestScriptable[] questData; + private playerNetwork player; + + [SerializeField] private float followSpeed = 2f; + [SerializeField] private float stopDistance = 1f; + [SerializeField] private float maxDistance = 15f; + + public bool _isFollowing; + void Update() + { + if (_isQuestActive) + { + FollowPlayer(); + + } + + + // if (player != null) + // { + // isPlayerInRange = Vector3.Distance(transform.position, player.transform.position) < followRadius; + + // } + // else + // { + // isPlayerInRange = false; + + // } + + // if (player != null) + // { + // FollowPlayer(); + // } + } + // check if the activequest is for finding the lost npc + // if the player is close to the npc - the npc will start following the player + // once the player go back to quest npc - the quest will be completed and npc will stop follow / destroy after few minutes + + private void OnTriggerEnter2D(Collider2D other) + { + + if (other.CompareTag("Player")) + { + if (other.transform == playerNetwork.localPlayerTransform) + { + player = playerNetwork.localPlayerTransform.GetComponent(); + + //check if the quest match for finding lost npc + if (player.currentQuest == questData[0]) + { + _isQuestActive = true; + _isFollowing = true; + npcFinalCollider.isTrigger = true; + + } + + } + } + + } + + float endTimer = 5f; + public void FollowPlayer() + { + + float distance = Vector2.Distance(transform.position, player.transform.position); + + + if (distance <= stopDistance || distance >= maxDistance) + { + character.AnimationManager.SetState(CharacterState.Idle); + _isFollowing = false; // Stop following + return; + } + + if(player.currentQuest==null){ + if(endTimer > 0 ){ + endTimer -= Time.deltaTime; + }else{ + Destroy(gameObject); + } + character.AnimationManager.SetState(CharacterState.Idle); + _isFollowing = false; + return; + + } + + // Move + Vector2 direction = (player.transform.position - transform.position).normalized; + transform.position = Vector2.MoveTowards(transform.position, player.transform.position, followSpeed * Time.deltaTime); + + // + if (direction.x > 0) character.SetDirection(Vector2.right); + else if (direction.x < 0) character.SetDirection(Vector2.left); + else if (direction.y > 0) character.SetDirection(Vector2.up); + else if (direction.y < 0) character.SetDirection(Vector2.down); + + // + character.AnimationManager.SetState(CharacterState.Walk); + } + + public void StopFollowing() + { + _isFollowing = false; + character.AnimationManager.SetState(CharacterState.Idle); + } + public BoxCollider2D npcFinalCollider; + public void SetFinalQuestAction() + { + //enable npc is trigger + npcFinalCollider.isTrigger = true; + //StopFollowing(); + //destroy npc after few minutes + + } +} diff --git a/Assets/LostNpc.cs.meta b/Assets/LostNpc.cs.meta new file mode 100644 index 00000000..59fdc702 --- /dev/null +++ b/Assets/LostNpc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5c148fc2124c4630b218cf006e5727b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResourceQuestScript.cs b/Assets/ResourceQuestScript.cs new file mode 100644 index 00000000..2652303f --- /dev/null +++ b/Assets/ResourceQuestScript.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ResourceQuestScript : MonoBehaviour +{ +} + diff --git a/Assets/ResourceQuestScript.cs.meta b/Assets/ResourceQuestScript.cs.meta new file mode 100644 index 00000000..58716376 --- /dev/null +++ b/Assets/ResourceQuestScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5371c32ad1cb46f19c3b260eb5e1237 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/.DS_Store b/Assets/Resources/.DS_Store index 6812b8e4bc7683453c162f763e23f6f0a27040c6..b7f4b56f674214075f2c5d8e9f4d709464831cde 100644 GIT binary patch delta 26 icmZoMXffEZhLwqL{^WJ6GHgbtw%-q(xcLIBi4XvW0SYGo delta 23 fcmZoMXffEZhLwqb?c{Z=GLzr2N^E|_sw4yeXhR5A diff --git a/Assets/Resources/quests/CookQuest.asset b/Assets/Resources/quests/CookQuest.asset index aa86f08a..fb3ce51e 100644 --- a/Assets/Resources/quests/CookQuest.asset +++ b/Assets/Resources/quests/CookQuest.asset @@ -14,9 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: questName: CookQuest questLines: - - 'Hello There, I need your help ' - - I'm in need to find a cactus that only grows in desered areas - - head west to the desert , and bring me the cactus - - i will reward you 500 coins + - I need Cactus plant + - only grows in desert area + - head west to the desert and bring me the cactus questTitle: Head West to desert and find the Cactus and bring it back to Cook rewardAmount: 500 diff --git a/Assets/Resources/quests/Quest_4.asset b/Assets/Resources/quests/LostNpc.asset similarity index 69% rename from Assets/Resources/quests/Quest_4.asset rename to Assets/Resources/quests/LostNpc.asset index 6d9fa86f..a8cece35 100644 --- a/Assets/Resources/quests/Quest_4.asset +++ b/Assets/Resources/quests/LostNpc.asset @@ -10,13 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bb4f7aac1a911412f89952ac827aabad, type: 3} - m_Name: Quest_4 + m_Name: LostNpc m_EditorClassIdentifier: - questName: Quest_4 + questName: LostNpc questLines: - - Quest 4 - - Quest 4Quest 4 - - Quest 4Quest 4Quest 4 - - Quest 4Quest 4Quest 4Quest 4 - questTitle: Quest 4 - rewardAmount: 500 + - LostNpc + questTitle: LostNpc + rewardAmount: 1000 diff --git a/Assets/Resources/quests/Quest_4.asset.meta b/Assets/Resources/quests/LostNpc.asset.meta similarity index 100% rename from Assets/Resources/quests/Quest_4.asset.meta rename to Assets/Resources/quests/LostNpc.asset.meta diff --git a/Assets/Resources/quests/Quest_3.asset b/Assets/Resources/quests/Quest_3.asset index 22734b29..63addf26 100644 --- a/Assets/Resources/quests/Quest_3.asset +++ b/Assets/Resources/quests/Quest_3.asset @@ -12,11 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bb4f7aac1a911412f89952ac827aabad, type: 3} m_Name: Quest_3 m_EditorClassIdentifier: - questName: Quest_3 + questName: bye questLines: - - Quest 3 - - Quest 3Quest 3 - - Quest 3Quest 3Quest 3 - - Quest 3Quest 3Quest 3Quest 3 - questTitle: Quest 3Quest 3Quest 3Quest 3Quest 3Quest 3 - rewardAmount: 500 + - come again later + questTitle: quest + rewardAmount: 100 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index b3166d8a..13e45382 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -806,13 +805,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -6387,13 +6388,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -11738,13 +11741,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -16854,13 +16859,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -22732,13 +22739,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -29753,6 +29762,83 @@ Transform: m_Children: [] m_Father: {fileID: 1833145459} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &857035429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 857035430} + - component: {fileID: 857035431} + m_Layer: 0 + m_Name: temp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &857035430 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857035429} + 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: 2452912794957472388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &857035431 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857035429} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &864703083 GameObject: m_ObjectHideFlags: 0 @@ -30046,10 +30132,12 @@ MonoBehaviour: npcText: {fileID: 2093156718} questData: - {fileID: 11400000, guid: 1cb9f6811a18b4c9791b486d19534c28, type: 2} + - {fileID: 11400000, guid: 48ab8cb3db18f59408bda656f4c757d1, type: 2} activeQuest: 0 questLineIndex: 0 textspeed: 0.1 isPlayerClose: 1 + rtrnActionCollider: {fileID: 1908643331} --- !u!61 &882726940 BoxCollider2D: m_ObjectHideFlags: 0 @@ -30126,6 +30214,191 @@ Transform: m_Children: [] m_Father: {fileID: 1926371598} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &896817169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 896817173} + - component: {fileID: 896817172} + - component: {fileID: 896817171} + - component: {fileID: 896817170} + m_Layer: 0 + m_Name: TXTMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &896817170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896817169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: addf4c0af1b1f4baaac37d1dff0f423a, type: 3} + m_Name: + m_EditorClassIdentifier: + disableTime: 5 +--- !u!114 &896817171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896817169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Thank You Traveller ! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 4.24 + m_fontSizeBase: 4.24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 896817172} + m_maskType: 0 +--- !u!23 &896817172 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896817169} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + 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: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + 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!224 &896817173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896817169} + 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: 6902463839545773557} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.271, y: 0.897} + m_SizeDelta: {x: 4.1093, y: 1.2427} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &941731384 GameObject: m_ObjectHideFlags: 0 @@ -30277,13 +30550,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -35175,13 +35450,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -40444,9 +40721,9 @@ Transform: m_GameObject: {fileID: 1073194610} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -112.45, y: 18.597, z: -0.0001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: -5.13, y: -11.02, z: -0.0001} + m_LocalScale: {x: 1.45, y: 1.45, z: 1.45} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 183080084} - {fileID: 1241870409} @@ -40468,6 +40745,18 @@ MonoBehaviour: OnComplete: m_PersistentCalls: m_Calls: + - m_Target: {fileID: 1908643329} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 - m_Target: {fileID: 1241870408} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive @@ -40480,9 +40769,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - - m_Target: {fileID: 183080083} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive + - m_Target: {fileID: 1908643331} + m_TargetAssemblyTypeName: UnityEngine.Collider2D, UnityEngine + m_MethodName: set_isTrigger m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -40490,9 +40779,10 @@ MonoBehaviour: m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: - m_BoolArgument: 0 + m_BoolArgument: 1 m_CallState: 2 isFinalAction: 0 + resourceCheckEntries: [] --- !u!61 &1073194613 BoxCollider2D: m_ObjectHideFlags: 0 @@ -40670,13 +40960,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -45749,28 +46041,6 @@ Transform: m_Children: [] m_Father: {fileID: 981096317} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1138504316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2971974634366252985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e46c9f63c22284bc78d900f8086d1d89, type: 3} - m_Name: - m_EditorClassIdentifier: - npcPanel: {fileID: 6010137} - textBtn: {fileID: 1417847582} - npcText: {fileID: 2093156718} - questData: - - {fileID: 11400000, guid: 0967722f082ec4153906c504edf5c45c, type: 2} - - {fileID: 11400000, guid: d7abff7dd281b4875bb61f3ca90a436b, type: 2} - activeQuest: 1 - questLineIndex: 0 - textspeed: 0.1 - isPlayerClose: 1 --- !u!61 &1138504324 BoxCollider2D: m_ObjectHideFlags: 0 @@ -45803,7 +46073,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -1.9274948, y: 1.028152} + m_Offset: {x: -1.4670885, y: 1.028152} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -45814,7 +46084,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2.7595124, y: 2.3863068} + m_Size: {x: 2.286662, y: 2.3863068} m_EdgeRadius: 0 --- !u!1 &1153344171 GameObject: @@ -45967,13 +46237,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -51059,7 +51331,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1241870409 Transform: m_ObjectHideFlags: 0 @@ -51293,6 +51565,117 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1331925694 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1331925695} + - component: {fileID: 1331925698} + - component: {fileID: 1331925697} + - component: {fileID: 1331925696} + m_Layer: 0 + m_Name: FinalQuestAction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1331925695 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331925694} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 16.227144, y: 1.8771428, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2452912794957472388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1331925696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331925694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5371c32ad1cb46f19c3b260eb5e1237, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &1331925697 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331925694} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.015866399, y: -0.1518448} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.7219832, y: 2.4112768} + m_EdgeRadius: 0 +--- !u!114 &1331925698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331925694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d02a12b490f54cdca519cc4e45b0fc4, type: 3} + m_Name: + m_EditorClassIdentifier: + questData: {fileID: 11400000, guid: 48ab8cb3db18f59408bda656f4c757d1, type: 2} + OnComplete: + m_PersistentCalls: + m_Calls: [] + isFinalAction: 1 + resourceCheckEntries: + - resourceName: apple + amount: 5 --- !u!1 &1345210111 GameObject: m_ObjectHideFlags: 0 @@ -51618,13 +52001,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -56567,12 +56952,12 @@ MonoBehaviour: textBtn: {fileID: 1417847582} npcText: {fileID: 2093156718} questData: - - {fileID: 11400000, guid: 0967722f082ec4153906c504edf5c45c, type: 2} - - {fileID: 11400000, guid: d7abff7dd281b4875bb61f3ca90a436b, type: 2} + - {fileID: 11400000, guid: 48ab8cb3db18f59408bda656f4c757d1, type: 2} activeQuest: 1 questLineIndex: 0 textspeed: 0.1 isPlayerClose: 1 + rtrnActionCollider: {fileID: 857035431} --- !u!61 &1408393271 BoxCollider2D: m_ObjectHideFlags: 0 @@ -297262,13 +297647,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 4.34, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -302980,13 +303367,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -312459,13 +312848,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -335068,13 +335459,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -340046,13 +340439,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -365478,13 +365873,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -370591,13 +370988,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -375480,6 +375879,126 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1908643329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1908643330} + - component: {fileID: 1908643332} + - component: {fileID: 1908643331} + m_Layer: 0 + m_Name: FinalCookAction-Quest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1908643330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908643329} + 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: 6902463839545773557} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1908643331 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908643329} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.015866399, y: -0.1518448} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.7219832, y: 2.4112768} + m_EdgeRadius: 0 +--- !u!114 &1908643332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1908643329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d02a12b490f54cdca519cc4e45b0fc4, type: 3} + m_Name: + m_EditorClassIdentifier: + questData: {fileID: 11400000, guid: 1cb9f6811a18b4c9791b486d19534c28, type: 2} + OnComplete: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 896817169} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 896817169} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + isFinalAction: 1 + resourceCheckEntries: [] --- !u!114 &1908673063 MonoBehaviour: m_ObjectHideFlags: 0 @@ -375502,6 +376021,7 @@ MonoBehaviour: questLineIndex: 0 textspeed: 0.1 isPlayerClose: 1 + rtrnActionCollider: {fileID: 0} --- !u!61 &1908673071 BoxCollider2D: m_ObjectHideFlags: 0 @@ -406323,6 +406843,141 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2118750997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2118750998} + - component: {fileID: 2118751000} + - component: {fileID: 2118750999} + - component: {fileID: 2118751001} + m_Layer: 0 + m_Name: FinalCookAction-Quest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2118750998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2118750997} + 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: 4925863582957060181} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2118750999 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2118750997} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.015866399, y: -0.1518448} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.7219832, y: 2.4112768} + m_EdgeRadius: 0 +--- !u!114 &2118751000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2118750997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d02a12b490f54cdca519cc4e45b0fc4, type: 3} + m_Name: + m_EditorClassIdentifier: + questData: {fileID: 11400000, guid: f68efb33c00239a41b5809f66a35636d, type: 2} + OnComplete: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 896817169} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 896817169} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + isFinalAction: 1 + resourceCheckEntries: + - resourceName: wood + amount: 10 +--- !u!114 &2118751001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2118750997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5371c32ad1cb46f19c3b260eb5e1237, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2131209849 GameObject: m_ObjectHideFlags: 0 @@ -412047,13 +412702,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -412137,13 +412794,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -550023,13 +550682,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -685564,13 +686225,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -700123,11 +700786,13 @@ Transform: m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 1331925695} - {fileID: 5656787446521310605} - {fileID: 1271351240082159911} - {fileID: 3649073935262899403} - {fileID: 2505216540588971173} - {fileID: 934718566515397275} + - {fileID: 857035430} m_Father: {fileID: 1658319244} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2459061160109991276 @@ -743110,10 +743775,10 @@ GameObject: - component: {fileID: 8476309196022215700} - component: {fileID: 9178244556904812931} - component: {fileID: 8272108926708631006} - - component: {fileID: 1138504316} - component: {fileID: 1138504324} + - component: {fileID: 9178244556904812932} m_Layer: 0 - m_Name: npc06 + m_Name: npc_lost m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -748628,13 +749293,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 4.34, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -752045,13 +752712,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -774054,13 +774723,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -774141,13 +774812,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -798410,6 +799083,7 @@ Transform: m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 2118750998} - {fileID: 2317846442647109802} - {fileID: 2314941462579091611} - {fileID: 7317784423719312101} @@ -816644,13 +817318,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -816716,13 +817392,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -837628,13 +838306,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -847939,13 +848619,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -848030,13 +848712,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -859163,13 +859847,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -861531,13 +862217,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -892348,10 +893036,12 @@ Transform: m_GameObject: {fileID: 3517281637307605374} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.1, y: -5.6, z: 0.051753588} + m_LocalPosition: {x: 4.36, y: -11.53, z: 0.051753588} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 896817173} + - {fileID: 1908643330} - {fileID: 4404895067347528589} - {fileID: 2700290830693221150} - {fileID: 2986828015281301555} @@ -894625,6 +895315,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 isFinalAction: 1 + resourceCheckEntries: [] --- !u!4 &7131113310815577595 Transform: m_ObjectHideFlags: 0 @@ -901477,12 +902168,12 @@ MonoBehaviour: textBtn: {fileID: 1417847582} npcText: {fileID: 2093156718} questData: - - {fileID: 11400000, guid: 0967722f082ec4153906c504edf5c45c, type: 2} - - {fileID: 11400000, guid: d7abff7dd281b4875bb61f3ca90a436b, type: 2} - activeQuest: 1 + - {fileID: 11400000, guid: f68efb33c00239a41b5809f66a35636d, type: 2} + activeQuest: 0 questLineIndex: 0 textspeed: 0.1 isPlayerClose: 1 + rtrnActionCollider: {fileID: 2118750999} --- !u!61 &7644699028800889706 BoxCollider2D: m_ObjectHideFlags: 0 @@ -926252,13 +926943,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -930261,13 +930954,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -938241,6 +938936,27 @@ SortingGroup: m_SortingLayer: 0 m_SortingOrder: 1 m_SortAtRoot: 0 +--- !u!114 &9178244556904812932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2971974634366252985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5c148fc2124c4630b218cf006e5727b, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3991381353689264225} + _isQuestActive: 0 + questData: + - {fileID: 11400000, guid: f68efb33c00239a41b5809f66a35636d, type: 2} + followSpeed: 1.2 + stopDistance: 2 + maxDistance: 15 + _isFollowing: 0 + npcFinalCollider: {fileID: 2118750999} --- !u!1 &9179163326824435987 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/QuestAction.cs b/Assets/Script/QuestAction.cs index 3bf885fb..41ec8f48 100644 --- a/Assets/Script/QuestAction.cs +++ b/Assets/Script/QuestAction.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,38 +7,76 @@ using UnityEngine.Events; public class QuestAction : MonoBehaviour { public QuestScriptable questData; - bool isRegistered =false; + bool isRegistered = false; public UnityEvent OnComplete; public bool isFinalAction = true; - private void OnTriggerEnter2D(Collider2D other) { - if(other.CompareTag("Player") && other.transform == playerNetwork.localPlayerTransform){ - OnComplete.Invoke(); - if(isFinalAction){ + public List resourceCheckEntries; + + + private void OnTriggerEnter2D(Collider2D other) + { + if (other.CompareTag("Player") && other.transform == playerNetwork.localPlayerTransform) + { + + + OnComplete.Invoke(); + Debug.Log("QuestAction: QuestAction completed"); + if (isFinalAction) + { + + foreach(QuestCompleteResourceCheckEntry entry in resourceCheckEntries) + { + if(playerNetwork.localPlayerTransform.GetComponent().GetStock(entry.resourceName) < entry.amount) + { + Debug.Log("QuestAction: Resource check failed"); + return; + }else{ + for(int i=0; i < entry.amount; i++) + { + playerNetwork.localPlayerTransform.GetComponent().RemoveItem(entry.resourceName); + } + } + } playerNetwork.localPlayerTransform.GetComponent().CompleteQuest(questData); - } + } + gameObject.SetActive(false); + } - + } - public void activate(){ + public void activate() + { gameObject.SetActive(true); } - + void Update() { - if(playerNetwork.localPlayerTransform != null && !isRegistered){ + if (playerNetwork.localPlayerTransform != null && !isRegistered) + { Register(); } } - void Register(){ + void Register() + { playerNetwork.registerQuestAction(this); isRegistered = true; gameObject.SetActive(false); } + + } + + +[Serializable ] +public class QuestCompleteResourceCheckEntry +{ + public string resourceName; + public int amount; +} \ No newline at end of file diff --git a/Assets/Script/npcScript.cs b/Assets/Script/npcScript.cs index 5d3b8d6b..1d77ece5 100644 --- a/Assets/Script/npcScript.cs +++ b/Assets/Script/npcScript.cs @@ -20,8 +20,9 @@ public class npcScript : MonoBehaviour //public GameObject questUI; - public float textspeed = 0.10f; + public float textspeed = 0.15f; public bool isPlayerClose; + [SerializeField] private BoxCollider2D rtrnActionCollider; void Update() { @@ -64,7 +65,8 @@ public class npcScript : MonoBehaviour //Start quest // questUI.SetActive(true); - playerNetwork.localPlayerTransform.GetComponent().SetActiveQuest(questData[activeQuest]); + playerNetwork.localPlayerTransform.GetComponent().SetActiveQuest(questData[activeQuest]); // set the quest + rtrnActionCollider.isTrigger = false; } } diff --git a/Assets/Script/playerNetwork.cs b/Assets/Script/playerNetwork.cs index 414fab4d..10110eae 100644 --- a/Assets/Script/playerNetwork.cs +++ b/Assets/Script/playerNetwork.cs @@ -178,7 +178,7 @@ public class playerNetwork : NetworkBehaviour completedQuests.Add(currentQuest.questName); currentQuest = null; - questText.text = "Quest Completed! Found 1000 coins from Cave-Chest"; + questText.text = "Quest Completed!"; playerCoin += questData.rewardAmount; coinText.text = playerCoin.ToString(); //add delay diff --git a/Assets/autoDisableGameObj.cs b/Assets/autoDisableGameObj.cs new file mode 100644 index 00000000..63202c9c --- /dev/null +++ b/Assets/autoDisableGameObj.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class autoDisableGameObj : MonoBehaviour +{ + public float disableTime = 5f; + + /// + /// This function is called when the object becomes enabled and active. + /// + void OnEnable() + { + StartCoroutine(DisableIteself()); + } + private IEnumerator DisableIteself() + { + yield return new WaitForSeconds(disableTime); + gameObject.SetActive(false); + } +} diff --git a/Assets/autoDisableGameObj.cs.meta b/Assets/autoDisableGameObj.cs.meta new file mode 100644 index 00000000..1e709038 --- /dev/null +++ b/Assets/autoDisableGameObj.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: addf4c0af1b1f4baaac37d1dff0f423a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e9e71438..be830a1b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,11 +8,11 @@ "hash": "f8c8347af3a144069dffd6120f1c4142f8120891" }, "com.unity.2d.animation": { - "version": "9.0.3", + "version": "9.1.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "8.0.4", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", @@ -21,7 +21,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.0.1", + "version": "1.1.6", "depth": 1, "source": "registry", "dependencies": { @@ -33,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.1", + "version": "8.0.4", "depth": 2, "source": "registry", "dependencies": { @@ -53,13 +53,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.2", + "version": "8.0.5", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.animation": "9.0.1" + "com.unity.2d.animation": "9.1.1" }, "url": "https://packages.unity.com" }, @@ -70,11 +70,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.2", + "version": "9.0.5", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "8.0.4", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -90,7 +90,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.1.1", + "version": "3.1.3", "depth": 1, "source": "registry", "dependencies": { @@ -102,11 +102,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.18", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -139,14 +140,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.0.3", + "com.unity.2d.animation": "9.1.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.2", + "com.unity.2d.psdimporter": "8.0.5", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.2", + "com.unity.2d.spriteshape": "9.0.5", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.1", - "com.unity.2d.aseprite": "1.0.1" + "com.unity.2d.tilemap.extras": "3.1.3", + "com.unity.2d.aseprite": "1.1.6" } }, "com.unity.ide.rider": {