From 099fceda06f2db9ccea5fe3946e445ebe509129c Mon Sep 17 00:00:00 2001 From: cailean Date: Fri, 19 Apr 2024 15:03:27 +0100 Subject: [PATCH] camera controller added --- Assets/5_Scenes/DreconDemo.unity | 529 +++++++++++++----- Assets/8_Scripts/1_Managers/CameraManager.cs | 69 ++- .../SMPLX Blend/SMPLX Body Actuations.prefab | 148 ++--- .../Humanoid/SMPLX Blend/SMPLX Body.prefab | 148 ++--- .../smplx texture human body.mat | 1 + .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- ProjectSettings/TagManager.asset | 3 +- 7 files changed, 589 insertions(+), 311 deletions(-) diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 08c9db2..747289e 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -770,7 +770,7 @@ GameObject: - component: {fileID: 320225265} m_Layer: 0 m_Name: Actuations-Ortho - m_TagString: Untagged + m_TagString: vc_Actuations m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -783,7 +783,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: 0.38916367, y: 0.5932096, z: -0.58294547, w: 0.39601585} + m_LocalRotation: {x: 0.38916165, y: 0.59321105, z: -0.5829468, w: 0.39601386} m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1056,8 +1056,8 @@ Camera: near clip plane: 0.1 far clip plane: 5000 field of view: 40 - orthographic: 0 - orthographic size: 10 + orthographic: 1 + orthographic size: -0.34 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1081,8 +1081,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.963373, z: -0, w: 0.26816496} - m_LocalPosition: {x: 19.92, y: 8.63, z: 7.53} + m_LocalRotation: {x: 0.38916165, y: 0.59321105, z: -0.5829468, w: 0.39601386} + m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1856,50 +1856,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &717665286 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 717665287} - - component: {fileID: 717665288} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &717665287 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717665286} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 19.341925, y: 6.744215, z: 1.1490406} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1300293485} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &717665288 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717665286} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &756894919 GameObject: m_ObjectHideFlags: 0 @@ -2549,7 +2505,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.0011930601, w: 0.8706919} + m_LocalRotation: {x: 0.49182287, y: 0.0021121476, z: -0.0011930771, w: 0.8706919} m_LocalPosition: {x: 18.100853, y: 10.155965, z: -0.48116565} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3418,85 +3374,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1300293484 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1300293485} - - component: {fileID: 1300293486} - m_Layer: 0 - m_Name: Demo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1300293485 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300293484} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.963373, z: -0, w: 0.26816496} - m_LocalPosition: {x: 19.92, y: 8.63, z: 7.53} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 717665287} - m_Father: {fileID: 1346050330} - m_LocalEulerAnglesHint: {x: 0, y: -148.89, z: 0} ---- !u!114 &1300293486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300293484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 2147483647 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 2 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - Iso: 200 - ShutterSpeed: 0.005 - Aperture: 16 - BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 - Anamorphism: 0 - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 717665287} --- !u!1 &1327997888 GameObject: m_ObjectHideFlags: 0 @@ -3569,7 +3446,6 @@ Transform: - {fileID: 1440085504} - {fileID: 805826300} - {fileID: 1634889328} - - {fileID: 1300293485} - {fileID: 320225264} m_Father: {fileID: 547443783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4363,7 +4239,7 @@ MonoBehaviour: - m_Script m_LockStageInInspector: m_StreamingVersion: 20170927 - m_Priority: 0 + m_Priority: 2147483647 m_StandbyUpdate: 2 m_LookAt: {fileID: 1853480535} m_Follow: {fileID: 1645504645} @@ -5143,7 +5019,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.70043856, y: -0.026137646, z: 0.025706908, w: 0.7127705} + m_LocalRotation: {x: 0.7004387, y: -0.026134748, z: 0.025704062, w: 0.71277064} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5167,7 +5043,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2024068565 Transform: m_ObjectHideFlags: 0 @@ -5197,7 +5073,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Everything: serializedVersion: 2 - m_Bits: 3455 + m_Bits: 8063 m_Agent: serializedVersion: 2 m_Bits: 3199 @@ -5207,10 +5083,14 @@ MonoBehaviour: m_Environment: serializedVersion: 2 m_Bits: 3127 + m_Actuations: + serializedVersion: 2 + m_Bits: 5175 m_CameraBlendMin: 3 m_CameraBlendMax: 4 m_CameraSwapMin: 7 m_CameraSwapMax: 21 + m_CameraController: 1 --- !u!1 &2031268866 GameObject: m_ObjectHideFlags: 0 @@ -8170,7 +8050,6 @@ GameObject: - component: {fileID: 4931218027702484626} - component: {fileID: 4876933051977942161} - component: {fileID: 1305037035509676156} - - component: {fileID: 4931218027702484627} m_Layer: 11 m_Name: Plane m_TagString: Untagged @@ -10099,19 +9978,6 @@ Transform: m_Children: [] m_Father: {fileID: 543450651852864845} m_LocalEulerAnglesHint: {x: 87.56, y: 0, z: 0} ---- !u!114 &4931218027702484627 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2193423312754886620} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 519cf89ae36670048bb519d29044f45e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Speed: 0 --- !u!4 &4945909789592020759 Transform: m_ObjectHideFlags: 0 @@ -10649,6 +10515,96 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 877578400245870475} m_Modifications: + - target: {fileID: 21222041628466592, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 70203245835655707, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 73160439125046498, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 137366480869429243, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 197831959288001994, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 348140460079395863, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 743838645741861823, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 770246646965950398, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 893696456845061972, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1007380726852009365, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1046206438897029132, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1185879479563894883, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1272926191835422704, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1409974671858869043, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1594614846548499369, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1624041313598437802, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1685085854493789147, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1692139023417985445, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1855795095694562573, guid: 248e74dcdf41731459e829be7f230e47, type: 3} propertyPath: m_LocalPosition.x @@ -10699,11 +10655,286 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1884447006927055861, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1979328050184162311, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2151811575544301544, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2213656933588155196, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2548632293283346843, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2577901361685774375, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2926558417571748514, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2948080768023906527, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2993811208029418094, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3165004204860798915, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3215449509951654054, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3332260817411020948, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3582234301390498938, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3643986052705610539, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3729771114068842421, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3834337579514341660, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3874785238855498423, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3953376221772638590, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4192738292566684040, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4207674678640678521, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4296286764046940852, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4309022582423191493, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4314640488879276746, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4373623513499984719, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4453273443531896582, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4784974380423865269, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4926118287029150037, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5105204863257157135, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5129187977329027340, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5459982188040865739, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5475725458918840513, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5594766711721589813, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5669736348002671409, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5935120284096464657, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6153439641887494051, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6338011775516940003, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6500724235791167151, guid: 248e74dcdf41731459e829be7f230e47, type: 3} propertyPath: m_Name value: SMPLX Mixamo Modifier Appplied Shape Keys objectReference: {fileID: 0} + - target: {fileID: 6500724235791167151, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6946488308254974939, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7198587040596122796, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7205673932190533371, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7309324304250725736, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7557738215074799013, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7681107197642590988, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7915535665109687518, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8036051581157619742, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8215843640607355172, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8523687381904499280, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8572995448723430364, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8666495058161049647, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8737922372618939612, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8870507148931849439, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9033929448486330149, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9037068683731117760, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9189034453685696154, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9201659265729341072, guid: 248e74dcdf41731459e829be7f230e47, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/8_Scripts/1_Managers/CameraManager.cs b/Assets/8_Scripts/1_Managers/CameraManager.cs index 2f5ad91..6d1c204 100644 --- a/Assets/8_Scripts/1_Managers/CameraManager.cs +++ b/Assets/8_Scripts/1_Managers/CameraManager.cs @@ -24,6 +24,7 @@ public class CameraManager : MonoBehaviour public LayerMask m_Agent; public LayerMask m_Bodies; public LayerMask m_Environment; + public LayerMask m_Actuations; [Header("Camera Settings")] [Range(2, 20)] @@ -34,6 +35,8 @@ public class CameraManager : MonoBehaviour public int m_CameraSwapMin; [Range(5, 180)] public int m_CameraSwapMax; + public bool m_CameraController; + private int m_CameraIndex = 0; private void Awake() { @@ -52,7 +55,40 @@ public class CameraManager : MonoBehaviour private void Start() { - StartCoroutine(CameraSwitch()); + if(!m_CameraController) + StartCoroutine(CameraSwitch()); + } + + private void Update(){ + if (m_CameraController) + CameraControllerInput(); + } + + private void CameraControllerInput(){ + var count = 0; + if(Input.GetKeyDown(KeyCode.LeftArrow)){ + if (m_CameraIndex != 0) + m_CameraIndex--; + } + + if(Input.GetKeyDown(KeyCode.RightArrow)){ + if (m_CameraIndex != 1) + m_CameraIndex++; + } + + + for(int i = 0 + (m_CameraIndex * 10); i < m_CameraObjects.Count; i++){ + if(Input.GetKeyDown(KeyCode.Alpha0 + ( i - ( m_CameraIndex * 10 ) ))){ + foreach(GameObject obj in m_CameraObjects){ + if(count == i){ + Debug.Log($"Swapping to:{obj.name}"); + SetCamera(obj); + break; + } + count++; + } + } + } } IEnumerator CameraSwitch() @@ -67,7 +103,6 @@ public class CameraManager : MonoBehaviour m_Camera = m_Brain.GetComponent(); string currentTag = m_ActiveCamera.tag; - switch (currentTag) { case "vc_Agent": @@ -79,9 +114,8 @@ public class CameraManager : MonoBehaviour case "vc_Environment": m_Camera.cullingMask = m_Environment; break; - default: - case "vc_Default": - m_Camera.cullingMask = m_Everything; + case "vc_Actuations": + m_Camera.cullingMask = m_Actuations; break; } @@ -154,7 +188,8 @@ public class CameraManager : MonoBehaviour float blendtime = (float)Random.Range(m_CameraBlendMin, m_CameraBlendMax); if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body") - || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body")) + || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Body") + || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Actuations")) blendtime = 0; cmBrain.m_DefaultBlend.m_Time = blendtime; @@ -184,11 +219,7 @@ public class CameraManager : MonoBehaviour if(parentObject != null) { - foreach(Transform child in parentObject.transform) - { - if(child.gameObject.activeSelf) - m_CameraObjects.Add(child.gameObject); - } + AddActiveChildrenRecursively(parentObject.transform); } else { @@ -204,10 +235,24 @@ public class CameraManager : MonoBehaviour Debug.LogError("CM Brain could not be found."); } - Debug.Log(m_CameraObjects.Count); + Debug.Log($"Camera Count: {m_CameraObjects.Count}"); } + void AddActiveChildrenRecursively(Transform parentTransform) + { + foreach (Transform child in parentTransform) + { + if (child.gameObject.activeSelf && child.GetComponent() != null) + { + m_CameraObjects.Add(child.gameObject); + } + + // Recursively call the function for each child + AddActiveChildrenRecursively(child); + } + } + 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 217f533..e93192e 100644 --- a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab +++ b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8392188405207720138} - m_Layer: 0 + m_Layer: 12 m_Name: left_ring1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -41,7 +41,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4625116195938272588} - m_Layer: 0 + m_Layer: 12 m_Name: right_index3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -73,7 +73,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4713400321432725663} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightEye_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -107,7 +107,7 @@ GameObject: - component: {fileID: 4104003120201724447} - component: {fileID: 8178394173173821938} - component: {fileID: 2299140603180967849} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -296,7 +296,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2877934595191957682} - m_Layer: 0 + m_Layer: 12 m_Name: right_pinky1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -331,7 +331,7 @@ GameObject: - component: {fileID: 7576700121674294081} - component: {fileID: 8951002742067745391} - component: {fileID: 57978447376854422} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -515,7 +515,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2645296152634146720} - m_Layer: 0 + m_Layer: 12 m_Name: left_pinky1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -547,7 +547,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6425539633217595357} - m_Layer: 0 + m_Layer: 12 m_Name: left_ring2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -579,7 +579,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1372486462601534206} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -612,7 +612,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3280764393719524176} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightEye m_TagString: Untagged m_Icon: {fileID: 0} @@ -647,7 +647,7 @@ GameObject: - component: {fileID: 3332277034093266762} - component: {fileID: 5618106393334633097} - component: {fileID: 4160867091343542165} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -831,7 +831,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2784803582645078790} - m_Layer: 0 + m_Layer: 12 m_Name: left_middle2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -864,7 +864,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2639162956498269548} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:HeadTop_End_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -895,7 +895,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3816914784370044659} - m_Layer: 0 + m_Layer: 12 m_Name: right_pinky3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -926,7 +926,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2512808423294086996} - m_Layer: 0 + m_Layer: 12 m_Name: left_index3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -957,7 +957,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6169222112447563370} - m_Layer: 0 + m_Layer: 12 m_Name: left_middle1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -989,7 +989,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4387271508064190079} - m_Layer: 0 + m_Layer: 12 m_Name: left_thumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1021,7 +1021,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8349812856446881717} - m_Layer: 0 + m_Layer: 12 m_Name: right_middle3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -1055,7 +1055,7 @@ GameObject: - component: {fileID: 86629611283581901} - component: {fileID: 2549665239432573348} - component: {fileID: 4634884027406570643} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1239,7 +1239,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4826926804555977967} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -1275,7 +1275,7 @@ GameObject: - component: {fileID: 8037481752507383015} - component: {fileID: 4358090228765065908} - component: {fileID: 5097749219421877106} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1459,7 +1459,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6413838954725977653} - m_Layer: 0 + m_Layer: 12 m_Name: right_ring3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -1493,7 +1493,7 @@ GameObject: - component: {fileID: 6497190852055708237} - component: {fileID: 3010273085218181443} - component: {fileID: 307617058348741042} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1677,7 +1677,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 176995806160766139} - m_Layer: 0 + m_Layer: 12 m_Name: right_ring1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1712,7 +1712,7 @@ GameObject: - component: {fileID: 7392974586364255450} - component: {fileID: 4497070650401936860} - component: {fileID: 1248311518660118698} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1896,7 +1896,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 811021076847298925} - m_Layer: 0 + m_Layer: 12 m_Name: right_middle3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1928,7 +1928,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2388918619880219563} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftEye m_TagString: Untagged m_Icon: {fileID: 0} @@ -1960,7 +1960,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6024493087408828926} - m_Layer: 0 + m_Layer: 12 m_Name: right_thumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1993,7 +1993,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5540500153093132690} - m_Layer: 0 + m_Layer: 12 m_Name: right_index2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2029,7 +2029,7 @@ GameObject: - component: {fileID: 7858768645359208063} - component: {fileID: 2984753957200183070} - component: {fileID: 6068864400663336609} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -2213,7 +2213,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7722778103894512693} - m_Layer: 3 + m_Layer: 12 m_Name: lookat m_TagString: Untagged m_Icon: {fileID: 0} @@ -2245,7 +2245,7 @@ GameObject: m_Component: - component: {fileID: 6552800559256800445} - component: {fileID: 7993354930113501058} - m_Layer: 0 + m_Layer: 12 m_Name: SMPLX-mesh-neutral m_TagString: Untagged m_Icon: {fileID: 0} @@ -2388,7 +2388,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3477488547253860040} - m_Layer: 0 + m_Layer: 12 m_Name: left_thumb3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -2421,7 +2421,7 @@ GameObject: - component: {fileID: 678024184021010483} - component: {fileID: 5690925592852017511} - component: {fileID: 8684547025036759242} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:Hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -2505,7 +2505,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3030290999949338577} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -2538,7 +2538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6677752455006134314} - m_Layer: 0 + m_Layer: 12 m_Name: left_pinky3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2570,7 +2570,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5576307018448858326} - m_Layer: 0 + m_Layer: 12 m_Name: right_pinky2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2603,7 +2603,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2143540248044551279} - m_Layer: 0 + m_Layer: 12 m_Name: right_pinky3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2638,7 +2638,7 @@ GameObject: - component: {fileID: 8131387090130273765} - component: {fileID: 1284026153384899921} - component: {fileID: 6032729184079163045} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -2820,7 +2820,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8855914390359625154} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:Spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -2856,7 +2856,7 @@ GameObject: - component: {fileID: 377058523437678197} - component: {fileID: 3944650281175047047} - component: {fileID: 8884603704548412029} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3040,7 +3040,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9004408155426452957} - m_Layer: 0 + m_Layer: 12 m_Name: left_index3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3072,7 +3072,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 707055281929104662} - m_Layer: 0 + m_Layer: 12 m_Name: right_thumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3105,7 +3105,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5058641391347366772} - m_Layer: 0 + m_Layer: 12 m_Name: left_thumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3137,7 +3137,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2747092091922807187} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightToeBase_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3168,7 +3168,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4538940496294351213} - m_Layer: 0 + m_Layer: 12 m_Name: right_thumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3200,7 +3200,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1892745655297223127} - m_Layer: 0 + m_Layer: 12 m_Name: left_middle3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3232,7 +3232,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7963900561773891894} - m_Layer: 0 + m_Layer: 12 m_Name: left_middle3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3263,7 +3263,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 659497962087418293} - m_Layer: 0 + m_Layer: 12 m_Name: left_pinky3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3294,7 +3294,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2960679728623310168} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -3327,7 +3327,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 756056028197475278} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftEye_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3358,7 +3358,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5790463735571417342} - m_Layer: 0 + m_Layer: 12 m_Name: right_index1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3391,7 +3391,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5408986920228315308} - m_Layer: 0 + m_Layer: 12 m_Name: right_middle1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3423,7 +3423,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5799182186837433326} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:HeadTop_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -3458,7 +3458,7 @@ GameObject: - component: {fileID: 4136397984298279270} - component: {fileID: 4768134226215641602} - component: {fileID: 8578974085883955961} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -3649,7 +3649,7 @@ GameObject: - component: {fileID: 1855795095694562573} - component: {fileID: 3405955434842449529} - component: {fileID: 1540711913744385834} - m_Layer: 0 + m_Layer: 12 m_Name: SMPLX Body Actuations m_TagString: Untagged m_Icon: {fileID: 0} @@ -3730,7 +3730,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8547725265499345302} - m_Layer: 0 + m_Layer: 12 m_Name: left_index2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3763,7 +3763,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 693700421357794557} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:LeftToeBase_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3794,7 +3794,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3779922606553695010} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -3826,7 +3826,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 956820808484251902} - m_Layer: 0 + m_Layer: 12 m_Name: SMPLX-neutral m_TagString: Untagged m_Icon: {fileID: 0} @@ -3858,7 +3858,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2316002335727240853} - m_Layer: 0 + m_Layer: 12 m_Name: right_ring3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3890,7 +3890,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1122026092093738906} - m_Layer: 0 + m_Layer: 12 m_Name: right_middle2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3923,7 +3923,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7490760453231154353} - m_Layer: 0 + m_Layer: 12 m_Name: right_ring2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3955,7 +3955,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 562918618448515478} - m_Layer: 0 + m_Layer: 12 m_Name: left_ring3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3990,7 +3990,7 @@ GameObject: - component: {fileID: 3379352762974277740} - component: {fileID: 4091259816581905314} - component: {fileID: 4699836743952116304} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -4177,7 +4177,7 @@ GameObject: - component: {fileID: 7327192028788551625} - component: {fileID: 3755684813348392890} - component: {fileID: 418590665068674605} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:Spine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4361,7 +4361,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8508307884794564945} - m_Layer: 0 + m_Layer: 12 m_Name: right_index3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -4392,7 +4392,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3801981029509482505} - m_Layer: 0 + m_Layer: 12 m_Name: right_thumb3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -4423,7 +4423,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8797252541960538466} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:Spine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4457,7 +4457,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7327181173892382609} - m_Layer: 0 + m_Layer: 12 m_Name: left_thumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4492,7 +4492,7 @@ GameObject: - component: {fileID: 1748429256213688576} - component: {fileID: 2889142744228806004} - component: {fileID: 3855092352767440208} - m_Layer: 0 + m_Layer: 12 m_Name: mixamorig:RightFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -4674,7 +4674,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5501850357187955743} - m_Layer: 0 + m_Layer: 12 m_Name: left_ring3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -4705,7 +4705,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 434810507698887313} - m_Layer: 0 + m_Layer: 12 m_Name: left_index1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4737,7 +4737,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1173946246217124651} - m_Layer: 0 + m_Layer: 12 m_Name: left_pinky2 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body.prefab b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body.prefab index 778eb99..a5b6b97 100644 --- a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body.prefab +++ b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8392188405207720138} - m_Layer: 0 + m_Layer: 8 m_Name: left_ring1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -41,7 +41,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4625116195938272588} - m_Layer: 0 + m_Layer: 8 m_Name: right_index3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -73,7 +73,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4713400321432725663} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightEye_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -107,7 +107,7 @@ GameObject: - component: {fileID: 4104003120201724447} - component: {fileID: 8178394173173821938} - component: {fileID: 2299140603180967849} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -296,7 +296,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2877934595191957682} - m_Layer: 0 + m_Layer: 8 m_Name: right_pinky1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -331,7 +331,7 @@ GameObject: - component: {fileID: 7576700121674294081} - component: {fileID: 8951002742067745391} - component: {fileID: 57978447376854422} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -515,7 +515,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2645296152634146720} - m_Layer: 0 + m_Layer: 8 m_Name: left_pinky1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -547,7 +547,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6425539633217595357} - m_Layer: 0 + m_Layer: 8 m_Name: left_ring2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -579,7 +579,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1372486462601534206} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -612,7 +612,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3280764393719524176} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightEye m_TagString: Untagged m_Icon: {fileID: 0} @@ -647,7 +647,7 @@ GameObject: - component: {fileID: 3332277034093266762} - component: {fileID: 5618106393334633097} - component: {fileID: 4160867091343542165} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -831,7 +831,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2784803582645078790} - m_Layer: 0 + m_Layer: 8 m_Name: left_middle2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -864,7 +864,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2639162956498269548} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:HeadTop_End_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -895,7 +895,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3816914784370044659} - m_Layer: 0 + m_Layer: 8 m_Name: right_pinky3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -926,7 +926,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2512808423294086996} - m_Layer: 0 + m_Layer: 8 m_Name: left_index3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -957,7 +957,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6169222112447563370} - m_Layer: 0 + m_Layer: 8 m_Name: left_middle1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -989,7 +989,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4387271508064190079} - m_Layer: 0 + m_Layer: 8 m_Name: left_thumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1021,7 +1021,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8349812856446881717} - m_Layer: 0 + m_Layer: 8 m_Name: right_middle3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -1055,7 +1055,7 @@ GameObject: - component: {fileID: 86629611283581901} - component: {fileID: 2549665239432573348} - component: {fileID: 4634884027406570643} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1239,7 +1239,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4826926804555977967} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -1275,7 +1275,7 @@ GameObject: - component: {fileID: 8037481752507383015} - component: {fileID: 4358090228765065908} - component: {fileID: 5097749219421877106} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1459,7 +1459,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6413838954725977653} - m_Layer: 0 + m_Layer: 8 m_Name: right_ring3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -1493,7 +1493,7 @@ GameObject: - component: {fileID: 6497190852055708237} - component: {fileID: 3010273085218181443} - component: {fileID: 307617058348741042} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1677,7 +1677,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 176995806160766139} - m_Layer: 0 + m_Layer: 8 m_Name: right_ring1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1712,7 +1712,7 @@ GameObject: - component: {fileID: 7392974586364255450} - component: {fileID: 4497070650401936860} - component: {fileID: 1248311518660118698} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1896,7 +1896,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 811021076847298925} - m_Layer: 0 + m_Layer: 8 m_Name: right_middle3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1928,7 +1928,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2388918619880219563} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftEye m_TagString: Untagged m_Icon: {fileID: 0} @@ -1960,7 +1960,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6024493087408828926} - m_Layer: 0 + m_Layer: 8 m_Name: right_thumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1993,7 +1993,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5540500153093132690} - m_Layer: 0 + m_Layer: 8 m_Name: right_index2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2029,7 +2029,7 @@ GameObject: - component: {fileID: 7858768645359208063} - component: {fileID: 2984753957200183070} - component: {fileID: 6068864400663336609} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -2213,7 +2213,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7722778103894512693} - m_Layer: 3 + m_Layer: 8 m_Name: lookat m_TagString: Untagged m_Icon: {fileID: 0} @@ -2245,7 +2245,7 @@ GameObject: m_Component: - component: {fileID: 6552800559256800445} - component: {fileID: 7993354930113501058} - m_Layer: 0 + m_Layer: 8 m_Name: SMPLX-mesh-neutral m_TagString: Untagged m_Icon: {fileID: 0} @@ -2388,7 +2388,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3477488547253860040} - m_Layer: 0 + m_Layer: 8 m_Name: left_thumb3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -2421,7 +2421,7 @@ GameObject: - component: {fileID: 678024184021010483} - component: {fileID: 5690925592852017511} - component: {fileID: 8684547025036759242} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -2505,7 +2505,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3030290999949338577} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -2538,7 +2538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6677752455006134314} - m_Layer: 0 + m_Layer: 8 m_Name: left_pinky3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2570,7 +2570,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5576307018448858326} - m_Layer: 0 + m_Layer: 8 m_Name: right_pinky2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2603,7 +2603,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2143540248044551279} - m_Layer: 0 + m_Layer: 8 m_Name: right_pinky3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2638,7 +2638,7 @@ GameObject: - component: {fileID: 8131387090130273765} - component: {fileID: 1284026153384899921} - component: {fileID: 6032729184079163045} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -2820,7 +2820,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8855914390359625154} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -2856,7 +2856,7 @@ GameObject: - component: {fileID: 377058523437678197} - component: {fileID: 3944650281175047047} - component: {fileID: 8884603704548412029} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3040,7 +3040,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9004408155426452957} - m_Layer: 0 + m_Layer: 8 m_Name: left_index3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3072,7 +3072,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 707055281929104662} - m_Layer: 0 + m_Layer: 8 m_Name: right_thumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3105,7 +3105,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5058641391347366772} - m_Layer: 0 + m_Layer: 8 m_Name: left_thumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3137,7 +3137,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2747092091922807187} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightToeBase_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3168,7 +3168,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4538940496294351213} - m_Layer: 0 + m_Layer: 8 m_Name: right_thumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3200,7 +3200,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1892745655297223127} - m_Layer: 0 + m_Layer: 8 m_Name: left_middle3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3232,7 +3232,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7963900561773891894} - m_Layer: 0 + m_Layer: 8 m_Name: left_middle3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3263,7 +3263,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 659497962087418293} - m_Layer: 0 + m_Layer: 8 m_Name: left_pinky3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3294,7 +3294,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2960679728623310168} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -3327,7 +3327,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 756056028197475278} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftEye_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3358,7 +3358,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5790463735571417342} - m_Layer: 0 + m_Layer: 8 m_Name: right_index1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3391,7 +3391,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5408986920228315308} - m_Layer: 0 + m_Layer: 8 m_Name: right_middle1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3423,7 +3423,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5799182186837433326} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:HeadTop_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -3458,7 +3458,7 @@ GameObject: - component: {fileID: 4136397984298279270} - component: {fileID: 4768134226215641602} - component: {fileID: 8578974085883955961} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -3649,7 +3649,7 @@ GameObject: - component: {fileID: 1855795095694562573} - component: {fileID: 3405955434842449529} - component: {fileID: 1540711913744385834} - m_Layer: 0 + m_Layer: 8 m_Name: SMPLX Body m_TagString: Untagged m_Icon: {fileID: 0} @@ -3730,7 +3730,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8547725265499345302} - m_Layer: 0 + m_Layer: 8 m_Name: left_index2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3763,7 +3763,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 693700421357794557} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftToeBase_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -3794,7 +3794,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3779922606553695010} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -3826,7 +3826,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 956820808484251902} - m_Layer: 0 + m_Layer: 8 m_Name: SMPLX-neutral m_TagString: Untagged m_Icon: {fileID: 0} @@ -3858,7 +3858,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2316002335727240853} - m_Layer: 0 + m_Layer: 8 m_Name: right_ring3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3890,7 +3890,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1122026092093738906} - m_Layer: 0 + m_Layer: 8 m_Name: right_middle2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3923,7 +3923,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7490760453231154353} - m_Layer: 0 + m_Layer: 8 m_Name: right_ring2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3955,7 +3955,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 562918618448515478} - m_Layer: 0 + m_Layer: 8 m_Name: left_ring3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3990,7 +3990,7 @@ GameObject: - component: {fileID: 3379352762974277740} - component: {fileID: 4091259816581905314} - component: {fileID: 4699836743952116304} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -4177,7 +4177,7 @@ GameObject: - component: {fileID: 7327192028788551625} - component: {fileID: 3755684813348392890} - component: {fileID: 418590665068674605} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Spine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4361,7 +4361,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8508307884794564945} - m_Layer: 0 + m_Layer: 8 m_Name: right_index3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -4392,7 +4392,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3801981029509482505} - m_Layer: 0 + m_Layer: 8 m_Name: right_thumb3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -4423,7 +4423,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8797252541960538466} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Spine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4457,7 +4457,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7327181173892382609} - m_Layer: 0 + m_Layer: 8 m_Name: left_thumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4492,7 +4492,7 @@ GameObject: - component: {fileID: 1748429256213688576} - component: {fileID: 2889142744228806004} - component: {fileID: 3855092352767440208} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -4674,7 +4674,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5501850357187955743} - m_Layer: 0 + m_Layer: 8 m_Name: left_ring3_end m_TagString: Untagged m_Icon: {fileID: 0} @@ -4705,7 +4705,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 434810507698887313} - m_Layer: 0 + m_Layer: 8 m_Name: left_index1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4737,7 +4737,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1173946246217124651} - m_Layer: 0 + m_Layer: 8 m_Name: left_pinky2 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human body.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human body.mat index 8cd30a5..7bdd47f 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human body.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human body.mat @@ -272,6 +272,7 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _CustomVector: {r: -0.39, g: 0.99, b: 1.08, a: 0} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 4a625e4..ad97b42 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":50.624780799999996,"total":51.9051494,"children":{"InitializeActuators":{"count":1,"self":0.00099859999999999988,"total":0.00099859999999999988,"children":null},"InitializeSensors":{"count":1,"self":0.0009999,"total":0.0009999,"children":null},"AgentSendState":{"count":2435,"self":0.016408,"total":0.34239379999999997,"children":{"CollectObservations":{"count":1218,"self":0.31143529999999997,"total":0.31143529999999997,"children":null},"WriteActionMask":{"count":1218,"self":0.0015042999999999999,"total":0.0015042999999999999,"children":null},"RequestDecision":{"count":1218,"self":0.013046199999999999,"total":0.013046199999999999,"children":null}}},"DecideAction":{"count":2435,"self":0.5500238,"total":0.5500238,"children":null},"AgentAct":{"count":2435,"self":0.3859514,"total":0.3859514,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":67.4610748,"min":67.4610748,"runningAverage":67.4610748,"value":67.4610748,"weightedAverage":67.4610748}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713532458","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\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 35e1e307-bed6-45f6-bd2e-ffedcc836cc6 -accessToken 0lRu6csHJ34cbzvP-Bp73LSli6WheMXxZCca1Jo9JP8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1713532510"}} \ No newline at end of file +{"count":1,"self":48.3423136,"total":49.699399899999996,"children":{"InitializeActuators":{"count":1,"self":0.0010006,"total":0.0010006,"children":null},"InitializeSensors":{"count":1,"self":0.0010007,"total":0.0010007,"children":null},"AgentSendState":{"count":2615,"self":0.0172939,"total":0.3630545,"children":{"CollectObservations":{"count":1308,"self":0.32920469999999996,"total":0.32920469999999996,"children":null},"WriteActionMask":{"count":1308,"self":0.0035194,"total":0.0035194,"children":null},"RequestDecision":{"count":1308,"self":0.0130365,"total":0.0130365,"children":null}}},"DecideAction":{"count":2615,"self":0.5577557,"total":0.5577557,"children":null},"AgentAct":{"count":2615,"self":0.4342738,"total":0.4342738,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":2,"max":178.038376,"min":66.61866,"runningAverage":122.328522,"value":178.038376,"weightedAverage":94.47359}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713535314","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\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 35e1e307-bed6-45f6-bd2e-ffedcc836cc6 -accessToken 0lRu6csHJ34cbzvP-Bp73LSli6WheMXxZCca1Jo9JP8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1713535363"}} \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 544e13d..0b1b16b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - vc_Agent - vc_Body - vc_Environment + - vc_Actuations layers: - Default - TransparentFX @@ -20,7 +21,7 @@ TagManager: - Body Ground - VFX - Camera Ground - - + - Actuations - - -