From ea73e8b0dbb27d2590c609f6de7ad46d643dba18 Mon Sep 17 00:00:00 2001 From: cailean Date: Thu, 21 Mar 2024 16:30:50 +0000 Subject: [PATCH] updated applied layers to clone --- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- .../Ragdoll004/MocapControllerArtanim.cs | 17 +- Assets/Scenes/DreconDemo.meta | 8 + Assets/Scenes/DreconDemo.unity | 326 +++++++++++++++++- Assets/Scenes/DreconDemo/Volume Profile.asset | 88 +++++ .../DreconDemo/Volume Profile.asset.meta | 8 + ProjectSettings/DynamicsManager.asset | 2 +- 7 files changed, 440 insertions(+), 11 deletions(-) create mode 100644 Assets/Scenes/DreconDemo.meta create mode 100644 Assets/Scenes/DreconDemo/Volume Profile.asset create mode 100644 Assets/Scenes/DreconDemo/Volume Profile.asset.meta diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index b779128..0d1fed3 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":18.401020799999998,"total":19.0026631,"children":{"InitializeActuators":{"count":1,"self":0.0009998,"total":0.0009998,"children":null},"InitializeSensors":{"count":1,"self":0.0010048,"total":0.0010048,"children":null},"AgentSendState":{"count":1117,"self":0.0080398999999999991,"total":0.1468565,"children":{"CollectObservations":{"count":559,"self":0.1277893,"total":0.1277893,"children":null},"WriteActionMask":{"count":559,"self":0.0005045,"total":0.0005045,"children":null},"RequestDecision":{"count":559,"self":0.010522799999999999,"total":0.010522799999999999,"children":null}}},"DecideAction":{"count":1117,"self":0.28126829999999997,"total":0.28126829999999997,"children":null},"AgentAct":{"count":1117,"self":0.1705073,"total":0.1705073,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":3,"max":197.241531,"min":70.88822,"runningAverage":143.552612,"value":197.241531,"weightedAverage":119.659027}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711034456","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\\Upgrade Demo -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 585fb154-c60e-4d06-858f-da51882ef412 -accessToken uYlRmxZm8yQI0ljQ6TREamLSDSVcPFPnk5wEHmLEyOE005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1711034475"}} \ No newline at end of file +{"count":1,"self":8.3608272,"total":8.5257697999999991,"children":{"InitializeActuators":{"count":1,"self":0.0010012,"total":0.0010012,"children":null},"InitializeSensors":{"count":1,"self":0.0010059,"total":0.0010059,"children":null},"AgentSendState":{"count":219,"self":0.0005036,"total":0.0356133,"children":{"CollectObservations":{"count":110,"self":0.0240878,"total":0.0240878,"children":null},"WriteActionMask":{"count":110,"self":0,"total":0,"children":null},"RequestDecision":{"count":110,"self":0.0110219,"total":0.0110219,"children":null}}},"DecideAction":{"count":219,"self":0.0907428,"total":0.0907428,"children":null},"AgentAct":{"count":219,"self":0.0365797,"total":0.0365797,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":93.1809158,"min":93.1809158,"runningAverage":93.1809158,"value":93.1809158,"weightedAverage":93.1809158}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1711038444","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 585fb154-c60e-4d06-858f-da51882ef412 -accessToken uYlRmxZm8yQI0ljQ6TREamLSDSVcPFPnk5wEHmLEyOE005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1711038452"}} \ No newline at end of file diff --git a/Assets/MarathonEnvs/Scripts/Ragdoll004/MocapControllerArtanim.cs b/Assets/MarathonEnvs/Scripts/Ragdoll004/MocapControllerArtanim.cs index 1f8d9e1..1ce52be 100644 --- a/Assets/MarathonEnvs/Scripts/Ragdoll004/MocapControllerArtanim.cs +++ b/Assets/MarathonEnvs/Scripts/Ragdoll004/MocapControllerArtanim.cs @@ -338,6 +338,10 @@ public class MocapControllerArtanim : MonoBehaviour, IOnSensorCollision this._rigidbodyRoot = clone.GetComponent(); // set the layers ragdollForMocap.layer = this.gameObject.layer; + + + + foreach (Transform child in ragdollForMocap.transform) { child.gameObject.layer = this.gameObject.layer; @@ -346,13 +350,24 @@ public class MocapControllerArtanim : MonoBehaviour, IOnSensorCollision foreach (var rb in clone.GetComponentsInChildren()) { // remove cloned HandledOverlap + Transform t = rb.GetComponent(); + t.gameObject.layer = 3; var oldHandleOverlap = rb.GetComponent(); DestroyImmediate(oldHandleOverlap); var handleOverlap = rb.gameObject.AddComponent(); handleOverlap.Parent = clone.gameObject; + } - } + //var children = new List(); + //for (int i = 0; i < ragdollForMocap.transform.childCount; i++) + //{ + // children.Add(ragdollForMocap.transform.GetChild(i)); + //} + + //Debug.Log(children.Count); + + } void SetupSensors() { _sensors = GetComponentsInChildren() diff --git a/Assets/Scenes/DreconDemo.meta b/Assets/Scenes/DreconDemo.meta new file mode 100644 index 0000000..664ed31 --- /dev/null +++ b/Assets/Scenes/DreconDemo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1da46f26ae3e7f849be28d3950a7c876 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/DreconDemo.unity b/Assets/Scenes/DreconDemo.unity index 49020e5..34776ed 100644 --- a/Assets/Scenes/DreconDemo.unity +++ b/Assets/Scenes/DreconDemo.unity @@ -123,6 +123,96 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &153031623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 153031625} + - component: {fileID: 153031624} + - component: {fileID: 153031626} + m_Layer: 0 + m_Name: Cameras + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &153031624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153031623} + 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: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 6929616558284982652} + m_Follow: {fileID: 853179281038527757} + m_Lens: + FieldOfView: 10 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1187767391} +--- !u!4 &153031625 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153031623} + serializedVersion: 2 + m_LocalRotation: {x: -0.03985313, y: -0.7325023, z: -0.043042026, w: 0.67823267} + m_LocalPosition: {x: 5.3327937, y: 0.95045125, z: -1.2969661} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1187767391} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: -26.395, y: -109.011, z: 0} +--- !u!114 &153031626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153031623} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 449ef5ebbe24720439ec31d15f7b6f3d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FocusTracksTarget: 0 + m_FocusTracking: 1 + m_FocusTarget: {fileID: 0} + m_FocusOffset: 0 + m_Profile: {fileID: 11400000, guid: caceb0fea4f4dbe42acf97a8f550cb73, type: 2} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -135,6 +225,7 @@ GameObject: - component: {fileID: 330585545} - component: {fileID: 330585544} - component: {fileID: 330585547} + - component: {fileID: 330585548} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -181,11 +272,11 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 + near clip plane: 0.1 + far clip plane: 5000 + field of view: 10 orthographic: 0 - orthographic size: 5 + orthographic size: 10 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -209,8 +300,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: -0.03985313, y: -0.7325023, z: -0.043042026, w: 0.67823267} + m_LocalPosition: {x: 5.3327937, y: 0.95045125, z: -1.2969661} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -260,6 +351,40 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!114 &330585548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 1 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -378,6 +503,189 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 +--- !u!1 &901426195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 901426196} + - component: {fileID: 901426197} + m_Layer: 0 + m_Name: Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &901426196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901426195} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.6028565, y: 0.9275213, z: -1.5061438} + 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!114 &901426197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 901426195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: caceb0fea4f4dbe42acf97a8f550cb73, type: 2} +--- !u!1 &1187767390 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187767391} + - component: {fileID: 1187767394} + - component: {fileID: 1187767397} + - component: {fileID: 1187767396} + - component: {fileID: 1187767398} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1187767391 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187767390} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.0974358, y: -1.359113, z: 1.3125513} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 153031625} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1187767394 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187767390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1187767396 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187767390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0.12, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + 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 &1187767397 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187767390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 5.72, y: 0, z: 0.41} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 5.86 + m_YDamping: 8.53 + m_ZDamping: 5.58 + m_TargetMovementOnly: 1 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_CameraDistance: 0.85 + 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!114 &1187767398 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187767390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: e9ce97b7a206dc64d90931ea044e0c72, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + mNoiseOffsets: {x: 902.40234, y: -591.7914, z: 888.80176} --- !u!171741748 &23053004779861953 ArticulationBody: m_ObjectHideFlags: 0 @@ -568,7 +876,7 @@ SkinnedMeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8228515594848790567} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1858,7 +2166,7 @@ SkinnedMeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1900015315604627364} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -10984,3 +11292,5 @@ SceneRoots: - {fileID: 330585546} - {fileID: 410087041} - {fileID: 1714340264729177822} + - {fileID: 153031625} + - {fileID: 901426196} diff --git a/Assets/Scenes/DreconDemo/Volume Profile.asset b/Assets/Scenes/DreconDemo/Volume Profile.asset new file mode 100644 index 0000000..9a1469d --- /dev/null +++ b/Assets/Scenes/DreconDemo/Volume Profile.asset @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 4978638532793750748} + - {fileID: 6212357882823606190} +--- !u!114 &4978638532793750748 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 0 + mode: + m_OverrideState: 1 + m_Value: 1 + gaussianStart: + m_OverrideState: 1 + m_Value: 5.43 + gaussianEnd: + m_OverrideState: 1 + m_Value: 10 + gaussianMaxRadius: + m_OverrideState: 1 + m_Value: 1.5 + highQualitySampling: + m_OverrideState: 1 + m_Value: 1 + focusDistance: + m_OverrideState: 0 + m_Value: 10 + aperture: + m_OverrideState: 0 + m_Value: 5.6 + focalLength: + m_OverrideState: 0 + m_Value: 50 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &6212357882823606190 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 0 + mode: + m_OverrideState: 0 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 2 + intensity: + m_OverrideState: 1 + m_Value: 0 + clamp: + m_OverrideState: 1 + m_Value: 0.05 diff --git a/Assets/Scenes/DreconDemo/Volume Profile.asset.meta b/Assets/Scenes/DreconDemo/Volume Profile.asset.meta new file mode 100644 index 0000000..b51c227 --- /dev/null +++ b/Assets/Scenes/DreconDemo/Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: caceb0fea4f4dbe42acf97a8f550cb73 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 85e27d8..40db40b 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffb7ffffffffffffffffffffffb7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffffffffffffffffffffffffb7fffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_SimulationMode: 0 m_AutoSyncTransforms: 1 m_ReuseCollisionCallbacks: 0