diff --git a/SSLR/Assets/NpcModels/Prefabs/female2.prefab b/SSLR/Assets/NpcModels/Prefabs/female2.prefab index c2d83cd..e713179 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female2.prefab @@ -162,7 +162,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.65049136 + m_Radius: 0.39 m_Height: 1.679373 m_Direction: 1 m_Center: {x: -0.013732197, y: 0.71740484, z: -0.04328109} diff --git a/SSLR/Assets/Scenes/RyanPlayground.unity b/SSLR/Assets/Scenes/RyanPlayground.unity index ac3bb7a..871201d 100644 --- a/SSLR/Assets/Scenes/RyanPlayground.unity +++ b/SSLR/Assets/Scenes/RyanPlayground.unity @@ -122,63 +122,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &265031874 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalPosition.x - value: 9.810585 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalPosition.z - value: 0.92641634 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5932781028655953941, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6421755133344260783, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} - propertyPath: m_Name - value: police - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} --- !u!1 &299639867 GameObject: m_ObjectHideFlags: 0 @@ -547,68 +490,6 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff ---- !u!1 &335017575 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 335017576} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &335017576 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 335017575} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.53231, y: 1.3681344, z: 3.4535394} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 545637505} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &368167158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 368167159} - m_Layer: 0 - m_Name: GameObject (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &368167159 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 368167158} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.46769, y: 1.3681344, z: 4.4535394} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 545637505} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &441087506 PrefabInstance: m_ObjectHideFlags: 0 @@ -686,63 +567,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} ---- !u!1001 &497351480 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 296760103864809898, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_Name - value: female2 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalPosition.x - value: 4.756728 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalPosition.z - value: -0.43008292 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1104961981622706960, guid: bf5026474447d534280e7f9ca1558858, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bf5026474447d534280e7f9ca1558858, type: 3} --- !u!1 &503628346 GameObject: m_ObjectHideFlags: 0 @@ -1050,7 +874,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 545637503} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e8dc8c9a0f5dd0243895dc3a63323b85, type: 3} m_Name: @@ -1072,11 +896,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 335017576} - - {fileID: 368167159} - - {fileID: 1132197014} - - {fileID: 1558064964} - - {fileID: 589608068} - {fileID: 1056860014} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1093,10 +912,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maleNpcs: - - {fileID: 8486445782931515160, guid: beae5a92134b6f347a8cd76bfefd04da, type: 3} + - {fileID: 5194893303514968177, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} + - {fileID: 9135896169125054515, guid: a798b00ea921e8343898ff52e5991eca, type: 3} + - {fileID: 925545406418636384, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} + - {fileID: 4072881850004209407, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} + - {fileID: 2969917783020190086, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} + - {fileID: 2185267836938882255, guid: 9338effa4924428488a33d614a89383b, type: 3} + - {fileID: 479759021627617850, guid: a3071440bdd10854488c521655a110c4, type: 3} femaleNpcs: - - {fileID: 8486445782931515160, guid: beae5a92134b6f347a8cd76bfefd04da, type: 3} - policeNpc: {fileID: 6846919541000073478, guid: 5744d4b3c1617fe4096b9035ee1be4e8, type: 3} + - {fileID: 2684341282212037920, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} + - {fileID: 296760103864809898, guid: bf5026474447d534280e7f9ca1558858, type: 3} + - {fileID: 6223094720403375677, guid: cd53db996f4929048b1024fafa3c314a, type: 3} + policeNpc: {fileID: 6421755133344260783, guid: 5d45a70f77986274c8bd677826e46a4c, type: 3} spawnPoints: - {fileID: 1056860014} playerFree: 0 @@ -1135,94 +962,6 @@ MonoBehaviour: m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: f271511ca3096e14d89d205c1a58a3ca, type: 2} m_BuildHeightMesh: 1 ---- !u!1001 &578702593 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalPosition.x - value: 10.512836 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalPosition.z - value: -0.7293136 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1520089297785738869, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2185267836938882255, guid: 9338effa4924428488a33d614a89383b, type: 3} - propertyPath: m_Name - value: male6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9338effa4924428488a33d614a89383b, type: 3} ---- !u!1 &589608067 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 589608068} - m_Layer: 0 - m_Name: GameObject (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &589608068 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 589608067} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.46769, y: 1.3681344, z: 7.4535394} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 545637505} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &756192406 GameObject: m_ObjectHideFlags: 0 @@ -1269,120 +1008,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1013737439 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 479759021627617850, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_Name - value: male7 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalPosition.x - value: 8.173022 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalPosition.z - value: 1.0204493 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1000822648102938752, guid: a3071440bdd10854488c521655a110c4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a3071440bdd10854488c521655a110c4, type: 3} ---- !u!1001 &1020690789 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalPosition.x - value: 7.2092915 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalPosition.z - value: -0.02817154 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2485024722450441020, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2969917783020190086, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} - propertyPath: m_Name - value: male5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 26a21da08e645a44d98892caa04cf0b2, type: 3} --- !u!1 &1056860013 GameObject: m_ObjectHideFlags: 0 @@ -1414,37 +1039,6 @@ Transform: m_Children: [] m_Father: {fileID: 545637505} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1132197013 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1132197014} - m_Layer: 0 - m_Name: GameObject (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1132197014 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1132197013} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.46769, y: 1.3681344, z: 5.4535394} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 545637505} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1249617917 GameObject: m_ObjectHideFlags: 0 @@ -1633,120 +1227,6 @@ MonoBehaviour: m_Teleporting: m_PersistentCalls: m_Calls: [] ---- !u!1001 &1297734130 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6223094720403375677, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_Name - value: female3 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalPosition.x - value: 7.7838087 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalPosition.z - value: -2.6846368 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6707846670718131335, guid: cd53db996f4929048b1024fafa3c314a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cd53db996f4929048b1024fafa3c314a, type: 3} ---- !u!1001 &1301964163 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalPosition.x - value: 10.132348 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041011333 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalPosition.z - value: -1.9081156 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8467587010930758281, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9135896169125054515, guid: a798b00ea921e8343898ff52e5991eca, type: 3} - propertyPath: m_Name - value: male2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a798b00ea921e8343898ff52e5991eca, type: 3} --- !u!1 &1333249642 GameObject: m_ObjectHideFlags: 0 @@ -1872,265 +1352,6 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff ---- !u!1001 &1384340141 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalPosition.x - value: 9.319165 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalPosition.z - value: -3.2233222 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4853797667259607755, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194893303514968177, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} - propertyPath: m_Name - value: male1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d6fdb3aad202bcb4a94a506ea6001e6a, type: 3} ---- !u!1001 &1498995661 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2684341282212037920, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_Name - value: female1 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalPosition.x - value: 6.0231447 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalPosition.z - value: -1.8113742 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3317853852863700890, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6ca4cac9baa55204bbc12dd4c3df7407, type: 3} ---- !u!1 &1558064963 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1558064964} - m_Layer: 0 - m_Name: GameObject (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1558064964 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558064963} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.46769, y: 1.3681344, z: 6.4535394} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 545637505} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1959324515 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalPosition.x - value: 8.1256075 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalPosition.z - value: -0.83237946 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3732948466575516741, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4072881850004209407, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} - propertyPath: m_Name - value: male4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f31543151b7dd3048af80efadcec2cc2, type: 3} ---- !u!1001 &2002598451 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalPosition.x - value: 8.903682 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalPosition.y - value: 0.041010857 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalPosition.z - value: -1.1523924 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 546028504628827354, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 925545406418636384, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} - propertyPath: m_Name - value: male3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f5050781a4e9ac44b1d74fbfafffc3c, type: 3} --- !u!1 &2092139007 GameObject: m_ObjectHideFlags: 0 @@ -2233,14 +1454,3 @@ SceneRoots: - {fileID: 515541349} - {fileID: 505257119} - {fileID: 1333249646} - - {fileID: 265031874} - - {fileID: 1013737439} - - {fileID: 578702593} - - {fileID: 1020690789} - - {fileID: 1959324515} - - {fileID: 2002598451} - - {fileID: 1301964163} - - {fileID: 1384340141} - - {fileID: 1297734130} - - {fileID: 497351480} - - {fileID: 1498995661} diff --git a/SSLR/Assets/Scripts/Backend.cs b/SSLR/Assets/Scripts/Backend.cs index 45cc5ae..e50847c 100644 --- a/SSLR/Assets/Scripts/Backend.cs +++ b/SSLR/Assets/Scripts/Backend.cs @@ -21,7 +21,7 @@ public class Backend : MonoBehaviour { AutoConnectRealtime = true }; - + Client = new Supabase.Client(url, anonKey, options); await Client.InitializeAsync().ContinueWith(task => @@ -35,11 +35,13 @@ public class Backend : MonoBehaviour Debug.Log("Supabase Initialized"); } }); -FirebaseGet(); } + FirebaseGet(); + } - public async void SendData(string uid, int score, string displayName, int daysPlayed, int customersHelped, int customersHelpedWrongly) + public async void SendData(string uid, int score, string displayName, int daysPlayed, int customersHelped, + int customersHelpedWrongly) { - var user= new Users + var user = new Users { uid = uid, score = score, @@ -56,7 +58,6 @@ FirebaseGet(); } } else { - Debug.Log("Data Sent Sucessfully"); } }); @@ -74,7 +75,6 @@ FirebaseGet(); } Session = await Client.Auth.SignIn(email, password); Debug.Log(Session.User.Id); GetData(Session.User.Id); - } public async void GetData(string uid) @@ -83,9 +83,10 @@ FirebaseGet(); } User = result.Model; } - public void FirebaseGet() + public NpcData FirebaseGet() { - FirebaseDatabase.DefaultInstance.RootReference.Child("stories").GetValueAsync().ContinueWith(task => + NpcData data = new NpcData(); + FirebaseDatabase.DefaultInstance.RootReference.Child("scenarios").Child("1").GetValueAsync().ContinueWith(task => { if (task.IsFaulted) { @@ -94,8 +95,11 @@ FirebaseGet(); } else if (task.IsCompleted) { DataSnapshot snapshot = task.Result; - Debug.Log(snapshot.GetRawJsonValue()); - } + string json = snapshot.GetRawJsonValue(); + data = JsonUtility.FromJson(json); + + } }); + return data; } } \ No newline at end of file diff --git a/SSLR/Assets/Scripts/NpcData.cs b/SSLR/Assets/Scripts/NpcData.cs new file mode 100644 index 0000000..c01441a --- /dev/null +++ b/SSLR/Assets/Scripts/NpcData.cs @@ -0,0 +1,31 @@ +/* + * Author: Lin Hengrui Ryan + * Date: 12/2/25 + * Description: + * Npc Data + */ + +using System; +using UnityEngine.Serialization; + +[Serializable] +public class NpcData +{ + public string name; + public string initialStatement; + public string question1; + public string question2; + public string question3; + public string answer1; + public string answer2; + public string answer3; + public string response1; + public string response2; + public string response3; + public int points; + public bool hasPaper; + public string correctDepartment; + + + +} \ No newline at end of file diff --git a/SSLR/Assets/Scripts/NpcData.cs.meta b/SSLR/Assets/Scripts/NpcData.cs.meta new file mode 100644 index 0000000..eaaf692 --- /dev/null +++ b/SSLR/Assets/Scripts/NpcData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 304688746d0d4e44089f32df3f67bdd6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/Scripts/NpcManager.cs b/SSLR/Assets/Scripts/NpcManager.cs index ee45c6e..2c1fcea 100644 --- a/SSLR/Assets/Scripts/NpcManager.cs +++ b/SSLR/Assets/Scripts/NpcManager.cs @@ -7,7 +7,6 @@ using System; using UnityEngine; - using System.Collections.Generic; using UnityEngine.Serialization; @@ -45,12 +44,11 @@ public class NpcManager : MonoBehaviour /// a bool to check if the player is free /// public bool playerFree = false; - + /// /// collection of all exiting npcs /// - public GameObject[] currentNpcs; - + public List currentNpcs; /// /// a collection of positions for the chairs to sit for the npcs /// @@ -60,9 +58,10 @@ public class NpcManager : MonoBehaviour /// public Transform[] despawnPoints; - public void spawnNpc(bool isFemale, Transform spawnPoint) + public void spawnNpc(bool isFemale) { var randomNpc=0; + var spawnPoint = spawnPoints[UnityEngine.Random.Range(0, spawnPoints.Length)]; if (isFemale) { randomNpc = UnityEngine.Random.Range(0, femaleNpcs.Length); @@ -72,13 +71,10 @@ public class NpcManager : MonoBehaviour randomNpc = UnityEngine.Random.Range(0, maleNpcs.Length); } var npc = Instantiate(isFemale ? femaleNpcs[randomNpc] : maleNpcs[randomNpc], spawnPoint.position, Quaternion.identity); - // currentNpcs.SetValue(npc,currentNpcs.Length); + currentNpcs.Add(npc); + } - private void Start() - { - spawnNpc(false, spawnPoints[0]); - } public void Awake() { @@ -93,4 +89,5 @@ public class NpcManager : MonoBehaviour } } + }