cailean
/
beep-final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

dont swap when in getup state

main
cailean 10 months ago
parent
0e7002ab22
commit
dc7ca89607
4 changed files with 67 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      Assets/1_House/Sections/Outside Chair/Outside Chair.prefab
  2. 37
      Assets/6_Scenes/Beep.unity
  3. 6
      Assets/7_Scripts/Model Swapping/ModelSwap.cs
  4. 2
      Assets/ML-Agents/Timers/Beep_timers.json

38
Assets/1_House/Sections/Outside Chair/Outside Chair.prefab
View File

@ -428,8 +428,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.50313073, y: 0.67063177, z: 0.4443395}
m_Center: {x: -0.0013079806, y: -0.042706788, z: -0.01625375}
m_Size: {x: 0.5031308, y: 0.865632, z: 0.44433957}
m_Center: {x: -0.0013079824, y: 0.054793414, z: -0.016253805}
--- !u!1 &4889599944713860043
GameObject:
m_ObjectHideFlags: 0
@ -442,6 +442,7 @@ GameObject:
- component: {fileID: 7498231984594143906}
- component: {fileID: 4692762165832003092}
- component: {fileID: 1265028163992222820}
- component: {fileID: 3269563604113191928}
m_Layer: 0
m_Name: House Content|compost_bags_floorstacked_L_BB_SpotMini-House_2023.blend|Dupli|46
m_TagString: sit
@ -535,8 +536,29 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.8885536, y: 1.1533384, z: 0.23275645}
m_Center: {x: -3.5597563, y: -0.66991407, z: 0.20143309}
m_Size: {x: 0.8885536, y: 1.2333498, z: 0.23275645}
m_Center: {x: -3.559754, y: -0.7099194, z: 0.20143312}
--- !u!65 &3269563604113191928
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4889599944713860043}
m_Material: {fileID: 13400000, guid: 6a4c79ef4b9877441b03dda6a9bd0425, 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: 0.8885543, y: 0.05493891, z: 0.36753672}
m_Center: {x: -3.5597582, y: -1.2157195, z: 0.2688234}
--- !u!1 &5142767802073044941
GameObject:
m_ObjectHideFlags: 0
@ -696,8 +718,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 0.19787991, z: 0.6287988}
m_Center: {x: -0.00000001741686, y: 0.11596007, z: 0.10055196}
m_Size: {x: 1.1249295, y: 0.19787993, z: 0.6287988}
m_Center: {x: -0.062464915, y: 0.11596017, z: 0.10055195}
--- !u!65 &4688922324099886311
BoxCollider:
m_ObjectHideFlags: 0
@ -717,5 +739,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 0.45948917, z: 0.21177341}
m_Center: {x: -0.000000049378006, y: 0.24676093, z: -0.15290076}
m_Size: {x: 1.1211106, y: 0.37300703, z: 0.21177348}
m_Center: {x: -0.060555726, y: 0.20352039, z: -0.15290076}

37
Assets/6_Scenes/Beep.unity
View File

@ -674,7 +674,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 377437129}
serializedVersion: 2
m_LocalRotation: {x: -0.037838772, y: 0.8817097, z: -0.071784794, w: -0.46476156}
m_LocalRotation: {x: -0.03783877, y: 0.8817097, z: -0.07178479, w: -0.46476156}
m_LocalPosition: {x: -128.4, y: 13, z: -248.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -791,17 +791,17 @@ PrefabInstance:
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3}
propertyPath: m_LocalPosition.x
value: -235.29999
value: -232.87999
objectReference: {fileID: 0}
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3}
propertyPath: m_LocalPosition.y
value: 5.700001
value: 5.619999
objectReference: {fileID: 0}
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3}
propertyPath: m_LocalPosition.z
value: 505.78998
value: 507.07
objectReference: {fileID: 0}
- target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3}
@ -1106,7 +1106,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 470663197}
serializedVersion: 2
m_LocalRotation: {x: -0.15766333, y: 0.6501475, z: 0.14043981, w: 0.7298816}
m_LocalRotation: {x: -0.15766335, y: 0.6501475, z: 0.14043982, w: 0.7298816}
m_LocalPosition: {x: -5.4363403, y: -6.517355, z: -11.485382}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1174,7 +1174,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 513050371}
serializedVersion: 2
m_LocalRotation: {x: -0.15766333, y: 0.6501475, z: 0.14043981, w: 0.7298816}
m_LocalRotation: {x: -0.15766335, y: 0.6501475, z: 0.14043982, w: 0.7298816}
m_LocalPosition: {x: -5.4363403, y: -6.517355, z: -11.485382}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3048,11 +3048,36 @@ PrefabInstance:
propertyPath: m_WaypointList.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3984493130856861062, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.y
value: -30.1
objectReference: {fileID: 0}
- target: {fileID: 3984493130856861062, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.z
value: 83.23
objectReference: {fileID: 0}
- target: {fileID: 4823915812732403376, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_Name
value: Waypoints
objectReference: {fileID: 0}
- target: {fileID: 6868380804102066130, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.02
objectReference: {fileID: 0}
- target: {fileID: 6868380804102066130, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.y
value: -32.88
objectReference: {fileID: 0}
- target: {fileID: 6868380804102066130, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.z
value: 83.61
objectReference: {fileID: 0}
- target: {fileID: 8202717142006031211, guid: 796c0c7bfd2e89547bd866eedcc6d386,
type: 3}
propertyPath: m_LocalPosition.x

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

@ -99,6 +99,10 @@ public class ModelSwap : MonoBehaviour
private void SwitchModelOverride(string modelName)
{
SwapModelOnReachingWaypoint(modelName);
if (!m_currentModelName.Equals("Getup"))
{
SwapModelOnReachingWaypoint(modelName);
}
}
};

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

@ -1 +1 @@
{"count":1,"self":40.7099584,"total":41.3180456,"children":{"InitializeActuators":{"count":1,"self":0.001501,"total":0.001501,"children":null},"InitializeSensors":{"count":1,"self":0.0020122,"total":0.0020122,"children":null},"AgentSendState":{"count":1775,"self":0.0225784,"total":0.3057639,"children":{"CollectObservations":{"count":355,"self":0.0080433,"total":0.0080433,"children":null},"WriteActionMask":{"count":355,"self":0,"total":0,"children":null},"RequestDecision":{"count":355,"self":0.2751422,"total":0.2751422,"children":null}}},"DecideAction":{"count":1775,"self":0.2827425,"total":0.2842454,"children":{"RayPerceptionSensor.Perceive":{"count":355,"self":0.0015029,"total":0.0015029,"children":null}}},"AgentAct":{"count":1775,"self":0.013056199999999999,"total":0.013056199999999999,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709908418","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":"1709908459"}}
{"count":1,"self":75.631232,"total":76.535063,"children":{"InitializeActuators":{"count":1,"self":0.00050539999999999992,"total":0.00050539999999999992,"children":null},"InitializeSensors":{"count":1,"self":0.0020036999999999998,"total":0.0020036999999999998,"children":null},"AgentSendState":{"count":3533,"self":0.0376888,"total":0.3303442,"children":{"CollectObservations":{"count":707,"self":0.023062199999999998,"total":0.023062199999999998,"children":null},"WriteActionMask":{"count":707,"self":0.00050369999999999994,"total":0.00050369999999999994,"children":null},"RequestDecision":{"count":707,"self":0.2690895,"total":0.2690895,"children":null}}},"DecideAction":{"count":3533,"self":0.5322958,"total":0.5353066,"children":{"RayPerceptionSensor.Perceive":{"count":707,"self":0.0030107999999999997,"total":0.0030107999999999997,"children":null}}},"AgentAct":{"count":3533,"self":0.0356702,"total":0.0356702,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709909796","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":"1709909872"}}
Write Preview
Loading…
Cancel
Save