From 2c0252aeb9f011d4a050d0e33140ad0a8ff50eaf Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Sun, 26 May 2024 18:23:08 +0100 Subject: [PATCH] fixed actuations camera --- Assets/12_VFX Graphs/Swarm/Swarm.vfx | 202 +++- Assets/5_Scenes/DreconDemo.unity | 995 ++++++++++++++---- Assets/8_Scripts/1_Managers/CameraManager.cs | 2 +- .../SMPLX Blend/SMPLX Body Actuations.prefab | 2 +- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- 5 files changed, 1014 insertions(+), 189 deletions(-) diff --git a/Assets/12_VFX Graphs/Swarm/Swarm.vfx b/Assets/12_VFX Graphs/Swarm/Swarm.vfx index 3baff90..74fc6c2 100644 --- a/Assets/12_VFX Graphs/Swarm/Swarm.vfx +++ b/Assets/12_VFX Graphs/Swarm/Swarm.vfx @@ -60,11 +60,26 @@ MonoBehaviour: - {fileID: 8926484042661614933} - {fileID: 8926484042661614939} - {fileID: 8926484042661614941} + - {fileID: 8926484042661614995} m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 m_UIInfos: {fileID: 114340500867371532} - m_ParameterInfo: [] + m_ParameterInfo: + - name: Center + path: Center + tooltip: + sheetType: m_Vector3f + realType: Vector3 + defaultValue: + m_Type: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_SerializableObject: '{"x":0.0,"y":0.0,"z":0.0}' + min: -Infinity + max: Infinity + enumValues: [] + descendantCount: 0 m_ImportDependencies: [] m_GraphVersion: 12 m_ResourceVersion: 1 @@ -9015,7 +9030,8 @@ MonoBehaviour: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 0 - m_LinkedSlots: [] + m_LinkedSlots: + - {fileID: 8926484042661614996} --- !u!114 &8926484042661614988 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9250,3 +9266,185 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] +--- !u!114 &8926484042661614995 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 330e0fca1717dde4aaa144f48232aa64, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 114350483966674976} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 0 + m_UISuperCollapsed: 0 + m_InputSlots: [] + m_OutputSlots: + - {fileID: 8926484042661614996} + m_ExposedName: Center + m_Exposed: 1 + m_Order: 0 + m_Category: + m_Min: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Max: + m_Type: + m_SerializableType: + m_SerializableObject: + m_IsOutput: 0 + m_EnumValues: [] + m_ValueFilter: 0 + m_Tooltip: + m_Nodes: + - m_Id: 0 + linkedSlots: + - outputSlot: {fileID: 8926484042661614996} + inputSlot: {fileID: 8926484042661614987} + position: {x: 732, y: 202} + expandedSlots: [] + expanded: 0 +--- !u!114 &8926484042661614996 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: ac39bd03fca81b849929b9c966f1836a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: + - {fileID: 8926484042661614997} + - {fileID: 8926484042661614998} + - {fileID: 8926484042661614999} + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614996} + m_MasterData: + m_Owner: {fileID: 8926484042661614995} + m_Value: + m_Type: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: o + m_serializedType: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_Direction: 1 + m_LinkedSlots: + - {fileID: 8926484042661614987} +--- !u!114 &8926484042661614997 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 8926484042661614996} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614996} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: x + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: [] +--- !u!114 &8926484042661614998 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 8926484042661614996} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614996} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: y + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: [] +--- !u!114 &8926484042661614999 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 8926484042661614996} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614996} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: z + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: [] diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index b6c4227..9eba700 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -919,22 +919,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -388.39514, y: -21.943909, z: -265.3675} - - {x: -129.46742, y: -21.943909, z: -265.3675} - - {x: -129.46742, y: -21.943909, z: -61.795403} - - {x: -388.39514, y: -21.943909, z: -61.795403} - - {x: -388.39514, y: -21.943909, z: -265.3675} - - {x: -388.39514, y: 431.38736, z: -265.3675} - - {x: -129.46742, y: 431.38736, z: -265.3675} - - {x: -129.46742, y: -21.943909, z: -265.3675} - - {x: -129.46742, y: 431.38736, z: -265.3675} - - {x: -129.46742, y: 431.38736, z: -61.795403} - - {x: -129.46742, y: -21.943909, z: -61.795403} - - {x: -129.46742, y: 431.38736, z: -61.795403} - - {x: -388.39514, y: 431.38736, z: -61.795403} - - {x: -388.39514, y: -21.943909, z: -61.795403} - - {x: -388.39514, y: 431.38736, z: -61.795403} - - {x: -388.39514, y: 431.38736, z: -265.3675} + - {x: -372.36304, y: -25.21878, z: -292.1531} + - {x: -124.34563, y: -25.21878, z: -292.1531} + - {x: -124.34563, y: -25.21878, z: -94.08957} + - {x: -372.36304, y: -25.21878, z: -94.08957} + - {x: -372.36304, y: -25.21878, z: -292.1531} + - {x: -372.36304, y: 465.92453, z: -292.1531} + - {x: -124.34563, y: 465.92453, z: -292.1531} + - {x: -124.34563, y: -25.21878, z: -292.1531} + - {x: -124.34563, y: 465.92453, z: -292.1531} + - {x: -124.34563, y: 465.92453, z: -94.08957} + - {x: -124.34563, y: -25.21878, z: -94.08957} + - {x: -124.34563, y: 465.92453, z: -94.08957} + - {x: -372.36304, y: 465.92453, z: -94.08957} + - {x: -372.36304, y: -25.21878, z: -94.08957} + - {x: -372.36304, y: 465.92453, z: -94.08957} + - {x: -372.36304, y: 465.92453, z: -292.1531} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -1268,7 +1268,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62178361} serializedVersion: 2 - m_LocalRotation: {x: 0.12400306, y: -0.09265334, z: 0.011630276, w: 0.9878782} + m_LocalRotation: {x: 0.12400308, y: -0.092653364, z: 0.011630281, w: 0.9878782} m_LocalPosition: {x: 24.371735, y: 51, z: -83.27547} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1906,6 +1906,79 @@ Transform: m_Children: [] m_Father: {fileID: 434856761} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!1001 &135020142 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: maxJointForceLimit + value: 3.402823e+20 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.x + value: 123.99701 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.y + value: 302.769 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.z + value: -333.367 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9996246 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.027398314 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_Name + value: SMPLX Body Actuations (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} --- !u!1 &153031623 GameObject: m_ObjectHideFlags: 0 @@ -1980,7 +2053,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153031623} serializedVersion: 2 - m_LocalRotation: {x: -0.000010763137, y: 0.9982297, z: 0.059476644, w: -0.00007758362} + m_LocalRotation: {x: -0.00001076108, y: 0.9982297, z: 0.059476666, w: -0.000077618104} m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3797,8 +3870,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: 0.4296801, y: 0.54933363, z: -0.39451072, w: 0.5983051} - m_LocalPosition: {x: 69.4, y: 315, z: -332.1} + m_LocalRotation: {x: 0.0029274854, y: 0.99193877, z: 0.023320675, w: -0.12451982} + m_LocalPosition: {x: 148.10095, y: 306.30005, z: -312.9649} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3823,11 +3896,11 @@ MonoBehaviour: m_StreamingVersion: 20170927 m_Priority: 9000 m_StandbyUpdate: 2 - m_LookAt: {fileID: 489043706} - m_Follow: {fileID: 0} + m_LookAt: {fileID: 453061649} + m_Follow: {fileID: 1683887270} m_Lens: - FieldOfView: 3 - OrthographicSize: 30.38 + FieldOfView: 1.5 + OrthographicSize: 0.35 NearClipPlane: 0.1 FarClipPlane: 5000 Dutch: 0 @@ -4102,9 +4175,9 @@ Camera: height: 1 near clip plane: 0.1 far clip plane: 5000 - field of view: 3 + field of view: 1.5 orthographic: 0 - orthographic size: 30.38 + orthographic size: 0.35 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -4128,8 +4201,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.4296801, y: 0.54933363, z: -0.39451072, w: 0.5983051} - m_LocalPosition: {x: 69.4, y: 315, z: -332.1} + m_LocalRotation: {x: 0.0029274854, y: 0.99193877, z: 0.023320675, w: -0.12451982} + m_LocalPosition: {x: 148.10095, y: 306.30005, z: -312.9649} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4155,7 +4228,7 @@ MonoBehaviour: m_BlendUpdateMethod: 1 m_DefaultBlend: m_Style: 1 - m_Time: 14 + m_Time: 13 m_CustomCurve: serializedVersion: 2 m_Curve: [] @@ -5156,6 +5229,66 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405810717} m_CullTransparentMesh: 1 +--- !u!1 &407802200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 407802201} + - component: {fileID: 407802202} + m_Layer: 0 + m_Name: Actuations + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &407802201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407802200} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 143.27193, y: 268.77, z: -331.89597} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1683887270} + m_Father: {fileID: 2031268867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &407802202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407802200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a200b19ca1a9685429ed7e043c28e904, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Resolution: 20 + m_Appearance: + pathColor: {r: 0, g: 1, b: 0, a: 1} + inactivePathColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + width: 0.2 + m_Looped: 1 + m_Waypoints: + - position: {x: 7.07333, y: 0, z: -2.9832458} + roll: 0 + - position: {x: 5.410633, y: 0, z: 8.585724} + roll: 0 + - position: {x: -6.535309, y: 0, z: 4.4384766} + roll: 0 + - position: {x: -3.7983856, y: 0, z: -6.745453} + roll: 0 --- !u!1 &408004396 GameObject: m_ObjectHideFlags: 3 @@ -5736,7 +5869,7 @@ Transform: m_GameObject: {fileID: 434856757} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 53.804996, y: 300, z: -334.90002} + m_LocalPosition: {x: 125.5, y: 300, z: -334.90002} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: @@ -5744,6 +5877,7 @@ Transform: - {fileID: 1289928345} - {fileID: 133709682} - {fileID: 1087623292} + - {fileID: 453061649} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &441120852 @@ -6035,7 +6169,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &446396107 Transform: m_ObjectHideFlags: 0 @@ -6187,6 +6321,37 @@ Transform: type: 3} m_PrefabInstance: {fileID: 450720737} m_PrefabAsset: {fileID: 0} +--- !u!1 &453061648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 453061649} + m_Layer: 9 + m_Name: Actuations_LookAt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &453061649 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453061648} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.314, y: 0.155, z: 0.371} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 434856761} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &458819510 PrefabInstance: m_ObjectHideFlags: 0 @@ -6524,7 +6689,7 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 52.3 + value: 123.99501 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -6581,12 +6746,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} ---- !u!4 &489043706 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2152472180492272101, guid: a26fb91b7bf9b5547ad21058d0442f76, - type: 3} - m_PrefabInstance: {fileID: 489043705} - m_PrefabAsset: {fileID: 0} --- !u!1 &495794830 GameObject: m_ObjectHideFlags: 0 @@ -6629,6 +6788,120 @@ Transform: - {fileID: 126958725} m_Father: {fileID: 107960509} m_LocalEulerAnglesHint: {x: 0, y: -3.247, z: 0} +--- !u!1 &498922610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 498922613} + - component: {fileID: 498922612} + - component: {fileID: 498922611} + m_Layer: 10 + m_Name: Swarm VFX (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!73398921 &498922611 +VFXRenderer: + serializedVersion: 1 + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498922610} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!2083052967 &498922612 +VisualEffect: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498922610} + m_Enabled: 1 + m_Asset: {fileID: 8926484042661614526, guid: bc359bf765f081940be22357c277284f, type: 3} + m_InitialEventName: OnPlay + m_InitialEventNameOverriden: 0 + m_StartSeed: 0 + m_ResetSeedOnPlay: 1 + m_AllowInstancing: 1 + m_ResourceVersion: 1 + m_PropertySheet: + m_Float: + m_Array: [] + m_Vector2f: + m_Array: [] + m_Vector3f: + m_Array: + - m_Value: {x: 0, y: 0, z: 0} + m_Name: Center + m_Overridden: 1 + m_Vector4f: + m_Array: [] + m_Uint: + m_Array: [] + m_Int: + m_Array: [] + m_Matrix4x4f: + m_Array: [] + m_AnimationCurve: + m_Array: [] + m_Gradient: + m_Array: [] + m_NamedObject: + m_Array: [] + m_Bool: + m_Array: [] +--- !u!4 &498922613 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498922610} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.5, y: -0.7, z: 41.4} + 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 &530571714 PrefabInstance: m_ObjectHideFlags: 0 @@ -7605,7 +7878,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 605393721} serializedVersion: 2 - m_LocalRotation: {x: -0.000066303845, y: 0.99952006, z: 0.03090522, w: 0.002144363} + m_LocalRotation: {x: -0.00006630494, y: 0.99952006, z: 0.030905241, w: 0.0021443975} m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -13906,6 +14179,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1102832205} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1102867470 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: maxJointForceLimit + value: 3.402823e+20 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.x + value: 123.99501 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.z + value: -333.367 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9996246 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.027398314 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_Name + value: SMPLX Body Actuations (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} --- !u!1 &1111505389 GameObject: m_ObjectHideFlags: 3 @@ -14398,6 +14744,79 @@ Transform: - {fileID: 244316247} m_Father: {fileID: 1384775203} m_LocalEulerAnglesHint: {x: 0, y: 69.702, z: 0} +--- !u!1001 &1135490460 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: maxJointForceLimit + value: 3.402823e+20 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.x + value: 123.99501 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.z + value: -332.792 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9996246 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.027398314 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_Name + value: SMPLX Body Actuations (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} --- !u!1 &1141103524 GameObject: m_ObjectHideFlags: 0 @@ -14534,7 +14953,7 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 52.307 + value: 124.00201 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -14982,117 +15401,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1199943351 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1199943354} - - component: {fileID: 1199943353} - - component: {fileID: 1199943352} - m_Layer: 10 - m_Name: Swarm VFX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!73398921 &1199943352 -VFXRenderer: - serializedVersion: 1 - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199943351} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 257 - m_RendererPriority: 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!2083052967 &1199943353 -VisualEffect: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199943351} - m_Enabled: 1 - m_Asset: {fileID: 8926484042661614526, guid: bc359bf765f081940be22357c277284f, type: 3} - m_InitialEventName: OnPlay - m_InitialEventNameOverriden: 0 - m_StartSeed: 0 - m_ResetSeedOnPlay: 1 - m_AllowInstancing: 1 - m_ResourceVersion: 1 - m_PropertySheet: - m_Float: - m_Array: [] - m_Vector2f: - m_Array: [] - m_Vector3f: - m_Array: [] - m_Vector4f: - m_Array: [] - m_Uint: - m_Array: [] - m_Int: - m_Array: [] - m_Matrix4x4f: - m_Array: [] - m_AnimationCurve: - m_Array: [] - m_Gradient: - m_Array: [] - m_NamedObject: - m_Array: [] - m_Bool: - m_Array: [] ---- !u!4 &1199943354 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199943351} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -100, z: 0} - 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 &1209286896 PrefabInstance: m_ObjectHideFlags: 0 @@ -15325,6 +15633,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1212933364} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1225477207 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: maxJointForceLimit + value: 3.402823e+20 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.x + value: 123.99701 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.y + value: 302.769 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.z + value: -332.792 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9996246 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.027398314 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_Name + value: SMPLX Body Actuations (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} --- !u!4 &1235629548 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9c26b1036545e1e478afe84464ba5588, @@ -17596,7 +17977,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1440085503} serializedVersion: 2 - m_LocalRotation: {x: 0.02228007, y: 0.97466654, z: 0.11340367, w: -0.19148976} + m_LocalRotation: {x: 0.022280077, y: 0.97466654, z: 0.11340366, w: -0.1914898} m_LocalPosition: {x: 93.69663, y: 54.427773, z: 12.745178} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -19604,8 +19985,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1585336076} serializedVersion: 2 - m_LocalRotation: {x: 0.3740832, y: -0.002280218, z: -0.0009633082, w: 0.92739195} - m_LocalPosition: {x: 19.65, y: 14.7, z: -4.9} + m_LocalRotation: {x: -0.043333374, y: 0.9566133, z: -0.20882952, w: -0.19850297} + m_LocalPosition: {x: 150.83829, y: 315.9374, z: -314.44928} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -19818,11 +20199,11 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.01 - far clip plane: 372.901 - field of view: 50 - orthographic: 0 - orthographic size: 45 + near clip plane: 0.1 + far clip plane: 5000 + field of view: 3 + orthographic: 1 + orthographic size: 0.3 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -20684,6 +21065,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1622457906} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1626698624 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: maxJointForceLimit + value: 3.402823e+20 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.x + value: 124.00201 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.y + value: 305.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.z + value: -332.8 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9996246 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.027398314 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_Name + value: SMPLX Body Actuations (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} --- !u!4 &1629126962 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c6b88a80298723d43b2a71c85876baa2, @@ -20706,7 +21160,7 @@ PrefabInstance: - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} propertyPath: m_LocalPosition.x - value: 52.302 + value: 123.99701 objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} @@ -21182,7 +21636,7 @@ MonoBehaviour: m_Lens: FieldOfView: 14 OrthographicSize: 10 - NearClipPlane: 0.1 + NearClipPlane: 13 FarClipPlane: 5000 Dutch: 0 ModeOverride: 2 @@ -21385,6 +21839,55 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1671773352} m_PrefabAsset: {fileID: 0} +--- !u!1 &1683887269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1683887270} + - component: {fileID: 1683887271} + m_Layer: 0 + m_Name: Dolly-Cart-Actuations + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1683887270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1683887269} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7112369, z: -0, w: 0.7029524} + m_LocalPosition: {x: 2.3600159, y: 0, z: 9.252167} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 407802201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1683887271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1683887269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a9c787e5d1bbf48a389834c4a9641c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Path: {fileID: 407802202} + m_UpdateMethod: 0 + m_PositionUnits: 1 + m_Speed: 1 + m_Position: 16.02 --- !u!1001 &1699042340 PrefabInstance: m_ObjectHideFlags: 0 @@ -21884,6 +22387,79 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b88a80298723d43b2a71c85876baa2, type: 3} +--- !u!1001 &1771925926 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: maxJointForceLimit + value: 3.402823e+20 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.x + value: 124.00201 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.y + value: 305.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalPosition.z + value: -333.375 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9996246 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.027398314 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.14 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: a26fb91b7bf9b5547ad21058d0442f76, + type: 3} + propertyPath: m_Name + value: SMPLX Body Actuations (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a26fb91b7bf9b5547ad21058d0442f76, type: 3} --- !u!4 &1774037491 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6c3ca455471618548b92063d175ead45, @@ -22074,8 +22650,9 @@ GameObject: m_Component: - component: {fileID: 1795712167} - component: {fileID: 1795712168} - - component: {fileID: 1795712170} - component: {fileID: 1795712169} + - component: {fileID: 1795712170} + - component: {fileID: 1795712171} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -22124,7 +22701,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2} m_PivotOffset: {x: 0, y: 0, z: 0} - m_AmplitudeGain: 1 + m_AmplitudeGain: 0 m_FrequencyGain: 0.5 mNoiseOffsets: {x: -11.757019, y: -299.61145, z: -901.43494} --- !u!114 &1795712170 @@ -22139,21 +22716,64 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0.1, y: 0, z: 0} + m_TrackedObjectOffset: {x: 0, y: -0.3, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0.5 - m_VerticalDamping: 0.5 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1795712171 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795712166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -5, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_TargetMovementOnly: 1 m_ScreenX: 0.5 m_ScreenY: 0.5 + m_CameraDistance: 10 m_DeadZoneWidth: 0 m_DeadZoneHeight: 0 + m_DeadZoneDepth: 0 + m_UnlimitedSoftZone: 0 m_SoftZoneWidth: 0.8 m_SoftZoneHeight: 0.8 m_BiasX: 0 m_BiasY: 0 m_CenterOnActivate: 1 + m_GroupFramingMode: 2 + m_AdjustmentMode: 0 + m_GroupFramingSize: 0.8 + m_MaxDollyIn: 5000 + m_MaxDollyOut: 5000 + m_MinimumDistance: 1 + m_MaximumDistance: 5000 + m_MinimumFOV: 3 + m_MaximumFOV: 60 + m_MinimumOrthoSize: 1 + m_MaximumOrthoSize: 5000 --- !u!1001 &1806589567 PrefabInstance: m_ObjectHideFlags: 0 @@ -23004,22 +23624,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -112.68002, y: -24.091934, z: -293.2953} - - {x: 174.45807, y: -24.091934, z: -293.2953} - - {x: 174.45807, y: -24.091934, z: -17.537857} - - {x: -112.68002, y: -24.091934, z: -17.537857} - - {x: -112.68002, y: -24.091934, z: -293.2953} - - {x: -112.68002, y: 435.69318, z: -293.2953} - - {x: 174.45807, y: 435.69318, z: -293.2953} - - {x: 174.45807, y: -24.091934, z: -293.2953} - - {x: 174.45807, y: 435.69318, z: -293.2953} - - {x: 174.45807, y: 435.69318, z: -17.537857} - - {x: 174.45807, y: -24.091934, z: -17.537857} - - {x: 174.45807, y: 435.69318, z: -17.537857} - - {x: -112.68002, y: 435.69318, z: -17.537857} - - {x: -112.68002, y: -24.091934, z: -17.537857} - - {x: -112.68002, y: 435.69318, z: -17.537857} - - {x: -112.68002, y: 435.69318, z: -293.2953} + - {x: -72.61051, y: -19.627335, z: -247.74063} + - {x: 176.30734, y: -19.627335, z: -247.74063} + - {x: 176.30734, y: -19.627335, z: -10.77533} + - {x: -72.61051, y: -19.627335, z: -10.77533} + - {x: -72.61051, y: -19.627335, z: -247.74063} + - {x: -72.61051, y: 430.76062, z: -247.74063} + - {x: 176.30734, y: 430.76062, z: -247.74063} + - {x: 176.30734, y: -19.627335, z: -247.74063} + - {x: 176.30734, y: 430.76062, z: -247.74063} + - {x: 176.30734, y: 430.76062, z: -10.77533} + - {x: 176.30734, y: -19.627335, z: -10.77533} + - {x: 176.30734, y: 430.76062, z: -10.77533} + - {x: -72.61051, y: 430.76062, z: -10.77533} + - {x: -72.61051, y: -19.627335, z: -10.77533} + - {x: -72.61051, y: 430.76062, z: -10.77533} + - {x: -72.61051, y: 430.76062, z: -247.74063} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -23941,7 +24561,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.70043856, y: -0.026137054, z: 0.025706323, w: 0.71277064} + m_LocalRotation: {x: 0.7004386, y: -0.026136603, z: 0.025705881, w: 0.7127706} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -24695,6 +25315,7 @@ Transform: - {fileID: 792989024} - {fileID: 1926240437} - {fileID: 1858671032} + - {fileID: 407802201} m_Father: {fileID: 547443783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2039555815 @@ -38243,8 +38864,14 @@ SceneRoots: - {fileID: 951379159} - {fileID: 1080375957} - {fileID: 489043705} + - {fileID: 1102867470} + - {fileID: 1135490460} - {fileID: 1630570323} + - {fileID: 135020142} + - {fileID: 1225477207} - {fileID: 1154209501} + - {fileID: 1771925926} + - {fileID: 1626698624} - {fileID: 699558210} - - {fileID: 1199943354} + - {fileID: 498922613} - {fileID: 299259240} diff --git a/Assets/8_Scripts/1_Managers/CameraManager.cs b/Assets/8_Scripts/1_Managers/CameraManager.cs index 77727fc..309226f 100644 --- a/Assets/8_Scripts/1_Managers/CameraManager.cs +++ b/Assets/8_Scripts/1_Managers/CameraManager.cs @@ -143,7 +143,7 @@ public class CameraManager : MonoBehaviour m_Camera.cullingMask = m_Actuations; m_PoseCanvas.SetActive(false); m_BrainPose.SetActive(false); - m_Rewards.SetActive(true); + m_Rewards.SetActive(false); break; case "vc_Compare": m_BrainPose.SetActive(false); diff --git a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab index 2b6168a..54ee707 100644 --- a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab +++ b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab @@ -2287,7 +2287,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 257 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5c128b24ab321c147a2309eb60bcad62, type: 2} + - {fileID: 2100000, guid: 3292cafae042f4d4da78ffbee10cff04, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index d1ca308..d1c8327 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":106.9990784,"total":111.6277465,"children":{"InitializeActuators":{"count":1,"self":0.0015103999999999999,"total":0.0015103999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.001504,"total":0.001504,"children":null},"AgentSendState":{"count":6260,"self":0.0705701,"total":1.4536989,"children":{"CollectObservations":{"count":3130,"self":1.3518491,"total":1.3518491,"children":null},"WriteActionMask":{"count":3130,"self":0.0090594,"total":0.0090594,"children":null},"RequestDecision":{"count":3130,"self":0.0222203,"total":0.0222203,"children":null}}},"DecideAction":{"count":6260,"self":2.0805523999999997,"total":2.0805523,"children":null},"AgentAct":{"count":6260,"self":1.0903937,"total":1.0903937,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716563152","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId a69371f4-0960-4729-b332-479a1ce08ab9 -accessToken uBPxxTOwOoFohWcnNcaFeSEyb3Y6A6Ae3NiYS44vXDY005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716563263"}} \ No newline at end of file +{"count":1,"self":198.45788159999998,"total":206.24364169999998,"children":{"InitializeActuators":{"count":1,"self":0.002,"total":0.002,"children":null},"InitializeSensors":{"count":1,"self":0.0015317,"total":0.0015317,"children":null},"AgentSendState":{"count":11903,"self":0.0730306,"total":2.5116527,"children":{"CollectObservations":{"count":5952,"self":2.3460091999999997,"total":2.3460093,"children":null},"WriteActionMask":{"count":5952,"self":0.0175926,"total":0.0175926,"children":null},"RequestDecision":{"count":5952,"self":0.0750202,"total":0.0750202,"children":null}}},"DecideAction":{"count":11903,"self":3.6477752,"total":3.6477752,"children":null},"AgentAct":{"count":11903,"self":1.6228004,"total":1.6228004,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716743959","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 6c818376-ae95-4024-a0ac-3f3ac93afdd0 -accessToken rlJAvKnw-O35WL0QWWy2PzoejhvNuee0FReRn1Dmju8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716744165"}} \ No newline at end of file