game: adding Vending Machine

game: applying layer changes to prefabs
changed to AIWalkable layer to allow the ai to nav mesh over # Conflicts: # RunningLateGame/Assets/Scenes/Playgrounds/RyanAIPlaygroundA/playgroundTestingGround.asset
2024-08-15 17:06:00 +08:00 · 2024-08-15 17:05:54 +08:00
20 changed files with 1849 additions and 64 deletions
--- a/RunningLateGame/Assets/Models/coffee_cup.fbx.meta
+++ b/RunningLateGame/Assets/Models/coffee_cup.fbx.meta
@ -40,7 +40,7 @@ ModelImporter:
    isReadable: 0
  meshes:
    lODScreenPercentages: []
-    globalScale: 1.2
+    globalScale: 15
    meshCompression: 3
    addColliders: 0
    useSRGBMaterialColor: 1
@ -95,7 +95,7 @@ ModelImporter:
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
-    globalScale: 1.2
+    globalScale: 0.14999999
    rootMotionBoneName: 
    hasTranslationDoF: 0
    hasExtraRoot: 0
--- a/RunningLateGame/Assets/Models/void_deck_chair.fbx.meta
+++ b/RunningLateGame/Assets/Models/void_deck_chair.fbx.meta
@ -40,7 +40,7 @@ ModelImporter:
    isReadable: 0
  meshes:
    lODScreenPercentages: []
-    globalScale: 1.2
+    globalScale: 0.8
    meshCompression: 3
    addColliders: 0
    useSRGBMaterialColor: 1
@ -95,7 +95,7 @@ ModelImporter:
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
-    globalScale: 1.2
+    globalScale: 0.008
    rootMotionBoneName: 
    hasTranslationDoF: 0
    hasExtraRoot: 0
--- a/RunningLateGame/Assets/Models/void_deck_table.fbx.meta
+++ b/RunningLateGame/Assets/Models/void_deck_table.fbx.meta
@ -40,7 +40,7 @@ ModelImporter:
    isReadable: 0
  meshes:
    lODScreenPercentages: []
-    globalScale: 1.2
+    globalScale: 0.8
    meshCompression: 3
    addColliders: 0
    useSRGBMaterialColor: 1
@ -95,7 +95,7 @@ ModelImporter:
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
-    globalScale: 1.2
+    globalScale: 0.008
    rootMotionBoneName: 
    hasTranslationDoF: 0
    hasExtraRoot: 0
--- a/RunningLateGame/Assets/Prefabs/coffee_cup.prefab
+++ b/RunningLateGame/Assets/Prefabs/coffee_cup.prefab
@ -11,6 +11,8 @@ GameObject:
  - component: {fileID: 3450189480263887611}
  - component: {fileID: 4306660149059946821}
  - component: {fileID: 2487906228647857105}
+  - component: {fileID: 4554078824081771285}
+  - component: {fileID: 1012447081641753594}
  m_Layer: 0
  m_Name: coffee_cup
  m_TagString: Untagged
@ -83,3 +85,52 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &4554078824081771285
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5391765043731144851}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 8980752533943413279, guid: 0d98e348cc602404cbfe8967316fb5f2, type: 3}
+--- !u!54 &1012447081641753594
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5391765043731144851}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
--- a/RunningLateGame/Assets/Prefabs/hdbBlock
+++ b/RunningLateGame/Assets/Prefabs/hdbBlock
--- a/RunningLateGame/Assets/Prefabs/kerb.prefab
+++ b/RunningLateGame/Assets/Prefabs/kerb.prefab
@ -11,7 +11,7 @@ GameObject:
  - component: {fileID: 689814999970020915}
  - component: {fileID: 6777203139563071386}
  - component: {fileID: 3776144600318798936}
-  m_Layer: 0
+  m_Layer: 9
  m_Name: kerb
  m_TagString: Untagged
  m_Icon: {fileID: 0}
--- a/RunningLateGame/Assets/Prefabs/lift.prefab
+++ b/RunningLateGame/Assets/Prefabs/lift.prefab
@ -105,7 +105,7 @@ GameObject:
  - component: {fileID: 6504267406812371461}
  m_Layer: 0
  m_Name: Square
-  m_TagString: Untagged
+  m_TagString: Interactable
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -190,7 +190,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3a46a62138bd3774aa62b76560629f46, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  interactionPrompt: 
+  interactionPrompt: press [E] to open lift door
  door: {fileID: 0}
  liftController: {fileID: 0}
 --- !u!65 &6504267406812371461
@ -228,7 +228,7 @@ GameObject:
  - component: {fileID: 4216367518486719019}
  m_Layer: 0
  m_Name: Square (1)
-  m_TagString: Untagged
+  m_TagString: Interactable
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -313,7 +313,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3a46a62138bd3774aa62b76560629f46, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  interactionPrompt: 
+  interactionPrompt: press [E] to open lift door
  door: {fileID: 0}
  liftController: {fileID: 0}
 --- !u!65 &4216367518486719019
@ -337,6 +337,95 @@ BoxCollider:
  serializedVersion: 3
  m_Size: {x: 1, y: 0.99999994, z: 0.19999999}
  m_Center: {x: 0, y: 0, z: -0.0000009536743}
+--- !u!1001 &2334032909809982384
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2988468957674999515}
+    m_Modifications:
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 12.216
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 12.216001
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 12.216001
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.051404953
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.2622
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.28999996
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4477882457964345163, guid: b03f3770c78ea7947b54c88973f443de,
+        type: 3}
+      propertyPath: m_Name
+      value: fluorescent_light
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b03f3770c78ea7947b54c88973f443de, type: 3}
+--- !u!4 &3151981558073726855 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 854047951475608631, guid: b03f3770c78ea7947b54c88973f443de,
+    type: 3}
+  m_PrefabInstance: {fileID: 2334032909809982384}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3383212480875292976
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -407,6 +496,10 @@ PrefabInstance:
        type: 3}
      insertIndex: -1
      addedObject: {fileID: 316498802039693993}
+    - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f663772381973ad4bb4ee78cb7208483,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3151981558073726855}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f663772381973ad4bb4ee78cb7208483,
        type: 3}
--- a/RunningLateGame/Assets/Prefabs/path.prefab
+++ b/RunningLateGame/Assets/Prefabs/path.prefab
@ -88,6 +88,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: path
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ea92894d4bf7cdb418cf49006dfb42eb,
+        type: 3}
+      propertyPath: m_Layer
+      value: 9
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/RunningLateGame/Assets/Prefabs/path_to_vending_machine.prefab
+++ b/RunningLateGame/Assets/Prefabs/path_to_vending_machine.prefab
@ -9,7 +9,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 6227421465153096854}
-  m_Layer: 0
+  m_Layer: 9
  m_Name: path_to_vending_machine
  m_TagString: Untagged
  m_Icon: {fileID: 0}
--- a/RunningLateGame/Assets/Prefabs/vending_machine.prefab
+++ b/RunningLateGame/Assets/Prefabs/vending_machine.prefab
@ -177,6 +177,8 @@ GameObject:
  - component: {fileID: 275997392809632536}
  - component: {fileID: 5230493620313765622}
  - component: {fileID: 1809865208115710985}
+  - component: {fileID: 5310480670608927571}
+  - component: {fileID: 7507030316772322686}
  m_Layer: 0
  m_Name: machine
  m_TagString: Untagged
@ -250,6 +252,42 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &5310480670608927571
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7694395376745169482}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1.7977695, y: 2.770942, z: 1.0836983}
+  m_Center: {x: 0, y: -0.06621176, z: 0}
+--- !u!114 &7507030316772322686
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7694395376745169482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a62fca1ecd183554aa5287e1f5a4e75b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  interactionPrompt: Press [e] to get coffee
+  coffee: {fileID: 0}
+  stock: 0
 --- !u!1 &7788865092637683210
 GameObject:
  m_ObjectHideFlags: 0
--- a/RunningLateGame/Assets/Prefabs/vending_machine_sparks.prefab
+++ b/RunningLateGame/Assets/Prefabs/vending_machine_sparks.prefab
@ -14,7 +14,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
  m_IsActive: 1
 --- !u!4 &418930537151431345
 Transform:
@ -33,6 +33,91 @@ Transform:
  - {fileID: 6391465596979396704}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7182041164979177841
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4092757969255272651}
+  - component: {fileID: 8352758592151547938}
+  m_Layer: 0
+  m_Name: Square
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4092757969255272651
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7182041164979177841}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.601, z: -0.463}
+  m_LocalScale: {x: 1.5598, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6391465596979396704}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &8352758592151547938
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7182041164979177841}
+  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: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6,
+    type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1001 &3874289107487947999
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -51,6 +136,17 @@ PrefabInstance:
      propertyPath: m_StaticEditorFlags
      value: 2147483647
      objectReference: {fileID: 0}
+    - target: {fileID: 7507030316772322686, guid: 699551d9af9a03f43ae97592f34d6c94,
+        type: 3}
+      propertyPath: coffee
+      value: 
+      objectReference: {fileID: 5391765043731144851, guid: bd2e111dcce2c7f46b5d702cf4fd4025,
+        type: 3}
+    - target: {fileID: 7694395376745169482, guid: 699551d9af9a03f43ae97592f34d6c94,
+        type: 3}
+      propertyPath: m_TagString
+      value: Interactable
+      objectReference: {fileID: 0}
    - target: {fileID: 7694395376745169482, guid: 699551d9af9a03f43ae97592f34d6c94,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -118,7 +214,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7887827639382949055, guid: 699551d9af9a03f43ae97592f34d6c94,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4092757969255272651}
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 699551d9af9a03f43ae97592f34d6c94, type: 3}
 --- !u!4 &6391465596979396704 stripped
@ -153,7 +253,7 @@ PrefabInstance:
    - target: {fileID: 5968714379923844418, guid: 6b9993fe6da6ed04bb0211cc0d120143,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 9.166016
+      value: 9.408
      objectReference: {fileID: 0}
    - target: {fileID: 5968714379923844418, guid: 6b9993fe6da6ed04bb0211cc0d120143,
        type: 3}
@ -163,7 +263,7 @@ PrefabInstance:
    - target: {fileID: 5968714379923844418, guid: 6b9993fe6da6ed04bb0211cc0d120143,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: -0.7831726
+      value: 0.618
      objectReference: {fileID: 0}
    - target: {fileID: 5968714379923844418, guid: 6b9993fe6da6ed04bb0211cc0d120143,
        type: 3}
@ -205,6 +305,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: sparks Variant
      objectReference: {fileID: 0}
+    - target: {fileID: 7860120606087873040, guid: 6b9993fe6da6ed04bb0211cc0d120143,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 2147483647
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/RunningLateGame/Assets/Scenes/Playgrounds/FInalScene.unity
+++ b/RunningLateGame/Assets/Scenes/Playgrounds/FInalScene.unity
@ -58512,8 +58512,39 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 2873307280559283155, guid: 4727a0261e638a347b36b0a4c15200bd,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 166574240}
  m_SourcePrefab: {fileID: 100100000, guid: 4727a0261e638a347b36b0a4c15200bd, type: 3}
+--- !u!1 &166574239 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2873307280559283155, guid: 4727a0261e638a347b36b0a4c15200bd,
+    type: 3}
+  m_PrefabInstance: {fileID: 166574238}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &166574240
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 166574239}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.10559394, y: 0.051575586, z: 0.014231677}
+  m_Center: {x: -0.020941367, y: 0.025665773, z: 0}
 --- !u!1001 &167665746
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -503683,6 +503714,69 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 13b07d9031867ac47abc60c295aeda4f, type: 3}
+--- !u!1 &1590959433
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1590959435}
+  - component: {fileID: 1590959434}
+  m_Layer: 0
+  m_Name: navMesh
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1590959434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1590959433}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AgentTypeID: 0
+  m_CollectObjects: 0
+  m_Size: {x: 10, y: 10, z: 10}
+  m_Center: {x: 0, y: 2, z: 0}
+  m_LayerMask:
+    serializedVersion: 2
+    m_Bits: 512
+  m_UseGeometry: 0
+  m_DefaultArea: 0
+  m_GenerateLinks: 0
+  m_IgnoreNavMeshAgent: 1
+  m_IgnoreNavMeshObstacle: 1
+  m_OverrideTileSize: 0
+  m_TileSize: 256
+  m_OverrideVoxelSize: 0
+  m_VoxelSize: 0.16666667
+  m_MinRegionArea: 2
+  m_NavMeshData: {fileID: 23800000, guid: af262a98ec817454eb196718f44043c8, type: 2}
+  m_BuildHeightMesh: 0
+--- !u!4 &1590959435
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1590959433}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 339.90637, y: 0.009164574, z: 409.60916}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1592962527
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -613475,6 +613569,7 @@ MonoBehaviour:
  guiInteractionPromptObject: {fileID: 1226619922}
  guiHudObject: {fileID: 618797798}
  guiCompletedMenuObject: {fileID: 395649654}
+  hadCoffee: 0
 --- !u!4 &1766444915
 Transform:
  m_ObjectHideFlags: 0
@ -735974,51 +736069,11 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 1913593731473553990, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 9.408
-      objectReference: {fileID: 0}
-    - target: {fileID: 1913593731473553990, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.618
-      objectReference: {fileID: 0}
-    - target: {fileID: 2688529461558498580, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 3112717809132740484, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
    - target: {fileID: 4027162384237968457, guid: d3f382324a5d1d548835e558d7b03653,
        type: 3}
      propertyPath: m_Name
      value: vending_machine_sparks
      objectReference: {fileID: 0}
-    - target: {fileID: 4027162384237968457, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 6472700580176335573, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 6846534380038798997, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
-    - target: {fileID: 7558213368531607904, guid: d3f382324a5d1d548835e558d7b03653,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 2147483647
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -752501,3 +752556,4 @@ SceneRoots:
  - {fileID: 1610048390}
  - {fileID: 573926609}
  - {fileID: 464771995}
+  - {fileID: 1590959435}
--- a/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh.asset
+++ b/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh.asset
--- a/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh.asset.meta
+++ b/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: af262a98ec817454eb196718f44043c8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RunningLateGame/Assets/Scenes/Playgrounds/VendingMachinePlayground.unity
+++ b/RunningLateGame/Assets/Scenes/Playgrounds/VendingMachinePlayground.unity
@ -0,0 +1,316 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &1574903494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1574903496}
+  - component: {fileID: 1574903495}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1574903495
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1574903494}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &1574903496
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1574903494}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1675560304
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1675560307}
+  - component: {fileID: 1675560306}
+  - component: {fileID: 1675560305}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1675560305
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1675560304}
+  m_Enabled: 1
+--- !u!20 &1675560306
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1675560304}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1675560307
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1675560304}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1675560307}
+  - {fileID: 1574903496}
--- a/RunningLateGame/Assets/Scenes/Playgrounds/VendingMachinePlayground.unity.meta
+++ b/RunningLateGame/Assets/Scenes/Playgrounds/VendingMachinePlayground.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bb465dc20b3dbbc4e9a6bdacc264e923
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RunningLateGame/Assets/Scripts/GameManager.cs
+++ b/RunningLateGame/Assets/Scripts/GameManager.cs
@ -85,6 +85,11 @@ public enum DisplayState
    /// </summary>
    public bool Paused => _state != DisplayState.Game;
    
+    /// <summary>
+    ///    a property to check how many coffees the player has had
+    /// </summary>
+    public int hadCoffee = 0;
+    
    /// <summary>
    ///     function to set doesn't destroy on load and checks for multiple instances
    /// </summary>
--- a/RunningLateGame/Assets/Scripts/VendingMachine.cs
+++ b/RunningLateGame/Assets/Scripts/VendingMachine.cs
@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+using Random = System.Random;
+
+
+public class VendingMachine : CommonInteractable
+{
+    /// <summary>
+    ///     prefab to spawn when the player interacts with the vending machine
+    /// </summary>
+    public GameObject coffee;
+    /// <summary>
+    /// the amount of stock the vending machine has
+    /// </summary>
+    private int _stock;
+    private GameObject _instance;
+    public void Start()
+    {
+        var rand = new Random();
+        _stock = rand.Next(1, 3);
+    }
+
+    /// <summary>
+    ///     to spawn the coffee prefab if there is stock
+    /// </summary>
+    public override void Interact()
+    {
+        if (_stock > 0)
+        {
+            _instance = Instantiate(coffee, transform.position, Quaternion.identity);
+            _instance.GetComponent<Rigidbody>().AddForce(Vector3.up * 5, ForceMode.Impulse);
+            _instance.GetComponent<Rigidbody>().AddForce(Vector3.forward * 5, ForceMode.Impulse);
+            _stock--;
+        }
+    }
+}
--- a/RunningLateGame/Assets/Scripts/VendingMachine.cs.meta
+++ b/RunningLateGame/Assets/Scripts/VendingMachine.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a62fca1ecd183554aa5287e1f5a4e75b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RunningLateGame/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/RunningLateGame/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@ -91,11 +91,6 @@
                "key": "editor.selectMode",
                "value": "{\"m_Value\":1}"
            },
-            {
-                "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
-                "key": "editor.lastMeshSelectMode",
-                "value": "{\"m_Value\":2}"
-            },
            {
                "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "editor.rectSelectModifier",
Author	SHA1	Message	Date
Sc0rch-thinks	12e433e0a6	game: adding Vending Machine	2024-08-15 17:06:00 +08:00
Sc0rch-thinks	4f2a1290cb	game: applying layer changes to prefabs changed to AIWalkable layer to allow the ai to nav mesh over # Conflicts: # RunningLateGame/Assets/Scenes/Playgrounds/RyanAIPlaygroundA/playgroundTestingGround.asset	2024-08-15 17:05:54 +08:00