diff --git a/Assets/Dimer1.prefab b/Assets/Dimer1.prefab index 6f49c8d..345e3dd 100644 --- a/Assets/Dimer1.prefab +++ b/Assets/Dimer1.prefab @@ -54,6 +54,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -152,6 +153,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -278,13 +280,9 @@ MonoBehaviour: onPickUp: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onDetachFromHand: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null snapAttachEaseInCompleted: 0 --- !u!136 &136875954272746600 CapsuleCollider: @@ -472,6 +470,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -583,6 +582,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -661,6 +661,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -739,6 +740,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -802,8 +804,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1308175507451450} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 2 + m_Shape: 0 m_Color: {r: 0.134, g: 0, b: 1, a: 1} m_Intensity: 1 m_Range: 1 @@ -909,6 +912,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -991,8 +995,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1438619484050454} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 2 + m_Shape: 0 m_Color: {r: 1, g: 0.7083694, b: 0.31617647, a: 1} m_Intensity: 2 m_Range: 0.05 @@ -1098,6 +1103,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1196,6 +1202,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1293,6 +1300,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1343,7 +1351,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625481556038498} m_LocalRotation: {x: -0, y: -0, z: -0.000000014901161, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0, z: 0} m_LocalScale: {x: 0.25000036, y: 0.25000003, z: 0.25000012} m_Children: - {fileID: 4289056372798722} @@ -3616,8 +3624,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -5151,7 +5212,7 @@ ParticleSystem: m_RotationOrder: 4 maxLights: 5 TrailModule: - enabled: 1 + enabled: 0 mode: 0 ratio: 1 lifetime: @@ -5967,7 +6028,7 @@ ParticleSystem: --- !u!199 &199978150578797382 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5979,6 +6040,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6081,6 +6143,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6193,6 +6256,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6271,6 +6335,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6363,6 +6428,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Monomer1.prefab b/Assets/Monomer1.prefab index 3a59b8f..bb3034c 100644 --- a/Assets/Monomer1.prefab +++ b/Assets/Monomer1.prefab @@ -55,6 +55,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -243,6 +244,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -369,13 +371,9 @@ MonoBehaviour: onPickUp: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null onDetachFromHand: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null snapAttachEaseInCompleted: 0 --- !u!136 &136920698392033670 CapsuleCollider: @@ -2817,8 +2815,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -4352,7 +4403,7 @@ ParticleSystem: m_RotationOrder: 4 maxLights: 5 TrailModule: - enabled: 1 + enabled: 0 mode: 0 ratio: 1 lifetime: @@ -5168,7 +5219,7 @@ ParticleSystem: --- !u!199 &199830151261386470 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5180,6 +5231,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7517,8 +7569,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -9868,7 +9973,7 @@ ParticleSystem: --- !u!199 &199153904607157124 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9880,6 +9985,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9983,6 +10089,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10065,8 +10172,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1540140240612370} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 2 + m_Shape: 0 m_Color: {r: 0.134, g: 0, b: 1, a: 1} m_Intensity: 1 m_Range: 1 @@ -10171,6 +10279,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10281,6 +10390,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Scripts/CartoonModeSwitch.cs b/Assets/Scripts/CartoonModeSwitch.cs index b5a7ef2..8e38b03 100644 --- a/Assets/Scripts/CartoonModeSwitch.cs +++ b/Assets/Scripts/CartoonModeSwitch.cs @@ -26,7 +26,14 @@ void Start () { void Update () { renderCartoonLM.value = myHandle.transform.localPosition.x; - if (renderCartoonLM.value < 0) + if (renderCartoonLM.value < -.2) { + renderCartoonLM.value = 0; + SynchronizeHandleToValue(); + } else if (renderCartoonLM.value > .2) { + renderCartoonLM.value = 1; + SynchronizeHandleToValue(); + } + if (renderCartoonLM.value <= 0) { renderCartoonText.text = "internal structure"; renderCartoon = true; diff --git a/Assets/Scripts/PHSlider.cs b/Assets/Scripts/PHSlider.cs index 2c8082b..fa6824a 100644 --- a/Assets/Scripts/PHSlider.cs +++ b/Assets/Scripts/PHSlider.cs @@ -57,6 +57,13 @@ void Update() /// private void SetPhFromLinearMapping(){ linearMapping.value = myHandle.transform.localPosition.y / 5; + if (linearMapping.value < 0) { + linearMapping.value = 0; + SynchronizeHandleToValue(); + } else if (linearMapping.value > 1) { + linearMapping.value = 1; + SynchronizeHandleToValue(); + } if (currentLinearMapping == linearMapping.value) { return; diff --git a/Assets/Scripts/PartyModeSwitch.cs b/Assets/Scripts/PartyModeSwitch.cs index 7d3dd45..88dc1a1 100644 --- a/Assets/Scripts/PartyModeSwitch.cs +++ b/Assets/Scripts/PartyModeSwitch.cs @@ -23,7 +23,14 @@ public class PartyModeSwitch : MonoBehaviour, IMenu void Update () { linearMapping.value = myHandle.transform.localPosition.x; - if (linearMapping.value < 0) + if (linearMapping.value < -.2) { + linearMapping.value = 0; + SynchronizeHandleToValue(); + } else if (linearMapping.value > .2) { + linearMapping.value = 1; + SynchronizeHandleToValue(); + } + if (linearMapping.value <= 0) { EnablePartyMode(); } diff --git a/Assets/quest.unity b/Assets/quest.unity index 8ff8073..c493125 100644 --- a/Assets/quest.unity +++ b/Assets/quest.unity @@ -9100,7 +9100,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527419595} m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} - m_LocalPosition: {x: 0.18, y: -0.17, z: 0.02} + m_LocalPosition: {x: 0.144, y: -0.218, z: 0.032} m_LocalScale: {x: 0.2, y: 0.20000002, z: 0.20000002} m_Children: - {fileID: 955015939} @@ -10350,7 +10350,6 @@ Transform: - {fileID: 878816813} - {fileID: 1864829299} - {fileID: 254680974} - - {fileID: 1443041448} m_Father: {fileID: 92915873} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18692,7 +18691,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1086804386} m_LocalRotation: {x: -0.27059782, y: -0.6532805, z: 0.2705986, w: 0.6532824} - m_LocalPosition: {x: 0.194, y: 0.3070008, z: -0.4009998} + m_LocalPosition: {x: 0.209, y: 0.30700082, z: -0.4009998} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 113776765} @@ -21702,7 +21701,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1251623144} m_LocalRotation: {x: -0.2705978, y: -0.6532805, z: 0.2705986, w: 0.6532824} - m_LocalPosition: {x: -0.0000064074993, y: 0, z: 0} + m_LocalPosition: {x: 0.0000017881393, y: 0, z: 0.00000059604645} m_LocalScale: {x: 10, y: 10, z: 10} m_Children: - {fileID: 545942484} @@ -25274,8 +25273,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443041447} - m_LocalRotation: {x: -0.6743797, y: -0.21263112, z: -0.6743797, w: 0.21263112} - m_LocalPosition: {x: -0.067, y: 0, z: -0.034} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0.106, y: 0.159, z: 0.0165} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 527419596} @@ -25285,9 +25284,9 @@ Transform: - {fileID: 1423971031} - {fileID: 1879960625} - {fileID: 1155335785} - m_Father: {fileID: 629099960} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: -145, y: -90, z: 0} + m_Father: {fileID: 1957630446} + m_RootOrder: 32 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1443902192 GameObject: m_ObjectHideFlags: 0 @@ -33983,7 +33982,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1883385211} m_LocalRotation: {x: -0.27059785, y: -0.6532805, z: 0.27059862, w: 0.6532824} - m_LocalPosition: {x: 0.206, y: 0.30699998, z: -0.40100005} + m_LocalPosition: {x: 0.227, y: 0.30700004, z: -0.40099996} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1856667582} @@ -35342,6 +35341,12 @@ Transform: m_Father: {fileID: 1290969749} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1957630446 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4562126893162318, guid: c6a74181d4000004887343fb87b3c53a, + type: 3} + m_PrefabInstance: {fileID: 1864829298} + m_PrefabAsset: {fileID: 0} --- !u!1 &1960783967 GameObject: m_ObjectHideFlags: 0