diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 57fd151..705b9be 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -189,35 +189,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1079856607669593210, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.998356 + value: 0.9985717 objectReference: {fileID: 0} - target: {fileID: 1079856607669593210, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000014117589 + value: 0.024979467 objectReference: {fileID: 0} - target: {fileID: 1079856607669593210, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000024589494 + value: -0.0016881253 objectReference: {fileID: 0} - target: {fileID: 1079856607669593210, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: -0.057318628 + value: -0.047199663 objectReference: {fileID: 0} - target: {fileID: 2061964902246082470, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.8189171 + value: 0.90639997 objectReference: {fileID: 0} - target: {fileID: 2061964902246082470, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.57341206 + value: -0.41903535 objectReference: {fileID: 0} - target: {fileID: 2061964902246082470, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: 0.013735017 + value: 0.037649874 objectReference: {fileID: 0} - target: {fileID: 2061964902246082470, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: -0.019616086 + value: 0.037828688 objectReference: {fileID: 0} - target: {fileID: 2571591903515021705, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w @@ -237,83 +237,83 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2703559684576676166, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.96416754 + value: 0.92966574 objectReference: {fileID: 0} - target: {fileID: 2703559684576676166, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.26475075 + value: -0.36801308 objectReference: {fileID: 0} - target: {fileID: 2703559684576676166, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.004493737 + value: -0.0062463814 objectReference: {fileID: 0} - target: {fileID: 2703559684576676166, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: 0.016364573 + value: 0.01577896 objectReference: {fileID: 0} - target: {fileID: 3777062867820201836, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.9999653 + value: 0.999927 objectReference: {fileID: 0} - target: {fileID: 3777062867820201836, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: 9.63575e-10 + value: -0.008754701 objectReference: {fileID: 0} - target: {fileID: 3777062867820201836, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000024645462 + value: -0.00007319437 objectReference: {fileID: 0} - target: {fileID: 3777062867820201836, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: 0.008332139 + value: 0.008331818 objectReference: {fileID: 0} - target: {fileID: 4115042253331818985, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.7881965 + value: 0.8206573 objectReference: {fileID: 0} - target: {fileID: 4115042253331818985, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.410309 + value: -0.39028823 objectReference: {fileID: 0} - target: {fileID: 4115042253331818985, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.21179786 + value: -0.2467527 objectReference: {fileID: 0} - target: {fileID: 4115042253331818985, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: 0.40685937 + value: 0.3366153 objectReference: {fileID: 0} - target: {fileID: 5930310419559447335, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.9998591 + value: 0.9996536 objectReference: {fileID: 0} - target: {fileID: 5930310419559447335, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.0000000030370293 + value: 0.020270064 objectReference: {fileID: 0} - target: {fileID: 5930310419559447335, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: 0.00000031166041 + value: -0.00034005355 objectReference: {fileID: 0} - target: {fileID: 5930310419559447335, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: -0.01678915 + value: -0.016785705 objectReference: {fileID: 0} - target: {fileID: 6267318123737757797, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.9999218 + value: 0.9999208 objectReference: {fileID: 0} - target: {fileID: 6267318123737757797, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000006607342 + value: -0.0014234672 objectReference: {fileID: 0} - target: {fileID: 6267318123737757797, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000005225624 + value: 0.00001775072 objectReference: {fileID: 0} - target: {fileID: 6267318123737757797, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: -0.01250585 + value: -0.012505837 objectReference: {fileID: 0} - target: {fileID: 6407192061547581319, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w @@ -333,90 +333,75 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6779641804511181039, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.93854445 + value: 0.81914824 objectReference: {fileID: 0} - target: {fileID: 6779641804511181039, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.34514517 + value: -0.5735739 objectReference: {fileID: 0} - target: {fileID: 6779641804511181039, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.0010461769 + value: -0.0017384278 objectReference: {fileID: 0} - target: {fileID: 6779641804511181039, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: 0.0028442778 + value: 0.0024823921 objectReference: {fileID: 0} - target: {fileID: 7470401062885768984, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.99999714 + value: 0.9999021 objectReference: {fileID: 0} - target: {fileID: 7470401062885768984, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.0000000011356077 + value: 0.013784392 objectReference: {fileID: 0} - target: {fileID: 7470401062885768984, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000000291141 + value: -0.0000330861 objectReference: {fileID: 0} - target: {fileID: 7470401062885768984, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: -0.00240004 + value: -0.0023998118 objectReference: {fileID: 0} - target: {fileID: 7877833394792536783, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.99890864 + value: 0.99954814 objectReference: {fileID: 0} - target: {fileID: 7877833394792536783, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: 0.000000010982182 + value: 0.008218706 objectReference: {fileID: 0} - target: {fileID: 7877833394792536783, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.0000002348713 + value: 0.0005308752 objectReference: {fileID: 0} - target: {fileID: 7877833394792536783, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: 0.046707317 + value: 0.028911157 objectReference: {fileID: 0} - target: {fileID: 9027976332416009344, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.w - value: 0.81915164 + value: 0.9233359 objectReference: {fileID: 0} - target: {fileID: 9027976332416009344, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.x - value: -0.5735763 + value: -0.38389197 objectReference: {fileID: 0} - target: {fileID: 9027976332416009344, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.y - value: -0.0005474062 + value: 0.0027533586 objectReference: {fileID: 0} - target: {fileID: 9027976332416009344, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} propertyPath: m_LocalRotation.z - value: 0.0007813563 + value: 0.008384709 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} insertIndex: -1 - addedObject: {fileID: 2085077131} - - targetCorrespondingSourceObject: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} - insertIndex: -1 - addedObject: {fileID: 1238479930} - - targetCorrespondingSourceObject: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} - insertIndex: -1 - addedObject: {fileID: 326191336} - - targetCorrespondingSourceObject: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} - insertIndex: -1 - addedObject: {fileID: 1932195246} - - targetCorrespondingSourceObject: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} - insertIndex: -1 - addedObject: {fileID: 437642968} + addedObject: {fileID: 1945874012} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 180557533655662575, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} - insertIndex: -1 - addedObject: {fileID: 1031526706} - targetCorrespondingSourceObject: {fileID: 5521578335069473076, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} insertIndex: -1 addedObject: {fileID: 793353763} @@ -688,7 +673,7 @@ MonoBehaviour: m_StreamingVersion: 20241001 m_LegacyPriority: 0 Target: - TrackingTarget: {fileID: 413291277} + TrackingTarget: {fileID: 1774267802} LookAtTarget: {fileID: 1774267802} CustomLookAtTarget: 0 Lens: @@ -719,8 +704,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 172071430} serializedVersion: 2 - m_LocalRotation: {x: 0.13052621, y: -1.3293679e-10, z: 1.43842716e-11, w: 0.9914449} - m_LocalPosition: {x: 0, y: 1.4896858, z: -4.3466663} + m_LocalRotation: {x: 0.1305262, y: -2.9837799e-12, z: 3.8899596e-13, w: 0.9914449} + m_LocalPosition: {x: 0, y: 2.1646857, z: -4.3466663} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -743,7 +728,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &200502119 BoxCollider: @@ -831,12 +816,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 200502118} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.29, y: 0.5, z: -2.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &238011515 GameObject: @@ -855,7 +840,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &238011516 BoxCollider: @@ -943,12 +928,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 238011515} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} m_LocalPosition: {x: -16.69, y: 0.04, z: 25.21} m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!4 &245581838 stripped Transform: @@ -977,7 +962,7 @@ GameObject: m_Layer: 0 m_Name: Middle Finger Target m_TagString: Untagged - m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 4162164826716764455, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -990,11 +975,11 @@ Transform: m_GameObject: {fileID: 326191335} serializedVersion: 2 m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} - m_LocalPosition: {x: -0.073, y: -0.136, z: 0.389} + m_LocalPosition: {x: -0.07700003, y: -0.166, z: 0.16299999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 788445} + m_Father: {fileID: 1945874012} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &330585543 GameObject: @@ -1083,8 +1068,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.13052621, y: -1.3335441e-10, z: 1.7556446e-11, w: 0.9914449} - m_LocalPosition: {x: 0, y: 1.4896858, z: -4.3466663} + m_LocalRotation: {x: 0.1305262, y: -2.9842923e-12, z: 3.928896e-13, w: 0.9914449} + m_LocalPosition: {x: 0, y: 2.1646857, z: -4.3466663} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1318,7 +1303,7 @@ Transform: m_GameObject: {fileID: 413291276} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.325, z: 0} + m_LocalPosition: {x: 0.013, y: 0.876, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1336,7 +1321,7 @@ GameObject: m_Layer: 0 m_Name: Little Finger Target m_TagString: Untagged - m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 4162164826716764455, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -1349,11 +1334,11 @@ Transform: m_GameObject: {fileID: 437642967} serializedVersion: 2 m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} - m_LocalPosition: {x: 0.397, y: 0.14, z: -0.71} + m_LocalPosition: {x: 0.28900012, y: 0.038999856, z: -0.55600005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 788445} + m_Father: {fileID: 1945874012} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &461771496 stripped Transform: @@ -1454,6 +1439,47 @@ MonoBehaviour: paintCamera: {fileID: 0} updateColliderEveryFrame: 1 previewShader: {fileID: 0} +--- !u!1 &686187286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 686187287} + m_Layer: 0 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &686187287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686187286} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 721670973} + - {fileID: 963088882} + - {fileID: 1680244260} + - {fileID: 1981625995} + - {fileID: 1801342649} + - {fileID: 1422043296} + - {fileID: 238011519} + - {fileID: 1478475841} + - {fileID: 1746495279} + - {fileID: 200502122} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &691617530 stripped Transform: m_CorrespondingSourceObject: {fileID: 8646236745351523921, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} @@ -1489,7 +1515,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!64 &721670970 MeshCollider: @@ -1578,12 +1604,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 721670969} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &793353761 stripped GameObject: @@ -1646,8 +1672,8 @@ MonoBehaviour: - {x: -1, y: 0, z: 0} - {x: -1, y: 0, z: 0} minCurl: - - 0 - - 0 + - -20 + - -12 maxCurl: - 55 - 80 @@ -1776,6 +1802,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 4717059443444886204, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} m_PrefabInstance: {fileID: 788444} m_PrefabAsset: {fileID: 0} +--- !u!1 &947446962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 947446963} + m_Layer: 0 + m_Name: CameraTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &947446963 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947446962} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.226, z: -0.155} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1006134333} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963088878 GameObject: m_ObjectHideFlags: 0 @@ -1793,7 +1850,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &963088879 BoxCollider: @@ -1881,52 +1938,80 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963088878} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &993938028 stripped Transform: m_CorrespondingSourceObject: {fileID: 2571591903515021705, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} m_PrefabInstance: {fileID: 788444} m_PrefabAsset: {fileID: 0} ---- !u!1 &1031526704 stripped +--- !u!1 &1006134330 GameObject: - m_CorrespondingSourceObject: {fileID: 180557533655662575, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} - m_PrefabInstance: {fileID: 788444} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &1031526706 + serializedVersion: 6 + m_Component: + - component: {fileID: 1006134333} + - component: {fileID: 1006134334} + m_Layer: 0 + m_Name: Player (Variant 2, Hand) + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1006134333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006134330} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1673252828} + - {fileID: 947446963} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1006134334 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1031526704} + m_GameObject: {fileID: 1006134330} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbe3de6a9f2cea544993dbddc6dedaa8, type: 3} + m_Script: {fileID: 11500000, guid: bf4039bad99e6e64aae35786e6a87ba6, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::HandIK - handRoot: {fileID: 316547577} - discoverOnAwake: 1 - grip: 0 - fingerTargets: - - {fileID: 2085077131} - - {fileID: 1238479930} - - {fileID: 326191336} - - {fileID: 1932195246} - - {fileID: 437642968} - iterations: 10 - ikWeight: 1 - fingers: - - {fileID: 793353763} - - {fileID: 1102024866} - - {fileID: 1876169461} - - {fileID: 2103433237} - - {fileID: 1035550129} + m_EditorClassIdentifier: Assembly-CSharp::InsectController + moveSpeed: 4 + sprintSpeedMultiplier: 1.8 + alignSmoothing: 16 + cameraRelative: 1 + cameraTransform: {fileID: 0} + hoverHeight: 0.1 + probeRadius: 0.5 + stepHeight: 0.3 + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + wallWrapAngle: 70 + wallProbeDistance: 0.6 + maxWrapAngle: 150 + animator: {fileID: 0} + runningParameter: Running --- !u!1 &1035550127 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1829171509944310967, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} @@ -1990,9 +2075,9 @@ MonoBehaviour: - {x: -1, y: 0, z: 0} - {x: -1, y: 0, z: 0} minCurl: - - 0 - - 0 - - 0 + - -25 + - -12 + - -12 maxCurl: - 70 - 90 @@ -2065,9 +2150,9 @@ MonoBehaviour: - {x: -1, y: 0, z: 0} - {x: -1, y: 0, z: 0} minCurl: - - 0 - - 0 - - 0 + - -25 + - -12 + - -12 maxCurl: - 70 - 90 @@ -2089,12 +2174,12 @@ GameObject: - component: {fileID: 1129539840} - component: {fileID: 1129539839} m_Layer: 0 - m_Name: Player + m_Name: Player (Variant 1, Hand) m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1129539839 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2191,12 +2276,12 @@ GameObject: - component: {fileID: 1141039641} - component: {fileID: 1141039642} m_Layer: 0 - m_Name: Player + m_Name: Player (Variant 1) m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1141039639 Transform: m_ObjectHideFlags: 0 @@ -2293,7 +2378,7 @@ GameObject: m_Layer: 0 m_Name: Index Finger Target m_TagString: Untagged - m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 4162164826716764455, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -2306,11 +2391,11 @@ Transform: m_GameObject: {fileID: 1238479929} serializedVersion: 2 m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} - m_LocalPosition: {x: -0.324, y: 0.085999966, z: -0.769} + m_LocalPosition: {x: -0.2530001, y: 0.019999862, z: -0.59900004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 788445} + m_Father: {fileID: 1945874012} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1422043292 GameObject: @@ -2329,7 +2414,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &1422043293 BoxCollider: @@ -2417,12 +2502,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1422043292} serializedVersion: 2 - m_LocalRotation: {x: 0.46174863, y: 0, z: 0, w: 0.8870109} + m_LocalRotation: {x: 0.46174863, y: -0, z: -0, w: 0.8870109} m_LocalPosition: {x: -9.47, y: 0.04, z: 25.21} m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 55, y: 0, z: 0} --- !u!1 &1478475837 GameObject: @@ -2441,7 +2526,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &1478475838 BoxCollider: @@ -2529,12 +2614,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478475837} serializedVersion: 2 - m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254} + m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254} m_LocalPosition: {x: -4, y: 0.04, z: 25.21} m_LocalScale: {x: 3.1586099, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} --- !u!1 &1516578026 GameObject: @@ -2565,9 +2650,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 730466b26610d95498d22ab748d855a7, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::GameModeManager - player: {fileID: 1129539839} + player: {fileID: 1141039642} cameraInput: {fileID: 172071431} - painter: {fileID: 788447} + painter: {fileID: 682237521} + insect: {fileID: 0} switchKey: 3 startModeIndex: 0 --- !u!4 &1516578028 @@ -2585,6 +2671,118 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1673252827 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1006134333} + m_Modifications: + - target: {fileID: 180557533655662575, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_Name + value: WhiteHand + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1338243545944059599, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + insertIndex: -1 + addedObject: {fileID: 1673252830} + m_SourcePrefab: {fileID: 100100000, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} +--- !u!4 &1673252828 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 705561775665358165, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + m_PrefabInstance: {fileID: 1673252827} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1673252829 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1338243545944059599, guid: 930b7a19d446f4b4c9c810e37e84e625, type: 3} + m_PrefabInstance: {fileID: 1673252827} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1673252830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673252829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fc799adb27d5ea45990b5522b75ddda, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::MeshPainter + brushShader: {fileID: 0} + dilateShader: {fileID: 0} + packMsShader: {fileID: 0} + useGpu: 1 + paintAlbedo: 1 + paintMetallicSmoothness: 0 + paintOcclusion: 0 + paintEmission: 0 + brushColor: {r: 0.6, g: 0.6, b: 1, a: 1} + metallic: 1 + smoothness: 1 + occlusion: 1 + emissionColor: {r: 1, g: 0.6, b: 0, a: 1} + emissionIntensity: 200 + brushSize: 100 + brushMasks: + - {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0} + activeBrushIndex: 0 + brushAlignment: 0 + brushRotation: 0 + paintOnMoveOnly: 1 + previewMode: 2 + previewOpacity: 1 + textureSize: 1024 + baseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + paddingTexels: 2 + paintCamera: {fileID: 0} + updateColliderEveryFrame: 1 + previewShader: {fileID: 0} --- !u!1 &1680244256 GameObject: m_ObjectHideFlags: 0 @@ -2602,7 +2800,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &1680244257 BoxCollider: @@ -2690,12 +2888,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1680244256} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.98, y: 2.5, z: 5} m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1696733247 stripped Transform: @@ -2719,7 +2917,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &1746495276 BoxCollider: @@ -2812,7 +3010,7 @@ Transform: m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: -75, y: 0, z: 0} --- !u!1 &1774267801 GameObject: @@ -2862,7 +3060,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &1801342646 BoxCollider: @@ -2950,12 +3148,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801342645} serializedVersion: 2 - m_LocalRotation: {x: 0.42261827, y: 0, z: 0, w: 0.9063079} + m_LocalRotation: {x: 0.42261827, y: -0, z: -0, w: 0.9063079} m_LocalPosition: {x: -14.03, y: 1.4, z: 32.899998} m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} --- !u!4 &1816711210 stripped Transform: @@ -3025,9 +3223,9 @@ MonoBehaviour: - {x: -1, y: 0, z: 0} - {x: -1, y: 0, z: 0} minCurl: - - 0 - - 0 - - 0 + - -25 + - -12 + - -12 maxCurl: - 70 - 90 @@ -3049,7 +3247,7 @@ GameObject: m_Layer: 0 m_Name: Ring Finger Target m_TagString: Untagged - m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 4162164826716764455, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -3062,17 +3260,82 @@ Transform: m_GameObject: {fileID: 1932195245} serializedVersion: 2 m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} - m_LocalPosition: {x: 0.047, y: -0.13, z: 0.412} + m_LocalPosition: {x: 0.04900003, y: -0.205, z: 0.20599997} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 788445} + m_Father: {fileID: 1945874012} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1944972203 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 554c0bdf86263754d862d7effd04045b, type: 3} m_PrefabInstance: {fileID: 821516643} m_PrefabAsset: {fileID: 0} +--- !u!1 &1945874011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1945874012} + - component: {fileID: 1945874013} + m_Layer: 0 + m_Name: Metal Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1945874012 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945874011} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2085077131} + - {fileID: 1238479930} + - {fileID: 326191336} + - {fileID: 1932195246} + - {fileID: 437642968} + m_Father: {fileID: 788445} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1945874013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945874011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbe3de6a9f2cea544993dbddc6dedaa8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::HandIK + handRoot: {fileID: 316547577} + discoverOnAwake: 1 + fingerTargets: + - {fileID: 2085077131} + - {fileID: 1238479930} + - {fileID: 326191336} + - {fileID: 1932195246} + - {fileID: 437642968} + iterations: 10 + ikWeight: 1 + fingers: + - {fileID: 793353763} + - {fileID: 1102024866} + - {fileID: 1876169461} + - {fileID: 2103433237} + - {fileID: 1035550129} --- !u!1 &1981625991 GameObject: m_ObjectHideFlags: 0 @@ -3090,7 +3353,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!65 &1981625992 BoxCollider: @@ -3178,12 +3441,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981625991} serializedVersion: 2 - m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} + m_LocalRotation: {x: 0.17364816, y: -0, z: -0, w: 0.9848078} m_LocalPosition: {x: -6.73, y: 2.07, z: 32.27} m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 686187287} m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} --- !u!1 &2009475132 GameObject: @@ -3245,7 +3508,7 @@ GameObject: m_Layer: 0 m_Name: Thumb Target m_TagString: Untagged - m_Icon: {fileID: -5938655980376293919, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 4162164826716764455, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -3258,11 +3521,11 @@ Transform: m_GameObject: {fileID: 2085077130} serializedVersion: 2 m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} - m_LocalPosition: {x: -0.024, y: -0.357, z: 0.147} + m_LocalPosition: {x: 0.009000003, y: -0.357, z: 0.19800001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 788445} + m_Father: {fileID: 1945874012} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2087312526 stripped Transform: @@ -3332,9 +3595,9 @@ MonoBehaviour: - {x: -1, y: 0, z: 0} - {x: -1, y: 0, z: 0} minCurl: - - 0 - - 0 - - 0 + - -25 + - -12 + - -12 maxCurl: - 70 - 90 @@ -3348,21 +3611,13 @@ MonoBehaviour: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 2009475134} - {fileID: 1516578028} + - {fileID: 2009475134} - {fileID: 330585546} - {fileID: 172071436} - - {fileID: 410087041} - {fileID: 832575519} + - {fileID: 410087041} - {fileID: 1141039639} - {fileID: 1129539841} - - {fileID: 721670973} - - {fileID: 963088882} - - {fileID: 1680244260} - - {fileID: 1981625995} - - {fileID: 1801342649} - - {fileID: 1422043296} - - {fileID: 238011519} - - {fileID: 1478475841} - - {fileID: 1746495279} - - {fileID: 200502122} + - {fileID: 1006134333} + - {fileID: 686187287} diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 475b02e..ce55f95 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -13,32 +13,26 @@ MonoBehaviour: m_Name: PC_Renderer m_EditorClassIdentifier: debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} - probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, - type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} probeVolumeResources: - probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, - type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, - type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, - type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, - type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, - type: 3} - probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, - type: 3} - probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, - type: 3} + probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3} + probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3} + probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3} m_RendererFeatures: - {fileID: 7833122117494664109} m_RendererFeatureMap: ad6b866f10d7b46c m_UseNativeRenderPass: 1 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - m_AssetVersion: 2 + m_AssetVersion: 3 + m_PrepassLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -56,6 +50,8 @@ MonoBehaviour: m_RenderingMode: 2 m_DepthPrimingMode: 0 m_CopyDepthMode: 0 + m_DepthAttachmentFormat: 0 + m_DepthTextureFormat: 0 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 0 --- !u!114 &7833122117494664109 @@ -72,24 +68,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 1 m_Settings: - AOMethod: 0 + AOMethod: 1 Downsample: 0 AfterOpaque: 0 Source: 1 NormalSamples: 1 Intensity: 0.4 DirectLightingStrength: 0.25 - Radius: 0.3 - Samples: 1 + Radius: 0.2 + Samples: 0 BlurQuality: 0 Falloff: 100 SampleCount: -1 - m_BlueNoise256Textures: - - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} - - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} - - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} - - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} - - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} - - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} - - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} - m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index 7378b8f..b607125 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -18,10 +18,10 @@ MonoBehaviour: m_Value: 0 threshold: m_OverrideState: 1 - m_Value: 1 + m_Value: 0.6 intensity: m_OverrideState: 1 - m_Value: 0.25 + m_Value: 0.2 scatter: m_OverrideState: 1 m_Value: 0.5 @@ -71,7 +71,7 @@ MonoBehaviour: m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 0.2 + m_Value: 0.1 smoothness: m_OverrideState: 0 m_Value: 0.2 diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index fc90ab9..b7f2833 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,10 +3,11 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 23 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -16,11 +17,11 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 - m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - m_AutoSimulation: 1 + m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 + m_InvokeCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ContactPairsMode: 0 @@ -31,6 +32,14 @@ PhysicsManager: m_WorldSubdivisions: 8 m_FrictionType: 0 m_EnableEnhancedDeterminism: 0 - m_EnableUnifiedHeightmaps: 1 + m_ImprovedPatchFriction: 0 + m_GenerateOnTriggerStayEvents: 1 m_SolverType: 0 m_DefaultMaxAngularSpeed: 50 + m_ScratchBufferChunkCount: 4 + m_CurrentBackendId: 4072204805 + m_FastMotionThreshold: 3.4028235e+38 + m_SceneBuffersReleaseInterval: 0 + m_ReleaseSceneBuffers: 0 + m_LogVerbosity: 3 + m_IncrementalStaticBroadphase: 1