Browse Source

fixed treadmill model

main
cailean 10 months ago
parent
commit
6eb3e4a5c9
  1. 10
      Assets/15_Prefabs/Environment.prefab
  2. 146
      Assets/1_House/Sections/Treadmill/House Content_treadmill_L_BB_SpotMini-House_2023.blend_Dupli_68.prefab
  3. BIN
      Assets/2_Chair/Brains/Treadmill.onnx
  4. 2
      Assets/2_Chair/Brains/Treadmill.onnx.meta
  5. 8
      Assets/2_Chair/Chair.prefab
  6. 78
      Assets/6_Scenes/Beep.unity
  7. 6
      Assets/7_Scripts/Agent/Walker.cs
  8. 24
      Assets/7_Scripts/Interactable Items/OnChairContact.cs
  9. 27
      Assets/7_Scripts/Interactable Items/Treadmill.cs
  10. 6
      Assets/7_Scripts/Model Swapping/ModelSwap.cs
  11. 2
      Assets/ML-Agents/Timers/Beep_timers.json

10
Assets/15_Prefabs/Environment.prefab

@ -14440,11 +14440,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5083844281805799389, guid: 4a514862db9328d4895ba96423f9bb05,
type: 3}
propertyPath: m_MaxForce
value: 500
objectReference: {fileID: 0}
- target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05, - target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05,
type: 3} type: 3}
propertyPath: m_Enabled propertyPath: m_Enabled
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05,
type: 3}
propertyPath: m_IsTreadmill
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05, - target: {fileID: 5718558317385307557, guid: 4a514862db9328d4895ba96423f9bb05,
type: 3} type: 3}
propertyPath: m_TriggerExitEvent.m_PersistentCalls.m_Calls.Array.size propertyPath: m_TriggerExitEvent.m_PersistentCalls.m_Calls.Array.size

146
Assets/1_House/Sections/Treadmill/House Content_treadmill_L_BB_SpotMini-House_2023.blend_Dupli_68.prefab

@ -96,9 +96,10 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 7401305460966391411} - component: {fileID: 7401305460966391411}
- component: {fileID: 5083844281805799389}
- component: {fileID: 6246528774570780744} - component: {fileID: 6246528774570780744}
- component: {fileID: 32909509765195546}
- component: {fileID: 5718558317385307557} - component: {fileID: 5718558317385307557}
- component: {fileID: 5083844281805799389}
m_Layer: 0 m_Layer: 0
m_Name: Interaction m_Name: Interaction
m_TagString: sit m_TagString: sit
@ -121,6 +122,19 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 3898356617764981764} m_Father: {fileID: 3898356617764981764}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5083844281805799389
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3262986499638993280}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: be3a6d75d30448c428c5f28690b0f96f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MaxForce: 35
--- !u!65 &6246528774570780744 --- !u!65 &6246528774570780744
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -140,8 +154,29 @@ BoxCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 403.17203, y: 346.4143, z: 193.87955} m_Size: {x: 439.9201, y: 16.808865, z: 219.54315}
m_Center: {x: 21.461163, y: 172.70715, z: -4.8683996} m_Center: {x: 3.0869339, y: 7.904432, z: 0.15875985}
--- !u!65 &32909509765195546
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3262986499638993280}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 95.448425, y: 50.559505, z: 179.47894}
m_Center: {x: 188.78886, y: 4.245232, z: -0.9039049}
--- !u!114 &5718558317385307557 --- !u!114 &5718558317385307557
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -165,52 +200,15 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TriggerStayEvent: m_TriggerStayEvent:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls: []
- m_Target: {fileID: 5083844281805799389}
m_TargetAssemblyTypeName: Treadmill, Assembly-CSharp
m_MethodName: ApplyForce
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TriggerExitEvent: m_TriggerExitEvent:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls: []
- m_Target: {fileID: 5083844281805799389}
m_TargetAssemblyTypeName: Treadmill, Assembly-CSharp
m_MethodName: RemoveForce
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_IsTouching: 0 m_IsTouching: 0
m_IsAttached: 0 m_IsAttached: 0
m_IsTreadmill: 0
m_TrayTimeout: 0 m_TrayTimeout: 0
m_FixedJoint: {fileID: 0} m_FixedJoint: {fileID: 0}
--- !u!114 &5083844281805799389
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3262986499638993280}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: be3a6d75d30448c428c5f28690b0f96f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Body: {fileID: 0}
m_MaxForce: 12
--- !u!1 &8062850307700081267 --- !u!1 &8062850307700081267
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -225,6 +223,8 @@ GameObject:
- component: {fileID: 1275989852953058885} - component: {fileID: 1275989852953058885}
- component: {fileID: 1408815079355237641} - component: {fileID: 1408815079355237641}
- component: {fileID: 1019308114478125073} - component: {fileID: 1019308114478125073}
- component: {fileID: 7047882291690261076}
- component: {fileID: 4003149887149446398}
m_Layer: 0 m_Layer: 0
m_Name: Colliders m_Name: Colliders
m_TagString: sit m_TagString: sit
@ -254,7 +254,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267} m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2} m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@ -275,7 +275,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267} m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2} m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@ -296,7 +296,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267} m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2} m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@ -308,8 +308,8 @@ BoxCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 171.31107, y: 350.18542, z: 32.127926} m_Size: {x: 95.95513, y: 350.18542, z: 26.714388}
m_Center: {x: 146.39415, y: 133.48936, z: -106.53622} m_Center: {x: 184.07196, y: 133.48938, z: -103.830154}
--- !u!65 &1408815079355237641 --- !u!65 &1408815079355237641
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -317,7 +317,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267} m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, type: 2} m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@ -329,8 +329,8 @@ BoxCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 171.31094, y: 350.18542, z: 35.10105} m_Size: {x: 89.33374, y: 350.18542, z: 28.781935}
m_Center: {x: 146.3942, y: 133.48936, z: 106.963936} m_Center: {x: 187.38281, y: 133.48933, z: 103.80435}
--- !u!65 &1019308114478125073 --- !u!65 &1019308114478125073
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -338,7 +338,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267} m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 0} m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@ -352,3 +352,45 @@ BoxCollider:
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 113.87991, y: 25.64018, z: 183.41603} m_Size: {x: 113.87991, y: 25.64018, z: 183.41603}
m_Center: {x: 173.79678, y: 12.320123, z: 1.9299209} m_Center: {x: 173.79678, y: 12.320123, z: 1.9299209}
--- !u!65 &7047882291690261076
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
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: 80.920944, y: 21.401955, z: 29.895716}
m_Center: {x: 98.46158, y: 201.29842, z: 99.31821}
--- !u!65 &4003149887149446398
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062850307700081267}
m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2}
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: 80.920944, y: 21.401955, z: 27.52251}
m_Center: {x: 98.46142, y: 201.29825, z: -109.103134}

BIN
Assets/2_Chair/Brains/Treadmill.onnx

Binary file not shown.

2
Assets/2_Chair/Brains/Treadmill.onnx.meta

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c0fc639fa2c88ef45b118b7de91428b0 guid: b9c79f9e7b4a9794b8f05f8467777884
ScriptedImporter: ScriptedImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

8
Assets/2_Chair/Chair.prefab

@ -2037,7 +2037,7 @@ MonoBehaviour:
VectorActionDescriptions: [] VectorActionDescriptions: []
VectorActionSpaceType: 1 VectorActionSpaceType: 1
hasUpgradedBrainParametersWithActionSpec: 1 hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 5022602860645237092, guid: c0fc639fa2c88ef45b118b7de91428b0, type: 3} m_Model: {fileID: 5022602860645237092, guid: b9c79f9e7b4a9794b8f05f8467777884, type: 3}
m_InferenceDevice: 1 m_InferenceDevice: 1
m_BehaviorType: 2 m_BehaviorType: 2
m_BehaviorName: c_Walker m_BehaviorName: c_Walker
@ -2063,7 +2063,7 @@ MonoBehaviour:
hasUpgradedFromAgentParameters: 1 hasUpgradedFromAgentParameters: 1
MaxStep: 0 MaxStep: 0
m_SelectedBrain: 6 m_SelectedBrain: 6
m_TargetWalkingSpeed: 10 m_TargetWalkingSpeed: 30
rWalkSpeedEachEpisode: 0 rWalkSpeedEachEpisode: 0
m_RandomiseYRotation: 0 m_RandomiseYRotation: 0
m_RandomiseXYZRotation: 0 m_RandomiseXYZRotation: 0
@ -2131,7 +2131,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4d4f1f9b90b1b3949a25ccabbf8429d4, type: 3} m_Script: {fileID: 11500000, guid: 4d4f1f9b90b1b3949a25ccabbf8429d4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_InitialModel: {fileID: 5022602860645237092, guid: c0fc639fa2c88ef45b118b7de91428b0, m_InitialModel: {fileID: 5022602860645237092, guid: b9c79f9e7b4a9794b8f05f8467777884,
type: 3} type: 3}
nnModelList: nnModelList:
- {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} - {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3}
@ -2139,7 +2139,7 @@ MonoBehaviour:
- {fileID: 5022602860645237092, guid: 4e2e22c8058641f4f943af2d50b147f6, type: 3} - {fileID: 5022602860645237092, guid: 4e2e22c8058641f4f943af2d50b147f6, type: 3}
- {fileID: 5022602860645237092, guid: 4564a8c073c3e134b96ce1698dbae60b, type: 3} - {fileID: 5022602860645237092, guid: 4564a8c073c3e134b96ce1698dbae60b, type: 3}
- {fileID: 5022602860645237092, guid: 873bd5685b6fba74da8024c42ff3f0e6, type: 3} - {fileID: 5022602860645237092, guid: 873bd5685b6fba74da8024c42ff3f0e6, type: 3}
- {fileID: 5022602860645237092, guid: c0fc639fa2c88ef45b118b7de91428b0, type: 3} - {fileID: 5022602860645237092, guid: b9c79f9e7b4a9794b8f05f8467777884, type: 3}
agent: {fileID: 0} agent: {fileID: 0}
currentModel: 0 currentModel: 0
m_currentModelName: m_currentModelName:

78
Assets/6_Scenes/Beep.unity

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 18710.33, g: 22253.816, b: 24966.049, a: 1} m_IndirectSpecularColor: {r: 18716.479, g: 22260.361, b: 24973.613, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -234,7 +234,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83569712} m_GameObject: {fileID: 83569712}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.12887381, y: -0.16223218, z: 0.021376316, w: -0.97806716} m_LocalRotation: {x: 0.053030312, y: 0.8419763, z: -0.084204845, w: 0.53025776}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -320,7 +320,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155411616} m_GameObject: {fileID: 155411616}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.18701419, y: -0.16066729, z: 0.031020064, w: -0.96863276} m_LocalRotation: {x: 0.08458105, y: 0.8354503, z: -0.13430305, w: 0.52614784}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -737,7 +737,7 @@ MonoBehaviour:
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 1 GateFit: 1
FocusDistance: 8.93528 FocusDistance: 8.93528
m_SensorSize: {x: 1, y: 1} m_SensorSize: {x: 36, y: 24}
Iso: 50 Iso: 50
ShutterSpeed: 0.0005 ShutterSpeed: 0.0005
Aperture: 2.2 Aperture: 2.2
@ -818,7 +818,7 @@ MonoBehaviour:
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 1 GateFit: 1
FocusDistance: 0.01 FocusDistance: 0.01
m_SensorSize: {x: 1, y: 1} m_SensorSize: {x: 36, y: 24}
Iso: 50 Iso: 50
ShutterSpeed: 0.0005 ShutterSpeed: 0.0005
Aperture: 1.9 Aperture: 1.9
@ -897,17 +897,17 @@ PrefabInstance:
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -247.36 value: -270.36
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 5.290001 value: 6.4300003
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 518.45996 value: 556.31
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3} type: 3}
@ -1212,8 +1212,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 470663197} m_GameObject: {fileID: 470663197}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.026556954, y: 0.96534586, z: -0.108746834, w: -0.23574618} m_LocalRotation: {x: 0.14886537, y: -0.40094745, z: 0.06620899, w: 0.9014969}
m_LocalPosition: {x: 0.48660278, y: -2.2873554, z: 9.670776} m_LocalPosition: {x: -8.840607, y: -2.2873554, z: 38.56598}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -1334,7 +1334,7 @@ MonoBehaviour:
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 1 GateFit: 1
FocusDistance: 8.93528 FocusDistance: 8.93528
m_SensorSize: {x: 1, y: 1} m_SensorSize: {x: 36, y: 24}
Iso: 50 Iso: 50
ShutterSpeed: 0.0005 ShutterSpeed: 0.0005
Aperture: 2.2 Aperture: 2.2
@ -1377,8 +1377,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 513050371} m_GameObject: {fileID: 513050371}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.05851609, y: -0.8556421, z: 0.09922766, w: 0.50458544} m_LocalRotation: {x: 0.11435656, y: -0.52070224, z: 0.07062782, w: 0.84309155}
m_LocalPosition: {x: 2.8532867, y: -2.2773552, z: 7.921936} m_LocalPosition: {x: -8.582123, y: -2.2773552, z: 38.099243}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -1415,7 +1415,7 @@ MonoBehaviour:
LensShift: {x: -0.21, y: 0.15} LensShift: {x: -0.21, y: 0.15}
GateFit: 1 GateFit: 1
FocusDistance: 10 FocusDistance: 10
m_SensorSize: {x: 1, y: 1} m_SensorSize: {x: 36, y: 24}
Iso: 50 Iso: 50
ShutterSpeed: 0.0005 ShutterSpeed: 0.0005
Aperture: 2.2 Aperture: 2.2
@ -1565,7 +1565,7 @@ MonoBehaviour:
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 1 GateFit: 1
FocusDistance: 8.93528 FocusDistance: 8.93528
m_SensorSize: {x: 1, y: 1} m_SensorSize: {x: 36, y: 24}
Iso: 50 Iso: 50
ShutterSpeed: 0.0005 ShutterSpeed: 0.0005
Aperture: 2.2 Aperture: 2.2
@ -2086,7 +2086,7 @@ Transform:
m_GameObject: {fileID: 1124157896} m_GameObject: {fileID: 1124157896}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696}
m_LocalPosition: {x: 0.48660278, y: -2.2873554, z: 9.670776} m_LocalPosition: {x: -8.840607, y: -2.2873554, z: 38.56598}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -2279,7 +2279,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1178814724} m_GameObject: {fileID: 1178814724}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.11191136, y: -0.02346997, z: 0.0026439019, w: -0.9934375} m_LocalRotation: {x: 0.09656285, y: 0.7946739, z: -0.13122557, w: 0.584764}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -2578,7 +2578,7 @@ PrefabInstance:
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -261.61 value: -271.58
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3} type: 3}
@ -2588,7 +2588,7 @@ PrefabInstance:
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 518.81 value: 560.06
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3} type: 3}
@ -2625,12 +2625,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3382247266651750635, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_Model
value:
objectReference: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522,
type: 3}
- target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9, - target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -2641,11 +2635,6 @@ PrefabInstance:
propertyPath: target propertyPath: target
value: value:
objectReference: {fileID: 387060610} objectReference: {fileID: 387060610}
- target: {fileID: 6191786620621186661, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_SelectedBrain
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
@ -3694,7 +3683,17 @@ PrefabInstance:
- target: {fileID: 1082572882027964806, guid: 796c0c7bfd2e89547bd866eedcc6d386, - target: {fileID: 1082572882027964806, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0}
- target: {fileID: 1170441306195283109, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.x
value: -37.46
objectReference: {fileID: 0}
- target: {fileID: 1170441306195283109, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.z
value: 132.85
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386, - target: {fileID: 3428618077651019461, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3} type: 3}
@ -3704,7 +3703,7 @@ PrefabInstance:
- target: {fileID: 3582199055929070180, guid: 796c0c7bfd2e89547bd866eedcc6d386, - target: {fileID: 3582199055929070180, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4218554392451596953, guid: 796c0c7bfd2e89547bd866eedcc6d386, - target: {fileID: 4218554392451596953, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3} type: 3}
@ -3854,6 +3853,21 @@ PrefabInstance:
propertyPath: m_Body propertyPath: m_Body
value: value:
objectReference: {fileID: 1412792149} objectReference: {fileID: 1412792149}
- target: {fileID: 3567326802448521334, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3}
propertyPath: m_MaxForce
value: 300
objectReference: {fileID: 0}
- target: {fileID: 4057927836602249742, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3}
propertyPath: m_TriggerExitEvent.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4057927836602249742, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3}
propertyPath: m_TriggerStayEvent.m_PersistentCalls.m_Calls.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5958365873195825879, guid: 14d8283abcefffd4a916b8611ccd49fa, - target: {fileID: 5958365873195825879, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3} type: 3}
propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target

6
Assets/7_Scripts/Agent/Walker.cs

@ -31,9 +31,9 @@ public class Walker : Agent
public Brain m_SelectedBrain; public Brain m_SelectedBrain;
[Header("Walk Speed")] [Header("Walk Speed")]
[Range(0.1f, 10)] [Range(0.1f, 30)]
[SerializeField] [SerializeField]
private float m_TargetWalkingSpeed = 10; private float m_TargetWalkingSpeed = 30;
public float MTargetWalkingSpeed public float MTargetWalkingSpeed
{ {
@ -42,7 +42,7 @@ public class Walker : Agent
} }
// The Max Walking Speed // The Max Walking Speed
const float m_MaxWalkingSpeed = 10; const float m_MaxWalkingSpeed = 30;
[Header("Randomise")] [Header("Randomise")]
// Randomise Walking Speed every Episode // Randomise Walking Speed every Episode

24
Assets/7_Scripts/Interactable Items/OnChairContact.cs

@ -16,12 +16,21 @@ public class OnChairContact : MonoBehaviour
public bool m_IsTouching; public bool m_IsTouching;
public bool m_IsAttached; public bool m_IsAttached;
public bool m_IsTreadmill;
public float m_TrayTimeout; public float m_TrayTimeout;
private string m_Tag = "agent"; private string m_Tag = "agent";
[SerializeField] [SerializeField]
public FixedJoint m_FixedJoint; public FixedJoint m_FixedJoint;
public delegate void TreadmillEventApply(Rigidbody rb);
public static event TreadmillEventApply ApplyTreadmillForce;
public delegate void TreadmillEventRemove(Rigidbody rb);
public static event TreadmillEventRemove RemoveTreadmillForce;
void OnEnable() void OnEnable()
{ {
@ -57,6 +66,8 @@ public class OnChairContact : MonoBehaviour
m_IsTouching = true; m_IsTouching = true;
m_CollisionEvent?.Invoke(); m_CollisionEvent?.Invoke();
} }
} }
@ -75,6 +86,8 @@ public class OnChairContact : MonoBehaviour
{ {
m_IsTouching = false; m_IsTouching = false;
m_CollisionExitEvent?.Invoke(); m_CollisionExitEvent?.Invoke();
} }
} }
@ -84,7 +97,14 @@ public class OnChairContact : MonoBehaviour
{ {
m_IsTouching = true; m_IsTouching = true;
m_TriggerStayEvent?.Invoke(); m_TriggerStayEvent?.Invoke();
if (m_IsTreadmill)
{
ApplyTreadmillForce(other.GetComponent<Rigidbody>());
}
} }
} }
private void OnTriggerExit(Collider other) private void OnTriggerExit(Collider other)
@ -93,6 +113,10 @@ public class OnChairContact : MonoBehaviour
{ {
m_IsTouching = false; m_IsTouching = false;
m_TriggerExitEvent?.Invoke(); m_TriggerExitEvent?.Invoke();
if (m_IsTreadmill)
{
RemoveTreadmillForce(other.GetComponent<Rigidbody>());
}
} }
} }

27
Assets/7_Scripts/Interactable Items/Treadmill.cs

@ -6,33 +6,42 @@ using UnityEngine;
public class Treadmill : MonoBehaviour public class Treadmill : MonoBehaviour
{ {
public Rigidbody m_Body; //public Rigidbody m_Body;
private float m_Force;
public float m_MaxForce; public float m_MaxForce;
private float m_angleOffset; private float m_angleOffset;
private void OnEnable() private void OnEnable()
{ {
m_Force = 0f; OnChairContact.ApplyTreadmillForce += ApplyForce;
OnChairContact.RemoveTreadmillForce += RemoveForce;
m_angleOffset = 20f; m_angleOffset = 20f;
} }
public void ApplyForce() private void OnDisable()
{ {
m_Force += 0.1f; OnChairContact.ApplyTreadmillForce -= ApplyForce;
OnChairContact.RemoveTreadmillForce -= RemoveForce;
}
public void ApplyForce(Rigidbody rb)
{
//m_Force += 0.1f;
Vector3 forceDirection = Quaternion.Euler(0, -m_angleOffset, 0) * Vector3.forward; Vector3 forceDirection = Quaternion.Euler(0, -m_angleOffset, 0) * Vector3.forward;
m_Body.AddForce(forceDirection * m_Force); //Debug.Log($"Force added to {rb.name} {forceDirection * m_MaxForce}");
rb.AddForce(forceDirection * m_MaxForce);
//m_Body.AddForce(forceDirection * m_Force);
} }
public void RemoveForce() public void RemoveForce(Rigidbody rb)
{ {
m_Force = 0; rb.AddForce(new Vector3(0, 0, 0));
} }
private void FixedUpdate() private void FixedUpdate()
{ {
//Debug.Log($"Applying Force {m_Force}"); //Debug.Log($"Applying Force {m_Force}");
m_Force = (m_Force < 0f) ? 0 : (m_Force > m_MaxForce) ? m_MaxForce : m_Force; //m_Force = (m_Force < 0f) ? 0 : (m_Force > m_MaxForce) ? m_MaxForce : m_Force;
} }
private void OnDrawGizmosSelected() private void OnDrawGizmosSelected()

6
Assets/7_Scripts/Model Swapping/ModelSwap.cs

@ -51,31 +51,37 @@ public class ModelSwap : MonoBehaviour
if (modelName.Equals("Walker")) if (modelName.Equals("Walker"))
{ {
agent.MTargetWalkingSpeed = 8f;
agent.m_SelectedBrain = Walker.Brain.Walker; agent.m_SelectedBrain = Walker.Brain.Walker;
m_currentModelName = modelName; m_currentModelName = modelName;
} }
else if (modelName.Equals("Stairs")) else if (modelName.Equals("Stairs"))
{ {
agent.MTargetWalkingSpeed = 8f;
agent.m_SelectedBrain = Walker.Brain.DMScrambler; agent.m_SelectedBrain = Walker.Brain.DMScrambler;
m_currentModelName = modelName; m_currentModelName = modelName;
} }
else if (modelName.Equals("Climber")) else if (modelName.Equals("Climber"))
{ {
agent.MTargetWalkingSpeed = 8f;
agent.m_SelectedBrain = Walker.Brain.Climber; agent.m_SelectedBrain = Walker.Brain.Climber;
m_currentModelName = modelName; m_currentModelName = modelName;
} }
else if (modelName.Equals("Getup")) else if (modelName.Equals("Getup"))
{ {
agent.MTargetWalkingSpeed = 8f;
agent.m_SelectedBrain = Walker.Brain.Getup; agent.m_SelectedBrain = Walker.Brain.Getup;
m_currentModelName = modelName; m_currentModelName = modelName;
} }
else if (modelName.Equals("Sitting")) else if (modelName.Equals("Sitting"))
{ {
agent.MTargetWalkingSpeed = 8f;
agent.m_SelectedBrain = Walker.Brain.Sitting; agent.m_SelectedBrain = Walker.Brain.Sitting;
m_currentModelName = modelName; m_currentModelName = modelName;
} }
else if (modelName.Equals("Treadmill")) else if (modelName.Equals("Treadmill"))
{ {
agent.MTargetWalkingSpeed = 30f;
agent.m_SelectedBrain = Walker.Brain.Treadmill; agent.m_SelectedBrain = Walker.Brain.Treadmill;
m_currentModelName = modelName; m_currentModelName = modelName;
} }

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

@ -1 +1 @@
{"count":1,"self":44.774220799999995,"total":57.184964,"children":{"InitializeActuators":{"count":1,"self":0.004378,"total":0.004378,"children":null},"InitializeSensors":{"count":1,"self":0.008312,"total":0.008312,"children":null},"AgentSendState":{"count":2545,"self":0.043668,"total":0.12082999999999999,"children":{"CollectObservations":{"count":509,"self":0.024697,"total":0.024697,"children":null},"WriteActionMask":{"count":509,"self":0.0019779999999999997,"total":0.0019779999999999997,"children":null},"RequestDecision":{"count":509,"self":0.050487,"total":0.050487,"children":null}}},"DecideAction":{"count":2545,"self":1.1792179999999999,"total":12.229040999999999,"children":{"RayPerceptionSensor.Perceive":{"count":509,"self":11.049823199999999,"total":11.049823,"children":null}}},"AgentAct":{"count":2545,"self":0.045175,"total":0.045175,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710340601","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":"1710340658"}} {"count":1,"self":37.216780799999995,"total":37.7969684,"children":{"InitializeActuators":{"count":1,"self":0.0010042999999999999,"total":0.0010042999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0020039,"total":0.0020039,"children":null},"AgentSendState":{"count":1586,"self":0.026898699999999998,"total":0.055844899999999996,"children":{"CollectObservations":{"count":318,"self":0.010289399999999999,"total":0.010289399999999999,"children":null},"WriteActionMask":{"count":318,"self":0.0025111,"total":0.0025111,"children":null},"RequestDecision":{"count":318,"self":0.0161457,"total":0.0161457,"children":null}}},"DecideAction":{"count":1586,"self":0.3989319,"total":0.5114659,"children":{"RayPerceptionSensor.Perceive":{"count":318,"self":0.112534,"total":0.112534,"children":null}}},"AgentAct":{"count":1586,"self":0.0098687999999999988,"total":0.0098687999999999988,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1710350886","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":"1710350924"}}
Loading…
Cancel
Save