Browse Source

wayfinding path 1 & 2

main
technoflesh 10 months ago
parent
commit
89e61b772a
  1. 200
      Assets/12_Timelines/Camera Timeline.playable
  2. 66
      Assets/15_Prefabs/Waypoints.prefab
  3. 587
      Assets/6_Scenes/Beep.unity
  4. 6
      Assets/7_Scripts/Camera/CameraManager.cs
  5. 2
      Assets/ML-Agents/Timers/Beep_timers.json
  6. 4
      Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset

200
Assets/12_Timelines/Camera Timeline.playable

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-9140813322855821548
--- !u!114 &-8170392412976514431
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
DisplayName:
VirtualCamera:
exposedName: a810efa488b4844ecafd7d6735782fe4
exposedName: b1c9e7418af314f5a84d33a6396c3984
defaultValue: {fileID: 0}
--- !u!114 &-5235963257230267934
MonoBehaviour:
@ -48,6 +48,38 @@ MonoBehaviour:
VirtualCamera:
exposedName: b4a2116d95b7b4996956fd852b0ba2fd
defaultValue: {fileID: 0}
--- !u!114 &-2375411391504665447
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
m_Name: CinemachineShot
m_EditorClassIdentifier:
DisplayName:
VirtualCamera:
exposedName: af4387d8b67df4c7daa86c4c5a5cf87a
defaultValue: {fileID: 0}
--- !u!114 &-214592752882199666
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
m_Name: CinemachineShot
m_EditorClassIdentifier:
DisplayName:
VirtualCamera:
exposedName: b8978a6747a8c499d8488aa3d3cec05e
defaultValue: {fileID: 0}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -63,13 +95,14 @@ MonoBehaviour:
m_Version: 0
m_Tracks:
- {fileID: 3937275411153492513}
- {fileID: 944305115292821419}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &3937275411153492513
--- !u!114 &944305115292821419
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@ -79,12 +112,12 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05acc715f855ced458d76ee6f8ac6c61, type: 3}
m_Name: Cinemachine Track
m_Name: Cinemachine Track (1)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 1
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
@ -93,14 +126,14 @@ MonoBehaviour:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -3373655309145298414}
m_Duration: 4.033333333333333
m_Asset: {fileID: -8170392412976514431}
m_Duration: 5
m_TimeScale: 1
m_ParentTrack: {fileID: 3937275411153492513}
m_ParentTrack: {fileID: 944305115292821419}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: 2.083333333333333
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
@ -127,7 +160,25 @@ MonoBehaviour:
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -140,17 +191,17 @@ MonoBehaviour:
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Camera Street Sign
m_DisplayName: LivingRoom
- m_Version: 1
m_Start: 1.95
m_Start: 5
m_ClipIn: 0
m_Asset: {fileID: -5235963257230267934}
m_Duration: 10.200000000000001
m_Asset: {fileID: -214592752882199666}
m_Duration: 5
m_TimeScale: 1
m_ParentTrack: {fileID: 3937275411153492513}
m_ParentTrack: {fileID: 944305115292821419}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 2.083333333333333
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
@ -191,14 +242,14 @@ MonoBehaviour:
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Camera Chair Follow
m_DisplayName: Kitchen
- m_Version: 1
m_Start: 12.15
m_Start: 10
m_ClipIn: 0
m_Asset: {fileID: -9140813322855821548}
m_Asset: {fileID: -2375411391504665447}
m_Duration: 5
m_TimeScale: 1
m_ParentTrack: {fileID: 3937275411153492513}
m_ParentTrack: {fileID: 944305115292821419}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
@ -260,6 +311,113 @@ MonoBehaviour:
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Porch Right
m_DisplayName: Porch
m_Markers:
m_Objects: []
--- !u!114 &3937275411153492513
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05acc715f855ced458d76ee6f8ac6c61, type: 3}
m_Name: Cinemachine Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 1
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -3373655309145298414}
m_Duration: 15.15
m_TimeScale: 1
m_ParentTrack: {fileID: 3937275411153492513}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: 1.916666666666666
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Camera Street Sign
- m_Version: 1
m_Start: 13.233333333333334
m_ClipIn: 0
m_Asset: {fileID: -5235963257230267934}
m_Duration: 10.200000000000001
m_TimeScale: 1
m_ParentTrack: {fileID: 3937275411153492513}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 1.916666666666666
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Camera 3rd P
m_Markers:
m_Objects: []

66
Assets/15_Prefabs/Waypoints.prefab

@ -26,12 +26,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209990532492095435}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.4, y: -32.8, z: 82.33}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.399994, y: -32.8, z: 82.32999}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8202717142006031211}
m_Father: {fileID: 7384693885281921768}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2913576066548479887
MonoBehaviour:
@ -97,12 +97,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2362562022282731342}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -13.6, y: -32.7, z: 77.1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -13.600006, y: -32.7, z: 77.100006}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8202717142006031211}
m_Father: {fileID: 7384693885281921768}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &49413528898332131
MonoBehaviour:
@ -142,6 +142,41 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2932492667792407800
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7384693885281921768}
m_Layer: 0
m_Name: Path
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7384693885281921768
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2932492667792407800}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6868380804102066130}
- {fileID: 3984493130856861062}
- {fileID: 322217618113553874}
- {fileID: 1594025285695098325}
m_Father: {fileID: 8202717142006031211}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4823915812732403376
GameObject:
m_ObjectHideFlags: 0
@ -172,10 +207,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6868380804102066130}
- {fileID: 3984493130856861062}
- {fileID: 322217618113553874}
- {fileID: 1594025285695098325}
- {fileID: 7384693885281921768}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3428618077651019461
@ -192,8 +224,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_WaypointList:
- {fileID: 2913576066548479887}
- {fileID: 2663865915400535980}
- {fileID: 49413528898332131}
- {fileID: 2663865915400535980}
- {fileID: 2682402785939406760}
m_Target: {fileID: 0}
m_CurrentWaypoint: {fileID: 2913576066548479887}
@ -223,12 +255,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5987063858495885095}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -13.6, y: -32.7, z: 94.3}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -13.600006, y: -32.7, z: 94.30002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8202717142006031211}
m_Father: {fileID: 7384693885281921768}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2682402785939406760
MonoBehaviour:
@ -294,12 +326,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6158526685412160350}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 9.9, y: -29.94, z: 82.33}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 9.899994, y: -29.94, z: 82.32999}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8202717142006031211}
m_Father: {fileID: 7384693885281921768}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2663865915400535980
MonoBehaviour:

587
Assets/6_Scenes/Beep.unity

File diff suppressed because it is too large

6
Assets/7_Scripts/Camera/CameraManager.cs

@ -62,13 +62,13 @@ public class CameraManager : MonoBehaviour
string tag = cam.tag;
Camera mainCamera = m_CMBrain.OutputCamera;
if (tag.Contains("surviellance"))
if (tag.Contains("surveillance"))
{
mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig");
mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig", "Walls");
}
else
{
mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig");
mainCamera.cullingMask = LayerMask.GetMask("Default", "TransparentFX", "Ignore Raycast", "Water", "UI", "Rig","Walls");
}
}

2
Assets/ML-Agents/Timers/Beep_timers.json

@ -1 +1 @@
{"count":1,"self":6.6528756,"total":7.7418388,"children":{"InitializeActuators":{"count":1,"self":0.0005034,"total":0.0005034,"children":null},"InitializeSensors":{"count":1,"self":0.0015072999999999998,"total":0.0015072999999999998,"children":null},"AgentSendState":{"count":94,"self":0.0035085999999999997,"total":0.024592,"children":{"CollectObservations":{"count":19,"self":0.0020052,"total":0.0020052,"children":null},"WriteActionMask":{"count":19,"self":0,"total":0,"children":null},"RequestDecision":{"count":19,"self":0.0190782,"total":0.0190782,"children":null}}},"DecideAction":{"count":94,"self":0.0960755,"total":1.0588469999999999,"children":{"RayPerceptionSensor.Perceive":{"count":19,"self":0.9627715,"total":0.9627715,"children":null}}},"AgentAct":{"count":94,"self":0.0035134999999999997,"total":0.0035134999999999997,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710177958","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_02-Beep\\4_Unity\\Beep Final Git\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1710177966"}}
{"count":1,"self":44.284236799999995,"total":45.142047,"children":{"InitializeActuators":{"count":1,"self":0.0038079999999999998,"total":0.0038079999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.007768,"total":0.007768,"children":null},"AgentSendState":{"count":1142,"self":0.029079999999999998,"total":0.292634,"children":{"CollectObservations":{"count":229,"self":0.013764,"total":0.013764,"children":null},"WriteActionMask":{"count":229,"self":0.00108,"total":0.00108,"children":null},"RequestDecision":{"count":229,"self":0.24871,"total":0.24871,"children":null}}},"DecideAction":{"count":1142,"self":0.518506,"total":0.525597,"children":{"RayPerceptionSensor.Perceive":{"count":229,"self":0.007091,"total":0.007091,"children":null}}},"AgentAct":{"count":1142,"self":0.024687,"total":0.024687,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710191717","unity_version":"2023.2.8f1","command_line_arguments":"\/Applications\/Unity\/Hub\/Editor\/2023.2.8f1\/Unity.app\/Contents\/MacOS\/Unity -projectpath \/Users\/scn\/Documents\/BB_Beauty & The Beep\/12 Unity\/git\/beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1710191762"}}

4
Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset

@ -1249,7 +1249,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aaa3b8214f75b354e9ba2caadd022259, type: 3}
m_Name: DepthOfField
m_EditorClassIdentifier:
active: 1
active: 0
quality:
m_OverrideState: 1
m_Value: 3
@ -1258,7 +1258,7 @@ MonoBehaviour:
m_Value: 1
focusDistance:
m_OverrideState: 1
m_Value: 3.5
m_Value: 0.46
focusDistanceMode:
m_OverrideState: 1
m_Value: 0

Loading…
Cancel
Save