diff --git a/Assets/Default Lighting.lighting b/Assets/Default Lighting.lighting index 7caddfa..15a36a0 100644 --- a/Assets/Default Lighting.lighting +++ b/Assets/Default Lighting.lighting @@ -16,9 +16,9 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 0 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 + m_BakeBackend: 2 + m_LightmapMaxSize: 2048 + m_BakeResolution: 256 m_Padding: 2 m_LightmapCompression: 3 m_AO: 0 @@ -27,7 +27,7 @@ LightingSettings: m_CompAOExponentDirect: 0 m_ExtractAO: 0 m_MixedBakeMode: 1 - m_LightmapsBakeMode: 1 + m_LightmapsBakeMode: 0 m_FilterMode: 1 m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 @@ -38,24 +38,24 @@ LightingSettings: m_FinalGather: 0 m_FinalGatherRayCount: 256 m_FinalGatherFiltering: 1 - m_PVRCulling: 1 + m_PVRCulling: 0 m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 256 - m_PVREnvironmentSampleCount: 128 + m_PVRDirectSampleCount: 2048 + m_PVRSampleCount: 1024 + m_PVREnvironmentSampleCount: 512 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 1 - m_PVREnvironmentMIS: 1 - m_PVRFilteringMode: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 2 m_PVRDenoiserTypeIndirect: 2 m_PVRDenoiserTypeAO: 1 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 2 + m_PVRFilteringGaussRadiusDirect: 5 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 m_PVRFilteringAtrousPositionSigmaDirect: 0.5 diff --git a/Assets/Material/Room/Wall.mat b/Assets/Material/Room/Wall.mat index f67bb22..b50669d 100644 --- a/Assets/Material/Room/Wall.mat +++ b/Assets/Material/Room/Wall.mat @@ -110,8 +110,8 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.59117126, g: 0.7169812, b: 0.65470546, a: 1} - - _Color: {r: 0.59117126, g: 0.7169812, b: 0.65470546, a: 1} + - _BaseColor: {r: 0.70164704, g: 0.852, b: 0.7784941, a: 1} + - _Color: {r: 0.70164704, g: 0.852, b: 0.7784941, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Material/Touch Shader.shadergraph b/Assets/Material/Touch Shader.shadergraph index 71cc936..2097086 100644 --- a/Assets/Material/Touch Shader.shadergraph +++ b/Assets/Material/Touch Shader.shadergraph @@ -137,6 +137,12 @@ }, { "m_Id": "17c3ef2ff1ec47159139ef552eebab0b" + }, + { + "m_Id": "26d21d3fc0474d0ebaf1f28cdf0c924f" + }, + { + "m_Id": "bb598077ef2d43d5bd4ca10e9598eb3a" } ], "m_GroupDatas": [], @@ -198,6 +204,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "26d21d3fc0474d0ebaf1f28cdf0c924f" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "bb598077ef2d43d5bd4ca10e9598eb3a" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -403,7 +423,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "c7ebaa82989149698450bb6c7c25e463" + "m_Id": "26d21d3fc0474d0ebaf1f28cdf0c924f" }, "m_SlotId": 0 } @@ -422,6 +442,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bb598077ef2d43d5bd4ca10e9598eb3a" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c7ebaa82989149698450bb6c7c25e463" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -509,8 +543,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 776.0000610351563, - "y": 26.4000301361084 + "x": 776.0, + "y": 259.20001220703127 }, "m_Blocks": [ { @@ -527,7 +561,7 @@ "m_FragmentContext": { "m_Position": { "x": 776.0000610351563, - "y": 280.0 + "y": 515.2000122070313 }, "m_Blocks": [ { @@ -696,10 +730,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 592.0000610351563, - "y": 664.7999877929688, - "width": 207.99993896484376, - "height": 359.20001220703127 + "x": 423.9999694824219, + "y": 827.1998901367188, + "width": 208.00009155273438, + "height": 359.20013427734377 } }, "m_Slots": [ @@ -859,10 +893,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1113.599853515625, - "y": 813.5999755859375, - "width": 207.99993896484376, - "height": 301.5999755859375 + "x": -1004.0000610351563, + "y": 808.7999877929688, + "width": 208.0, + "height": 301.60003662109377 } }, "m_Slots": [ @@ -925,7 +959,7 @@ "m_StageCapability": 3, "m_Value": { "x": 0.0, - "y": 0.30000001192092898 + "y": 0.3499999940395355 }, "m_DefaultValue": { "x": 0.0, @@ -999,9 +1033,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 170.3999786376953, - "y": 652.0, - "width": 207.99998474121095, + "x": 170.39999389648438, + "y": 671.9999389648438, + "width": 208.0001220703125, "height": 359.20001220703127 } }, @@ -1098,6 +1132,48 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "26d21d3fc0474d0ebaf1f28cdf0c924f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -992.800048828125, + "y": 1186.4000244140625, + "width": 208.0, + "height": 301.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "b3584b688e7a42168ea08c640efa7a0c" + }, + { + "m_Id": "60fec0742b774999983df695ea651e0c" + }, + { + "m_Id": "ffcd2eec0933409ab7ef12fe1f7aaf6f" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1320,6 +1396,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4cbc543ca1854515b33e1240a276d78b", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -1600,6 +1700,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "60fec0742b774999983df695ea651e0c", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 1.0, + "e01": 0.75, + "e02": 1.0, + "e03": 1.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1615,6 +1763,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6333f7b65ac445f0b64e50d6cc93b179", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -1666,9 +1838,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 437.60003662109377, - "y": 894.4000854492188, - "width": 112.800048828125, + "x": 264.8000793457031, + "y": 1186.4000244140625, + "width": 113.60003662109375, "height": 33.5999755859375 } }, @@ -1737,10 +1909,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 10.40001106262207, - "y": 1012.0, + "x": 0.00000897138670552522, + "y": 1140.8001708984375, "width": 208.0, - "height": 325.60009765625 + "height": 325.599853515625 } }, "m_Slots": [ @@ -1817,10 +1989,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -521.5999755859375, - "y": 1124.8001708984375, - "width": 163.199951171875, - "height": 33.5999755859375 + "x": -615.9998779296875, + "y": 1303.9998779296875, + "width": 163.19992065429688, + "height": 33.60009765625 } }, "m_Slots": [ @@ -1936,6 +2108,30 @@ "m_BlendMode": 21 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "70e215f3036f4bf4af3f15380cef97d8", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.125, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2530,8 +2726,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1479.9998779296875, - "y": 1002.39990234375, + "x": -1346.39990234375, + "y": 1060.800048828125, "width": 208.0, "height": 311.199951171875 } @@ -2901,6 +3097,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "b3584b688e7a42168ea08c640efa7a0c", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3012,6 +3256,48 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "bb598077ef2d43d5bd4ca10e9598eb3a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -683.2000122070313, + "y": 1186.4000244140625, + "width": 207.99990844726563, + "height": 301.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "6333f7b65ac445f0b64e50d6cc93b179" + }, + { + "m_Id": "70e215f3036f4bf4af3f15380cef97d8" + }, + { + "m_Id": "4cbc543ca1854515b33e1240a276d78b" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3097,10 +3383,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -292.8000183105469, - "y": 1008.0, - "width": 208.0, - "height": 349.60009765625 + "x": -396.7999267578125, + "y": 1162.4000244140625, + "width": 208.0000457763672, + "height": 349.5999755859375 } }, "m_Slots": [ @@ -3626,10 +3912,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -742.3999633789063, - "y": 745.5999755859375, - "width": 207.99993896484376, - "height": 359.2000732421875 + "x": -676.0000610351563, + "y": 781.6000366210938, + "width": 208.00009155273438, + "height": 359.20013427734377 } }, "m_Slots": [ @@ -3709,3 +3995,51 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ffcd2eec0933409ab7ef12fe1f7aaf6f", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + diff --git a/Assets/Material/WacUnity/Light.mat b/Assets/Material/WacUnity/Light.mat index 6de88b2..da80fb5 100644 --- a/Assets/Material/WacUnity/Light.mat +++ b/Assets/Material/WacUnity/Light.mat @@ -108,8 +108,8 @@ Material: - _GlossinessSource: 0 - _GlossyReflections: 1 - _LineCount: 8 - - _LineEmitOpasity: 0.2 - - _LineHight: 0.1 + - _LineEmitOpasity: 0.25 + - _LineHight: 0.15 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -126,14 +126,15 @@ Material: - _SrcBlend: 1 - _Surface: 0 - _UVSec: 0 - - _Vignett: 0.4 + - _Vignett: 0.5 - _VignettHardness: -0.15 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1} + - _BaseColor: {r: 0.12887147, g: 0.18042988, b: 0.18867922, a: 1} - _Color: {r: 0.34905657, g: 0.34905657, b: 0.34905657, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor2: {r: 0, g: 0, b: 0, a: 0} - _LineColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Material/WacUnity/Plate.mat b/Assets/Material/WacUnity/Plate.mat index c9d2d0d..502f172 100644 --- a/Assets/Material/WacUnity/Plate.mat +++ b/Assets/Material/WacUnity/Plate.mat @@ -108,8 +108,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.37868667, g: 0.5377358, b: 0.35206476, a: 1} - - _Color: {r: 0.37868664, g: 0.53773576, b: 0.35206473, a: 1} + - _BaseColor: {r: 0.43756205, g: 0.618, b: 0.4059854, a: 1} + - _Color: {r: 0.43756202, g: 0.618, b: 0.40598536, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Model/Room.fbx b/Assets/Model/Room.fbx index 44bae72..c02bffc 100644 Binary files a/Assets/Model/Room.fbx and b/Assets/Model/Room.fbx differ diff --git a/Assets/Model/WacUnity.fbx b/Assets/Model/WacUnity.fbx index 9960733..23d60dd 100644 Binary files a/Assets/Model/WacUnity.fbx and b/Assets/Model/WacUnity.fbx differ diff --git a/Assets/Scenes/WACVR.unity b/Assets/Scenes/WACVR.unity index 4c69062..21e7881 100644 --- a/Assets/Scenes/WACVR.unity +++ b/Assets/Scenes/WACVR.unity @@ -1673,17 +1673,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 112502616} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.477} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 37.354347, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1499264057} - m_RootOrder: 7 + m_Father: {fileID: 968258290} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -0.05489991} + m_AnchoredPosition: {x: -3.249829, y: 0.007200066} m_SizeDelta: {x: 1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &112502618 @@ -10643,17 +10643,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 937211619} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.477} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 37.354347, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1499264057} - m_RootOrder: 6 + m_Father: {fileID: 968258290} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.048} + m_AnchoredPosition: {x: 0.59393406, y: 0.0072000027} m_SizeDelta: {x: 1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &937211621 @@ -10995,7 +10995,10 @@ Transform: m_LocalPosition: {x: 0.0072, y: 0.03210009, z: -0.477} m_LocalScale: {x: 0.026770644, y: 1, z: 0.05} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1989318070} + - {fileID: 937211620} + - {fileID: 112502617} m_Father: {fileID: 1499264057} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} @@ -11033,7 +11036,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c8de957e93e85224b8a2524675e7691d, type: 2} + - {fileID: 2100000, guid: 9293cbadfcfd55243bd53fc0e7f4ca21, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12537,20 +12540,25 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: -6635190872123795447, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: -4889201344145374300, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.x - value: 0.32 + value: 0.21 objectReference: {fileID: 0} - target: {fileID: -4889201344145374300, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.y - value: 2.42 + value: 2.99 objectReference: {fileID: 0} - target: {fileID: -4889201344145374300, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.z - value: -1.45 + value: -0.9 objectReference: {fileID: 0} - target: {fileID: -4671925420836088789, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12560,12 +12568,12 @@ PrefabInstance: - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Type - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Range - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12590,7 +12598,12 @@ PrefabInstance: - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Intensity - value: 1.5 + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_SpotAngle + value: 179 objectReference: {fileID: 0} - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12607,6 +12620,11 @@ PrefabInstance: propertyPath: m_ShadowRadius value: 0 objectReference: {fileID: 0} + - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_InnerSpotAngle + value: 110.41378 + objectReference: {fileID: 0} - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Shadows.m_Type @@ -12617,6 +12635,26 @@ PrefabInstance: propertyPath: m_BounceIntensity value: 1 objectReference: {fileID: 0} + - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.w + value: 3.2305713e+17 + objectReference: {fileID: 0} + - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.x + value: 6.26e-43 + objectReference: {fileID: 0} + - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.y + value: 7.1e-44 + objectReference: {fileID: 0} + - target: {fileID: -4450536759890801738, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: -3253545023562615301, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.x @@ -12625,7 +12663,7 @@ PrefabInstance: - target: {fileID: -3253545023562615301, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.y - value: 2.42 + value: 2.99 objectReference: {fileID: 0} - target: {fileID: -3253545023562615301, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12635,12 +12673,12 @@ PrefabInstance: - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Type - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Range - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12665,7 +12703,12 @@ PrefabInstance: - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Intensity - value: 1.5 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_SpotAngle + value: 179 objectReference: {fileID: 0} - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12682,6 +12725,11 @@ PrefabInstance: propertyPath: m_ShadowRadius value: 0 objectReference: {fileID: 0} + - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_InnerSpotAngle + value: 155.80212 + objectReference: {fileID: 0} - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Shadows.m_Type @@ -12692,15 +12740,45 @@ PrefabInstance: propertyPath: m_BounceIntensity value: 1 objectReference: {fileID: 0} + - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.x + value: 1.05e-43 + objectReference: {fileID: 0} + - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.y + value: 36.800003 + objectReference: {fileID: 0} + - target: {fileID: -2701114346260339781, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.z + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -1596442841338162665, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -1342902887879466839, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Type - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Range - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12725,7 +12803,12 @@ PrefabInstance: - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Intensity - value: 1.5 + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_SpotAngle + value: 179 objectReference: {fileID: 0} - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12742,6 +12825,11 @@ PrefabInstance: propertyPath: m_ShadowRadius value: 0 objectReference: {fileID: 0} + - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_InnerSpotAngle + value: 110.41378 + objectReference: {fileID: 0} - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Shadows.m_Type @@ -12752,6 +12840,26 @@ PrefabInstance: propertyPath: m_BounceIntensity value: 1 objectReference: {fileID: 0} + - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.w + value: -2.1877177e-28 + objectReference: {fileID: 0} + - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.x + value: 1.05e-43 + objectReference: {fileID: 0} + - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.y + value: NaN + objectReference: {fileID: 0} + - target: {fileID: -1071359958148435772, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.z + value: 0.09765663 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Name @@ -12762,6 +12870,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 2511811754567536238, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2550463727306718371, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_StaticEditorFlags @@ -12780,12 +12893,12 @@ PrefabInstance: - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Type - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Range - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12810,7 +12923,12 @@ PrefabInstance: - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Intensity - value: 1.5 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_SpotAngle + value: 179 objectReference: {fileID: 0} - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12827,6 +12945,11 @@ PrefabInstance: propertyPath: m_ShadowRadius value: 0 objectReference: {fileID: 0} + - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_InnerSpotAngle + value: 155.80212 + objectReference: {fileID: 0} - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_Shadows.m_Type @@ -12837,6 +12960,21 @@ PrefabInstance: propertyPath: m_BounceIntensity value: 1 objectReference: {fileID: 0} + - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.x + value: 1.05e-43 + objectReference: {fileID: 0} + - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.y + value: 37.600002 + objectReference: {fileID: 0} + - target: {fileID: 5783882096753140000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_BoundingSphereOverride.z + value: 12 + objectReference: {fileID: 0} - target: {fileID: 7072164525233944939, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_StaticEditorFlags @@ -12855,17 +12993,17 @@ PrefabInstance: - target: {fileID: 7661715896771385892, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.x - value: 0.53 + value: 0.21 objectReference: {fileID: 0} - target: {fileID: 7661715896771385892, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.y - value: 2.42 + value: 2.99 objectReference: {fileID: 0} - target: {fileID: 7661715896771385892, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.z - value: 1.32 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 7824128036929741958, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} @@ -12880,13 +13018,23 @@ PrefabInstance: - target: {fileID: 8165863434608227068, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.y - value: 2.42 + value: 2.99 objectReference: {fileID: 0} - target: {fileID: 8165863434608227068, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} propertyPath: m_LocalPosition.z value: 1.39 objectReference: {fileID: 0} + - target: {fileID: 8247994413960396516, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 8537421735129595006, guid: 31f0c3f4ace06884a8eb57730c1e9c57, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31f0c3f4ace06884a8eb57730c1e9c57, type: 3} --- !u!1 &1118086314 stripped @@ -16082,9 +16230,6 @@ Transform: - {fileID: 195317959} - {fileID: 120657178} - {fileID: 968258290} - - {fileID: 1989318070} - - {fileID: 937211620} - - {fileID: 112502617} m_Father: {fileID: 1681290117} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17556,6 +17701,59 @@ 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 @@ -18751,7 +18949,7 @@ PrefabInstance: - target: {fileID: -8256134651489076907, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_StaticEditorFlags - value: 0 + value: 2147483647 objectReference: {fileID: 0} - target: {fileID: -8243738414366801979, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -18863,6 +19061,31 @@ PrefabInstance: propertyPath: m_LightProbeUsage value: 0 objectReference: {fileID: 0} + - target: {fileID: -7918335002988649766, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_ReceiveGI + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7918335002988649766, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_CastShadows + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7918335002988649766, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_ScaleInLightmap + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7918335002988649766, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LightmapParameters + value: + objectReference: {fileID: 0} + - target: {fileID: -7918335002988649766, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_StaticShadowCaster + value: 0 + objectReference: {fileID: 0} - target: {fileID: -7908214211655988951, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_StaticEditorFlags @@ -18928,6 +19151,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: -7769432255569151871, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_StaticEditorFlags + value: 126 + objectReference: {fileID: 0} - target: {fileID: -7768307165233044901, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_CastShadows @@ -19026,7 +19254,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_ScaleInLightmap - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7485518250196652098, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -19173,6 +19401,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: -6941121620058687010, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6941121620058687010, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} - target: {fileID: -6940659415643618248, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_Enabled @@ -19846,7 +20084,7 @@ PrefabInstance: - target: {fileID: -4818106957885473086, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_ScaleInLightmap - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: -4816868346418751328, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -20833,6 +21071,21 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: -1980652105912637003, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1980652105912637003, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1980652105912637003, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_StaticShadowCaster + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1961637893353372145, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_StaticEditorFlags @@ -22191,7 +22444,7 @@ PrefabInstance: - target: {fileID: 2234279461920997360, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_StaticEditorFlags - value: 127 + value: 126 objectReference: {fileID: 0} - target: {fileID: 2264134846919618445, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -22458,6 +22711,26 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalScale.x + value: 1.025 + objectReference: {fileID: 0} + - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalScale.z + value: 1.025 + objectReference: {fileID: 0} + - target: {fileID: 2914067319567979195, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2927066441244004464, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_Enabled @@ -22658,6 +22931,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 3396913584297481876, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3396913584297481876, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_StaticEditorFlags @@ -23641,17 +23919,27 @@ PrefabInstance: - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalScale.y - value: 1.02 + value: 1.1 objectReference: {fileID: 0} - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalScale.z value: 1.02 objectReference: {fileID: 0} + - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.00022 + objectReference: {fileID: 0} + - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.01269 + objectReference: {fileID: 0} - target: {fileID: 6092193294776647912, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_ConstrainProportionsScale - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6163565363770131037, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -23766,17 +24054,17 @@ PrefabInstance: - target: {fileID: 6609493762104327279, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.00003 objectReference: {fileID: 0} - target: {fileID: 6609493762104327279, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalPosition.y - value: 0.000944 + value: 0.00126 objectReference: {fileID: 0} - target: {fileID: 6609493762104327279, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalPosition.z - value: 0.012048 + value: 0.01197 objectReference: {fileID: 0} - target: {fileID: 6618956848436274754, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} @@ -27920,7 +28208,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1840065107 BoxCollider: @@ -31005,17 +31293,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1989318069} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.477} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 37.354347, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1499264057} - m_RootOrder: 5 + m_Father: {fileID: 968258290} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0012, y: 0.1292001} + m_AnchoredPosition: {x: 3.6271086, y: 0.008400001} m_SizeDelta: {x: 1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1989318071 @@ -36026,7 +36314,7 @@ MonoBehaviour: DebugModelTransforms: 1 DebugModelRotationAxis: 0 FineTuning: 1 - DebugOptions: 0 + DebugOptions: 1 EditPoseNeedsResetting: 1 --- !u!4 &2625696200242226335 Transform: diff --git a/Assets/Scenes/WACVR/LightingData.asset b/Assets/Scenes/WACVR/LightingData.asset index ef83baa..24afc0d 100644 Binary files a/Assets/Scenes/WACVR/LightingData.asset and b/Assets/Scenes/WACVR/LightingData.asset differ diff --git a/Assets/Scenes/WACVR/Lightmap-0_comp_dir.png b/Assets/Scenes/WACVR/Lightmap-0_comp_dir.png deleted file mode 100644 index ba9fb1c..0000000 Binary files a/Assets/Scenes/WACVR/Lightmap-0_comp_dir.png and /dev/null differ diff --git a/Assets/Scenes/WACVR/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/WACVR/Lightmap-0_comp_dir.png.meta deleted file mode 100644 index a75a2e6..0000000 --- a/Assets/Scenes/WACVR/Lightmap-0_comp_dir.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 13ab8f5585e4c334b85a938b806511b6 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/WACVR/Lightmap-0_comp_light.exr b/Assets/Scenes/WACVR/Lightmap-0_comp_light.exr index f219585..ada2952 100644 Binary files a/Assets/Scenes/WACVR/Lightmap-0_comp_light.exr and b/Assets/Scenes/WACVR/Lightmap-0_comp_light.exr differ diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 9b10bae..37c1294 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -35,7 +35,7 @@ MonoBehaviour: features: - {fileID: 7581227243671795047} - {fileID: -3687958811547312280} - - {fileID: 6797662432667753210} + - {fileID: 3105951399032240424} - {fileID: -660904743828199304} - {fileID: 587458779450762736} - {fileID: 2332717924642193878} @@ -203,6 +203,26 @@ MonoBehaviour: required: 0 cacheSize: 1048576 perThreadCacheSize: 51200 +--- !u!114 &3105951399032240424 +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: c465bd23c9c4fb442ae89117552a5f3f, type: 3} + m_Name: HandTrackingFeature Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Ultraleap Hand Tracking + version: 1.0.0 + featureIdInternal: com.ultraleap.tracking.openxr.feature.handtracking + openxrExtensionStrings: XR_EXT_hand_tracking XR_ULTRALEAP_hand_tracking_forearm + company: Ultraleap + priority: 0 + required: 0 --- !u!114 &3607529374417723074 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,7 +276,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c465bd23c9c4fb442ae89117552a5f3f, type: 3} m_Name: HandTrackingFeature Standalone m_EditorClassIdentifier: - m_enabled: 1 + m_enabled: 0 nameUi: Ultraleap Hand Tracking version: 1.0.0 featureIdInternal: com.ultraleap.tracking.openxr.feature.handtracking diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9f3b190..23813ff 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: xpeng productName: WACVR defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -137,6 +137,8 @@ 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