From 825f15670fa3244367dcd9f498d992f8120bd468 Mon Sep 17 00:00:00 2001 From: Sewmina Date: Fri, 27 Dec 2024 22:45:38 +0530 Subject: [PATCH] quests, next line fixed --- .vscode/settings.json | 2 +- Assets/Scenes/Game.unity | 181 +++++++++++------------------------- Assets/Script/NpcUI.cs | 16 ++++ Assets/Script/NpcUI.cs.meta | 11 +++ Assets/Script/npcScript.cs | 12 ++- Packages/packages-lock.json | 35 ++++--- 6 files changed, 108 insertions(+), 149 deletions(-) create mode 100644 Assets/Script/NpcUI.cs create mode 100644 Assets/Script/NpcUI.cs.meta diff --git a/.vscode/settings.json b/.vscode/settings.json index ee4a2501..5ae2a558 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,5 +56,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "2DMMOMirror.sln" + "dotnet.defaultSolution": "Archive.sln" } \ No newline at end of file diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 1ec617cf..b3166d8a 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -38,6 +38,7 @@ 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: @@ -195,6 +196,7 @@ GameObject: - component: {fileID: 6010138} - component: {fileID: 6010140} - component: {fileID: 6010139} + - component: {fileID: 6010141} m_Layer: 5 m_Name: NPCPanel m_TagString: Untagged @@ -261,6 +263,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6010137} m_CullTransparentMesh: 1 +--- !u!114 &6010141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6010137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a35344bf9ff1da4f94548babcd8c109, type: 3} + m_Name: + m_EditorClassIdentifier: + btnNext: {fileID: 1417847584} --- !u!1 &10218744 GameObject: m_ObjectHideFlags: 0 @@ -791,15 +806,13 @@ 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} @@ -6374,15 +6387,13 @@ 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} @@ -11727,15 +11738,13 @@ 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} @@ -16845,15 +16854,13 @@ 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} @@ -22725,15 +22732,13 @@ 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} @@ -30040,9 +30045,8 @@ 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: 1cb9f6811a18b4c9791b486d19534c28, type: 2} + activeQuest: 0 questLineIndex: 0 textspeed: 0.1 isPlayerClose: 1 @@ -30273,15 +30277,13 @@ 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} @@ -35173,15 +35175,13 @@ 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} @@ -40670,15 +40670,13 @@ 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} @@ -45969,15 +45967,13 @@ 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} @@ -51622,15 +51618,13 @@ 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} @@ -56737,19 +56731,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1417847585} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 9146153912271890001} - m_TargetAssemblyTypeName: npcScript, Assembly-CSharp - m_MethodName: NextLine - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &1417847585 MonoBehaviour: m_ObjectHideFlags: 0 @@ -297280,15 +297262,13 @@ 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} @@ -303000,15 +302980,13 @@ 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} @@ -312481,15 +312459,13 @@ 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} @@ -335092,15 +335068,13 @@ 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} @@ -340072,15 +340046,13 @@ 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} @@ -365506,15 +365478,13 @@ 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} @@ -370621,15 +370591,13 @@ 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} @@ -412079,15 +412047,13 @@ 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} @@ -412171,15 +412137,13 @@ 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} @@ -550059,15 +550023,13 @@ 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} @@ -685602,15 +685564,13 @@ 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} @@ -748668,15 +748628,13 @@ 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} @@ -752087,15 +752045,13 @@ 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} @@ -774098,15 +774054,13 @@ 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} @@ -774187,15 +774141,13 @@ 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} @@ -816692,15 +816644,13 @@ 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} @@ -816766,15 +816716,13 @@ 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} @@ -837680,15 +837628,13 @@ 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} @@ -847993,15 +847939,13 @@ 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} @@ -848086,15 +848030,13 @@ 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} @@ -859221,15 +859163,13 @@ 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} @@ -861591,15 +861531,13 @@ 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} @@ -926314,15 +926252,13 @@ 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} @@ -930325,15 +930261,13 @@ 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} @@ -937955,17 +937889,6 @@ Transform: m_Children: [] m_Father: {fileID: 2183170774391192499} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9146153912271890001 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3530665248377829069, guid: 3aaafdbd6af9342f9957f090c1e10e5b, type: 3} - m_PrefabInstance: {fileID: 9133198342781084465} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e46c9f63c22284bc78d900f8086d1d89, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &9146241030150074599 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/NpcUI.cs b/Assets/Script/NpcUI.cs new file mode 100644 index 00000000..c9686afa --- /dev/null +++ b/Assets/Script/NpcUI.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class NpcUI : MonoBehaviour +{ + public Button btnNext; + public void Start(){ + btnNext.onClick.AddListener(onNext); + } + + void onNext(){ + npcScript.activeNpc.NextLine(); + } +} diff --git a/Assets/Script/NpcUI.cs.meta b/Assets/Script/NpcUI.cs.meta new file mode 100644 index 00000000..2d2f2338 --- /dev/null +++ b/Assets/Script/NpcUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a35344bf9ff1da4f94548babcd8c109 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/npcScript.cs b/Assets/Script/npcScript.cs index 535bc1ed..5d3b8d6b 100644 --- a/Assets/Script/npcScript.cs +++ b/Assets/Script/npcScript.cs @@ -7,6 +7,9 @@ using UnityEngine.UI; public class npcScript : MonoBehaviour { + + public static npcScript activeNpc; + public GameObject npcPanel; public GameObject textBtn; public TMP_Text npcText; @@ -36,6 +39,7 @@ public class npcScript : MonoBehaviour IEnumerator textLoad() { isLoadingText = true; + Debug.Log($"Reading line {questLineIndex} from quest {activeQuest}", gameObject); foreach (char letter in questData[activeQuest].questLines[questLineIndex].ToCharArray()) { npcText.text += letter; @@ -73,7 +77,7 @@ public class npcScript : MonoBehaviour { if (other.CompareTag("Player")) { - + Debug.Log($"Player entered into {gameObject.name}",gameObject); if (other.transform == playerNetwork.localPlayerTransform) { playerNetwork pnet = playerNetwork.localPlayerTransform.GetComponent(); @@ -112,6 +116,7 @@ public class npcScript : MonoBehaviour } isPlayerClose = true; + activeNpc= this; if (npcPanel.activeInHierarchy) { ResetTexts(); @@ -131,11 +136,16 @@ public class npcScript : MonoBehaviour void LoadText() { + if(!isPlayerClose){ + Debug.Log("This player aint in my area", gameObject); + return; + } npcText.text = ""; if (textLoopAsync != null) { StopCoroutine(textLoopAsync); } + Debug.Log("request quest line text load",gameObject); textLoopAsync = StartCoroutine(textLoad()); } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index be830a1b..e9e71438 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,11 +8,11 @@ "hash": "f8c8347af3a144069dffd6120f1c4142f8120891" }, "com.unity.2d.animation": { - "version": "9.1.3", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.4", + "com.unity.2d.common": "8.0.1", "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.1.6", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -33,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.4", + "version": "8.0.1", "depth": 2, "source": "registry", "dependencies": { @@ -53,13 +53,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.5", + "version": "8.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.2", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.animation": "9.1.1" + "com.unity.2d.animation": "9.0.1" }, "url": "https://packages.unity.com" }, @@ -70,11 +70,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.5", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.4", + "com.unity.2d.common": "8.0.1", "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.3", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -102,12 +102,11 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.8", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, @@ -140,14 +139,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.1.3", + "com.unity.2d.animation": "9.0.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.5", + "com.unity.2d.psdimporter": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.5", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.3", - "com.unity.2d.aseprite": "1.1.6" + "com.unity.2d.tilemap.extras": "3.1.1", + "com.unity.2d.aseprite": "1.0.1" } }, "com.unity.ide.rider": {