diff --git a/Assets/Scenes/WACVR.unity b/Assets/Scenes/WACVR.unity index 21e7881..a9d4293 100644 --- a/Assets/Scenes/WACVR.unity +++ b/Assets/Scenes/WACVR.unity @@ -1278,7 +1278,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -6493913391331992944, guid: 0f61ebe746c23ef42b8010bd8ac1e3ab, + m_Reference: {fileID: 1010738217276881514, guid: 0f61ebe746c23ef42b8010bd8ac1e3ab, type: 3} --- !u!114 &79733605 MonoBehaviour: @@ -1309,7 +1309,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 6972639530819350904, guid: 0f61ebe746c23ef42b8010bd8ac1e3ab, + m_Reference: {fileID: -8198699208435500284, guid: 0f61ebe746c23ef42b8010bd8ac1e3ab, type: 3} m_RightHandMoveAction: m_UseReference: 0 @@ -1527,7 +1527,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &90549604 BoxCollider: @@ -11394,7 +11394,7 @@ MonoBehaviour: m_EditorClassIdentifier: isTP: 1 tpCamera: {fileID: 1740661838} - fpsCamera: {fileID: 0} + fpsCamera: {fileID: 263796134} audioSrc: {fileID: 25651916} --- !u!65 &998415429 BoxCollider: @@ -17701,59 +17701,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1698092714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1698092716} - - component: {fileID: 1698092715} - m_Layer: 0 - m_Name: Light Probe Group - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!220 &1698092715 -LightProbeGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1698092714} - m_Enabled: 1 - m_SourcePositions: - - {x: 1, y: 1, z: 1} - - {x: 1, y: 1, z: -1} - - {x: 1, y: -1, z: 1} - - {x: 1, y: -1, z: -1} - - {x: -1, y: 1, z: 1} - - {x: -1, y: 1, z: -1} - - {x: -1, y: -1, z: 1} - - {x: -1, y: -1, z: -1} - - {x: 0, y: 0.004435927, z: 0.8256016} - - {x: 0, y: 0.0020789886, z: -0.19790208} - - {x: 0.0055344016, y: 0.4854216, z: 0.9691827} - m_Dering: 1 ---- !u!4 &1698092716 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1698092714} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.34, z: -1.13} - m_LocalScale: {x: 2.42, y: 1.13, z: 1.13} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1699975369 GameObject: m_ObjectHideFlags: 0 @@ -22726,6 +22673,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1.025 objectReference: {fileID: 0} + - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.000226 + objectReference: {fileID: 0} + - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.012694 + objectReference: {fileID: 0} - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_ConstrainProportionsScale @@ -23929,7 +23886,7 @@ PrefabInstance: - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalPosition.y - value: -0.00022 + value: -0.00023 objectReference: {fileID: 0} - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -28208,7 +28165,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1840065107 BoxCollider: @@ -34890,7 +34847,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4132370725483181716} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.02819936, y: 0.000000044703484, z: -0.0000000037252903} + m_LocalPosition: {x: -0.028199367, y: 0.000000040978193, z: 0} m_LocalScale: {x: 1.1738298, y: 0.99999976, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -34921,8 +34878,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3430441728000144673} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.01999057, y: -0.00000003989793, z: -0.000000007450581} - m_LocalScale: {x: 1.1407824, y: 1.0000005, z: 1} + m_LocalPosition: {x: -0.019990563, y: -0.000000037401843, z: -0.000000014901161} + m_LocalScale: {x: 1.1407824, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6865718682060524960} @@ -34954,7 +34911,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5573350093377499391} m_LocalRotation: {x: -0, y: -0, z: 0.0000000013969839, w: 1} - m_LocalPosition: {x: -0.051807564, y: 9.313226e-10, z: 0.000000016763806} + m_LocalPosition: {x: -0.051807564, y: -0.000000006170012, z: 0.0000000121071935} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -34969,8 +34926,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6640547207365133130} - m_LocalRotation: {x: 0.65149885, y: -0.0263126, z: 0.74830925, w: 0.12202538} - m_LocalPosition: {x: 0.009299212, y: 0.01125808, z: 0.020413082} + m_LocalRotation: {x: 0.6514989, y: -0.026312554, z: 0.7483092, w: 0.12202541} + m_LocalPosition: {x: 0.009299207, y: 0.01125808, z: 0.020413078} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -34985,8 +34942,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716313783523344810} - m_LocalRotation: {x: -0, y: -0, z: 0.0000000018626449, w: 1} - m_LocalPosition: {x: -0.04795774, y: -0.000000062864274, z: -0.000000022351742} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.04795775, y: -0.00000006053597, z: -0.000000022118911} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35001,8 +34958,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5904268464620118195} - m_LocalRotation: {x: 0.59079105, y: -0.10473216, z: 0.78657216, w: 0.14595024} - m_LocalPosition: {x: 0.019127756, y: 0.005076389, z: 0.022347966} + m_LocalRotation: {x: 0.59079105, y: -0.10473215, z: 0.78657204, w: 0.14595029} + m_LocalPosition: {x: 0.01912775, y: 0.005076389, z: 0.022347964} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35036,8 +34993,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5067349274084691898} - m_LocalRotation: {x: -0, y: -0, z: -6.984919e-10, w: 1} - m_LocalPosition: {x: -0.060847066, y: 0.000000017578714, z: -0.000000022395398} + m_LocalRotation: {x: -0, y: -0, z: 7.566996e-10, w: 1} + m_LocalPosition: {x: -0.060847066, y: 0.0000000121071935, z: -0.000000030660885} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35053,7 +35010,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3026741579619398525} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.04128526, y: -0.0000000055879354, z: -0.0000000027939677} + m_LocalPosition: {x: -0.04128526, y: -0.000000009313226, z: -0.0000000037252903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35100,7 +35057,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5410225876260837038} - m_LocalRotation: {x: 0.28813466, y: -0.5185358, z: 0.39487815, w: -0.7015485} + m_LocalRotation: {x: 0.28813463, y: -0.51853585, z: 0.39487815, w: -0.7015485} m_LocalPosition: {x: -0.17739609, y: -0.18077399, z: 0.20514035} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -35117,7 +35074,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3749120158382215621} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0355328, y: 0.00000004310558, z: 0} + m_LocalPosition: {x: -0.035532802, y: 0.000000042576097, z: 0.000000007450581} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -35199,8 +35156,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6169819503582498194} - m_LocalRotation: {x: 0.7620503, y: 0.05683576, z: 0.64323217, w: 0.04797411} - m_LocalPosition: {x: -0.0106029995, y: 0.010812533, z: 0.023641858} + m_LocalRotation: {x: 0.76205033, y: 0.056835763, z: 0.6432321, w: 0.047974117} + m_LocalPosition: {x: -0.010603005, y: 0.010812533, z: 0.023641862} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -36470,7 +36427,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2259999406341563148} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.036953088, y: -0.000000012003948, z: 0.0000000034924597} + m_LocalPosition: {x: -0.03695308, y: -0.0000000139830085, z: 0.0000000037252903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -36735,8 +36692,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6695050964844364514} - m_LocalRotation: {x: 0.5351684, y: -0.3575551, z: -0.019904876, w: 0.7650836} - m_LocalPosition: {x: -0.02854015, y: 0.004912787, z: -0.025196552} + m_LocalRotation: {x: 0.5351684, y: -0.35755515, z: -0.019904874, w: 0.7650836} + m_LocalPosition: {x: -0.028540144, y: 0.004912788, z: -0.025196556} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -36782,8 +36739,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 538319844972852557} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.023518872, y: -0.00000002127348, z: 0.000000026775524} - m_LocalScale: {x: 1.1291406, y: 1.0000001, z: 0.9999998} + m_LocalPosition: {x: -0.023518845, y: -0.000000014326284, z: 0.000000027008355} + m_LocalScale: {x: 1.1291406, y: 0.9999998, z: 0.9999999} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4221411138600420476} @@ -36811,8 +36768,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2206138008483047393} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.016176477, y: -0.000000039986613, z: 0.0000000011641532} - m_LocalScale: {x: 1.3437861, y: 1.0000008, z: 0.99999994} + m_LocalPosition: {x: -0.016176485, y: -0.000000040512532, z: -4.656613e-10} + m_LocalScale: {x: 1.3437861, y: 1.000001, z: 0.99999994} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3371950482210857493} @@ -36890,7 +36847,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4662424310893189105} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.039865013, y: 0.000000008182345, z: -0.000000014901161} + m_LocalPosition: {x: -0.039865024, y: 0.00000001607381, z: -0.000000014901161} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -36905,8 +36862,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1528925023998772697} - m_LocalRotation: {x: -0, y: -0, z: -0.0000000025029292, w: 1} - m_LocalPosition: {x: -0.057702873, y: 0.00000004284084, z: 0.000000022351742} + m_LocalRotation: {x: -0.0000000074505797, y: -0, z: 0.000000003026798, w: 1} + m_LocalPosition: {x: -0.05770287, y: 0.000000035390258, z: 0.000000014901161} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -37973,8 +37930,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1838837016619199698} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.022911437, y: 0.0000000016938291, z: -0.0000000069849193} - m_LocalScale: {x: 1.147907, y: 1, z: 0.99999994} + m_LocalPosition: {x: -0.022911444, y: 0.0000000070489334, z: -0.00000001071021} + m_LocalScale: {x: 1.147907, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5368281204346571926} @@ -38094,8 +38051,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6240631006074444401} - m_LocalRotation: {x: -0.07399492, y: -0.009242207, z: -0.07527782, w: 0.99437046} - m_LocalPosition: {x: -0.039762497, y: -0.01257918, z: -0.00871058} + m_LocalRotation: {x: -0.073994935, y: -0.009242266, z: -0.075277865, w: 0.99437046} + m_LocalPosition: {x: -0.039762497, y: -0.01257918, z: -0.008710587} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38111,7 +38068,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1716433686722169745} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.029244501, y: -0.000000040978193, z: -0.000000007450581} + m_LocalPosition: {x: -0.02924449, y: -0.000000042405063, z: -0.000000011175868} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38366,7 +38323,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8691136660814886320} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.036953066, y: 0.000000018488791, z: 0} + m_LocalPosition: {x: -0.036953058, y: 0.000000014763501, z: 0.0000000015227164} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38445,7 +38402,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2843035768736497997} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.03986499, y: 0.00000003609756, z: -0.00000003306195} + m_LocalPosition: {x: -0.039865002, y: 0.000000037566515, z: -0.000000031199306} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38523,8 +38480,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8745419925326491997} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.016176462, y: -0.0000000018626451, z: 0.000000007450581} - m_LocalScale: {x: 1.3437865, y: 0.9999997, z: 1.0000001} + m_LocalPosition: {x: -0.01617647, y: -0.0000000034842422, z: 0.000000007450581} + m_LocalScale: {x: 1.3437865, y: 0.99999976, z: 0.9999997} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5263490648690488489} @@ -38556,8 +38513,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6969391656505025521} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.02351882, y: -0.00000003085138, z: 0.000000037252903} - m_LocalScale: {x: 1.1291404, y: 1.0000001, z: 0.9999999} + m_LocalPosition: {x: -0.023518816, y: -0.000000030591274, z: 0.000000022351742} + m_LocalScale: {x: 1.1291404, y: 1.0000005, z: 0.9999998} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6725361686310294208} @@ -38571,8 +38528,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4263121744732394590} - m_LocalRotation: {x: 0.7938255, y: 0.39249596, z: 0.28816622, w: -0.36434624} - m_LocalPosition: {x: -0.017273605, y: -0.005359437, z: 0.032491885} + m_LocalRotation: {x: 0.79382557, y: 0.39249596, z: 0.28816617, w: -0.36434624} + m_LocalPosition: {x: -0.017273607, y: -0.005359438, z: 0.032491885} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38730,8 +38687,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3556457321568718029} - m_LocalRotation: {x: 0.7096613, y: 0.00090705644, z: 0.6965909, w: 0.105551854} - m_LocalPosition: {x: -0.00078760204, y: 0.012132612, z: 0.02126948} + m_LocalRotation: {x: 0.7096613, y: 0.000907101, z: 0.6965909, w: 0.10555182} + m_LocalPosition: {x: -0.0007876095, y: 0.012132612, z: 0.02126948} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38747,7 +38704,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8075447377399192877} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.02924443, y: 0.00000007414909, z: -0.0000000030267984} + m_LocalPosition: {x: -0.029244423, y: 0.00000006752089, z: -0.000000008381903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38827,8 +38784,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9098647030989257326} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.022911444, y: 0.0000000055025833, z: -0.000000007450581} - m_LocalScale: {x: 1.147907, y: 1, z: 1} + m_LocalPosition: {x: -0.022911444, y: -0.0000000056732876, z: -0.000000008816209} + m_LocalScale: {x: 1.147907, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3296573984380820010} @@ -38857,8 +38814,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8284348389673194341} - m_LocalRotation: {x: -0, y: -0, z: -0.0000000024447218, w: 1} - m_LocalPosition: {x: -0.057702918, y: -0.000000065920176, z: 0.000000010244548} + m_LocalRotation: {x: -0, y: -0, z: 4.656613e-10, w: 1} + m_LocalPosition: {x: -0.05770292, y: -0.00000006998016, z: 0.000000005820766} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38904,7 +38861,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5213865795939722141} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.019990563, y: -0.000000018887208, z: -0.000000006679329} + m_LocalPosition: {x: -0.019990563, y: -0.0000000043353214, z: -0.000000012252713} m_LocalScale: {x: 1.1407828, y: 0.9999998, z: 1.0000004} m_ConstrainProportionsScale: 0 m_Children: @@ -38948,8 +38905,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6816513069343973416} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.028199382, y: 0.000000013038516, z: -0.000000004656613} - m_LocalScale: {x: 1.1738296, y: 0.99999994, z: 1} + m_LocalPosition: {x: -0.028199375, y: 0.000000016763806, z: 0.0000000018626451} + m_LocalScale: {x: 1.1738296, y: 1, z: 0.99999994} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1500245604748373337} @@ -38976,8 +38933,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4316640054179911158} - m_LocalRotation: {x: -0.10489069, y: 0.06845519, z: -0.06767917, w: 0.9898138} - m_LocalPosition: {x: -0.040618926, y: -0.011704706, z: 0.001376221} + m_LocalRotation: {x: -0.104890674, y: 0.06845513, z: -0.06767921, w: 0.9898138} + m_LocalPosition: {x: -0.04061893, y: -0.011704702, z: 0.0013762154} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -38992,8 +38949,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2249177436517029654} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.04795767, y: 0.00000005401671, z: 0.000000022351742} + m_LocalRotation: {x: 0.000000029802319, y: -0, z: 0.0000000074505797, w: 1} + m_LocalPosition: {x: -0.047957666, y: 0.000000052154064, z: 0.000000011175871} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39021,8 +38978,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3069409455629936195} - m_LocalRotation: {x: -0, y: -0, z: -0.0000000018626451, w: 1} - m_LocalPosition: {x: -0.05180757, y: -0.000000013038516, z: 0.000000007450581} + m_LocalRotation: {x: -0, y: 0.000000029802322, z: -0.0000000018626451, w: 1} + m_LocalPosition: {x: -0.05180757, y: -0.000000020489097, z: 0.0000000037252903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39081,7 +39038,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6036990814742841209} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.035532825, y: 0.000000017703698, z: -0.0000000086729415} + m_LocalPosition: {x: -0.035532825, y: 0.000000014605691, z: -0.000000009589712} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39109,7 +39066,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3230422369903083538} - m_LocalRotation: {x: -0.28813463, y: 0.5185359, z: -0.39487806, w: 0.7015485} + m_LocalRotation: {x: -0.2881346, y: 0.518536, z: -0.39487806, w: 0.7015485} m_LocalPosition: {x: -0.17739601, y: -0.18077394, z: 0.2051403} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -39184,7 +39141,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5602788739974014401} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.04128523, y: 0.000000007450581, z: 0.000000048428774} + m_LocalPosition: {x: -0.04128523, y: 0.000000011175871, z: 0.000000052154064} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39231,8 +39188,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2419251670711867654} - m_LocalRotation: {x: -0, y: -0, z: 0.0000000037252903, w: 1} - m_LocalPosition: {x: -0.06084707, y: -0.000000015832484, z: 0.000000007450581} + m_LocalRotation: {x: -0, y: -0, z: -0.0000000037252899, w: 1} + m_LocalPosition: {x: -0.060847074, y: -0.000000016763806, z: 0.000000022351742} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39274,8 +39231,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3904641906458686991} - m_LocalRotation: {x: -0.17725916, y: 0.13843817, z: -0.029145628, w: 0.9739429} - m_LocalPosition: {x: -0.038684007, y: -0.005522959, z: 0.011204775} + m_LocalRotation: {x: -0.17725918, y: 0.1384381, z: -0.029145643, w: 0.9739429} + m_LocalPosition: {x: -0.03868401, y: -0.005522955, z: 0.011204768} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39380,8 +39337,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3629802225551022894} - m_LocalRotation: {x: 0.006266251, y: -0.0840171, z: -0.07411179, w: 0.99368477} - m_LocalPosition: {x: -0.037390172, y: -0.011259187, z: -0.018525947} + m_LocalRotation: {x: 0.006266266, y: -0.08401713, z: -0.074111834, w: 0.9936847} + m_LocalPosition: {x: -0.037390165, y: -0.011259187, z: -0.01852595} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Script/LightManager/LightManager.cs b/Assets/Script/LightManager/LightManager.cs index 1694bfb..d874312 100644 --- a/Assets/Script/LightManager/LightManager.cs +++ b/Assets/Script/LightManager/LightManager.cs @@ -8,7 +8,8 @@ public class LightManager : MonoBehaviour { public List Lights = new List(); List Materials = new List(); - public static bool useIPC = true; + public static bool useIPC = false; + public static bool useIPC_Config = true; static Texture2D RGBColor2D; public static MemoryMappedFile sharedBuffer; @@ -20,9 +21,9 @@ public class LightManager : MonoBehaviour private void Start() { if (JsonConfiguration.HasKey("useIPC")) - useIPC = JsonConfiguration.GetBoolean("useIPC"); + useIPC_Config = JsonConfiguration.GetBoolean("useIPC"); else - JsonConfiguration.SetBoolean("useIPC", useIPC); + JsonConfiguration.SetBoolean("useIPC", useIPC_Config); for (int i = 0; i < Lights.Count; i++) Materials.Add(Lights[i].GetComponent().material); @@ -37,9 +38,18 @@ public class LightManager : MonoBehaviour } private void Update() { + if (!useIPC_Config) + CheckIPCState(); if (useIPC) UpdateLED(); } + private void CheckIPCState() + { + if (RGBColor2D.GetPixel(0 , 0).a == 0) + useIPC = false; + else + useIPC = true; + } private void InitializeIPC(string sharedMemoryName, int sharedMemorySize) { MemoryMappedFileSecurity CustomSecurity = new MemoryMappedFileSecurity(); @@ -85,6 +95,7 @@ public class LightManager : MonoBehaviour if (State) { Materials[Area].SetColor("_EmissionColor", new Color(1f, 1f, 1f, 1f)); + Materials[Area].SetColor("_EmissionColor2", new Color(1f, 1f, 1f, 1f)); } else { @@ -100,6 +111,7 @@ public class LightManager : MonoBehaviour { float p = 1 - time / FadeDuration; mat.SetColor("_EmissionColor", new Color(p, p, p, 1f)); + mat.SetColor("_EmissionColor2", new Color(p, p, p, 1f)); yield return null; } } diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset index b96fa49..47d09c2 100644 --- a/ProjectSettings/PresetManager.asset +++ b/ProjectSettings/PresetManager.asset @@ -25,6 +25,20 @@ PresetManager: type: 2} m_Filter: m_Disabled: 0 + - first: + m_NativeTypeID: 114 + m_ManagedTypePPtr: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, + type: 3} + m_ManagedTypeFallback: + second: + - m_Preset: {fileID: 2655988077585873504, guid: 1421ad86ff3787b4dae70fe9e699a25f, + type: 2} + m_Filter: right + m_Disabled: 0 + - m_Preset: {fileID: 2655988077585873504, guid: ffd8268f7307a0c48a067dad4a8fe060, + type: 2} + m_Filter: left + m_Disabled: 0 - first: m_NativeTypeID: 114 m_ManagedTypePPtr: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927, @@ -35,17 +49,3 @@ PresetManager: type: 2} m_Filter: m_Disabled: 0 - - first: - m_NativeTypeID: 114 - m_ManagedTypePPtr: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, - type: 3} - m_ManagedTypeFallback: - second: - - m_Preset: {fileID: 2655988077585873504, guid: 1421ad86ff3787b4dae70fe9e699a25f, - type: 2} - m_Filter: - m_Disabled: 0 - - m_Preset: {fileID: 2655988077585873504, guid: ffd8268f7307a0c48a067dad4a8fe060, - type: 2} - m_Filter: - m_Disabled: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 23813ff..eb758c0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,8 +137,6 @@ PlayerSettings: bundleVersion: 0.1.1 preloadedAssets: - {fileID: 11400000, guid: 74eeb7429f216ca45a7093c586513e98, type: 2} - - {fileID: -6348321304186183749, guid: 6460523340b221f4ea5611d2c011a26c, type: 2} - - {fileID: -6265376527240436808, guid: 5e2dc0db42cc5b3459a781fecb0b76f9, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1