From 7d1c308e34f4ad6038e279f41b0238dca22d3bf3 Mon Sep 17 00:00:00 2001 From: kookiekenobi Date: Tue, 18 Feb 2025 00:27:03 +0800 Subject: [PATCH] game: trying to progress past 2nd npc --- SSLR/Assets/Scenes/LiviPlayground.unity | 557 +++++++++++++++++++++++- SSLR/Assets/Scripts/DayManager.cs | 4 +- SSLR/Assets/Scripts/NextButton.cs | 1 + SSLR/Assets/Scripts/PaperSocket.cs | 6 +- SSLR/Assets/Scripts/ShiftManager.cs | 5 +- 5 files changed, 564 insertions(+), 9 deletions(-) diff --git a/SSLR/Assets/Scenes/LiviPlayground.unity b/SSLR/Assets/Scenes/LiviPlayground.unity index 85e5e9f..d0d8e7a 100644 --- a/SSLR/Assets/Scenes/LiviPlayground.unity +++ b/SSLR/Assets/Scenes/LiviPlayground.unity @@ -1143,6 +1143,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} +--- !u!1001 &114859231 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.786 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &144678493 GameObject: m_ObjectHideFlags: 0 @@ -2977,6 +3038,63 @@ Transform: - {fileID: 1318173677} m_Father: {fileID: 1298003772} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &336443453 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalPosition.x + value: -1.010271 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0.87638295 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalPosition.z + value: 1.3692256 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.3566575 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9342352 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 138.21 + objectReference: {fileID: 0} + - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4371416420420422245, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} + propertyPath: m_Name + value: digitalClock + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} --- !u!1 &341360408 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8319687667164330763, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} @@ -5716,6 +5834,128 @@ MonoBehaviour: url: https://fchobpauqasfebohuuam.supabase.co anonKey: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImZjaG9icGF1cWFzZmVib2h1dWFtIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MzczNTYyNTUsImV4cCI6MjA1MjkzMjI1NX0.LkwCnzjtf8CPLrm6OONkjyjxZW8jE05V_spbOEeAXEM menuButtons: {fileID: 387192628} +--- !u!1001 &542169805 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.253 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} +--- !u!1001 &546682143 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.105 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &553967502 GameObject: m_ObjectHideFlags: 0 @@ -6806,8 +7046,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bab791ccf13189449b82b8f0b70b269, type: 3} m_Name: m_EditorClassIdentifier: - shiftDuration: 120 - npcSpawnArea: {fileID: 1126609776} + shiftDuration: 180 --- !u!1 &741702766 GameObject: m_ObjectHideFlags: 0 @@ -7553,6 +7792,67 @@ MonoBehaviour: m_OnKeyboardFocusChanged: m_PersistentCalls: m_Calls: [] +--- !u!1001 &808853110 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.67 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &813968289 GameObject: m_ObjectHideFlags: 0 @@ -12683,6 +12983,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1246095350} m_CullTransparentMesh: 1 +--- !u!1001 &1247121575 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.971 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &1249617917 GameObject: m_ObjectHideFlags: 0 @@ -13243,6 +13604,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1271681200} m_CullTransparentMesh: 1 +--- !u!1001 &1277083850 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8763828 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &1277945299 GameObject: m_ObjectHideFlags: 0 @@ -16924,6 +17346,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1626407688} m_CullTransparentMesh: 1 +--- !u!1001 &1647086643 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.386 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &1651240549 GameObject: m_ObjectHideFlags: 0 @@ -20233,6 +20716,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1983734032} m_CullTransparentMesh: 1 +--- !u!1001 &1991476001 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.512 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.222 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7596502 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000011319686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.650332 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000009690686 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -81.133 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6087617128238386579, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1 &2007606247 GameObject: m_ObjectHideFlags: 0 @@ -21407,9 +21951,18 @@ SceneRoots: - {fileID: 386490940} - {fileID: 536795482675034010} - {fileID: 1220174881} + - {fileID: 1277083850} + - {fileID: 1247121575} + - {fileID: 546682143} + - {fileID: 542169805} + - {fileID: 1647086643} + - {fileID: 1991476001} + - {fileID: 808853110} + - {fileID: 114859231} - {fileID: 1339160292} - {fileID: 1399971910} - {fileID: 43707400} - {fileID: 1468703799} - {fileID: 849138917} - {fileID: 1742359896} + - {fileID: 336443453} diff --git a/SSLR/Assets/Scripts/DayManager.cs b/SSLR/Assets/Scripts/DayManager.cs index c855889..3cfba17 100644 --- a/SSLR/Assets/Scripts/DayManager.cs +++ b/SSLR/Assets/Scripts/DayManager.cs @@ -68,8 +68,8 @@ public class DayManager : MonoBehaviour if (other.CompareTag("Player")) { Debug.Log("Day completed!"); - Backend.instance.User.daysPlayed += 1; - Debug.Log(Backend.instance.User.daysPlayed); + /*Backend.instance.User.daysPlayed += 1; + Debug.Log(Backend.instance.User.daysPlayed);*/ shiftManagerScript.AllowShiftStart(); Debug.Log("You can start another shift!"); diff --git a/SSLR/Assets/Scripts/NextButton.cs b/SSLR/Assets/Scripts/NextButton.cs index 0ce5b76..927fe05 100644 --- a/SSLR/Assets/Scripts/NextButton.cs +++ b/SSLR/Assets/Scripts/NextButton.cs @@ -23,6 +23,7 @@ public class NextButton : MonoBehaviour randomnpc.GetComponent().Called(); PlayerDialogueInteraction.instance.ResetChecklist(); + PlayerDialogueInteraction.instance.ResetDialogue(); } } } diff --git a/SSLR/Assets/Scripts/PaperSocket.cs b/SSLR/Assets/Scripts/PaperSocket.cs index b652c0d..e1a560c 100644 --- a/SSLR/Assets/Scripts/PaperSocket.cs +++ b/SSLR/Assets/Scripts/PaperSocket.cs @@ -64,11 +64,13 @@ public class PaperSocket : MonoBehaviour { if (stampDoc.isStamped && stampDoc.isSigned) { + Debug.Log("Checked Docs"); PlayerDialogueInteraction.instance.takeDocumentsTick.SetActive(true); PlayerDialogueInteraction.instance.giveDocumentsTick.SetActive(true); var paperDepartment = stampDoc.CheckFinalDepartment(); - if (paperDepartment == "Correct") + Debug.Log(paperDepartment); + /*if (paperDepartment == "Correct") { Backend.instance.User.customersHelpedCorrectly += 1; Backend.instance.User.score += GameManager.instance.currentNPC.GetComponent().npcData.points; @@ -76,7 +78,7 @@ public class PaperSocket : MonoBehaviour else if (paperDepartment == "Wrong") { Backend.instance.User.customersHelpedWrongly += 1; - } + }*/ Destroy(paperObject); diff --git a/SSLR/Assets/Scripts/ShiftManager.cs b/SSLR/Assets/Scripts/ShiftManager.cs index a357084..df8e054 100644 --- a/SSLR/Assets/Scripts/ShiftManager.cs +++ b/SSLR/Assets/Scripts/ShiftManager.cs @@ -16,7 +16,6 @@ public class ShiftManager : MonoBehaviour /// [SerializeField] private float shiftDuration; private float remainingTime; - [SerializeField] private GameObject npcSpawnArea; /// /// Shift box collider trigger @@ -57,7 +56,7 @@ public class ShiftManager : MonoBehaviour { Debug.Log("Shift started"); - npcSpawnArea.SetActive(true); + /*npcSpawnArea.SetActive(true);*/ gm.shiftStarted = true; shiftTrigger.enabled = false; StartCoroutine(StartWorkShift()); @@ -93,7 +92,7 @@ public class ShiftManager : MonoBehaviour { Debug.Log("Shift ended!"); - npcSpawnArea.SetActive(false); + /*npcSpawnArea.SetActive(false);*/ remainingTime = shiftDuration; gm.shiftStarted = false; dayManager.doneAShift = true;