From 0b28abd21dc584469d6c972a80192a76ac1c3759 Mon Sep 17 00:00:00 2001 From: Guilherme de Lyra Date: Tue, 26 Jun 2018 13:50:39 +0000 Subject: [PATCH] consertando conflito do merge --- .../Scenes/RealtimeGraphUDPPatient.unity | 329 +----------------- .../ProjectSettings/EditorBuildSettings.asset | 6 +- .../ProjectSettings/ProjectSettings.asset | 30 +- 3 files changed, 22 insertions(+), 343 deletions(-) diff --git a/Reabilitacao-Motora/Assets/Scenes/RealtimeGraphUDPPatient.unity b/Reabilitacao-Motora/Assets/Scenes/RealtimeGraphUDPPatient.unity index 7021a6ff..55a5f0ec 100644 --- a/Reabilitacao-Motora/Assets/Scenes/RealtimeGraphUDPPatient.unity +++ b/Reabilitacao-Motora/Assets/Scenes/RealtimeGraphUDPPatient.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,8 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.4964127, b: 0.57481724, a: 1} - m_UseRadianceAmbientProbe: 0 + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -651,7 +651,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -799,7 +798,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -1142,7 +1140,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -1211,7 +1208,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: d0c55ac5d6d21b64eb03fb972c38c618, type: 2} m_StaticBatchInfo: @@ -1398,7 +1394,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -1525,7 +1520,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -1662,7 +1656,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 675b9175b1224d34cb3164133798fe94, type: 2} m_StaticBatchInfo: @@ -2044,7 +2037,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 06f8921ba8e88ff43a1412d03790f2c0, type: 2} m_StaticBatchInfo: @@ -2199,7 +2191,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -2775,11 +2766,7 @@ Prefab: m_Modifications: - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalPosition.x -<<<<<<< HEAD value: -0.2 -======= - value: 130.99796 ->>>>>>> b497d93549b08891620e82813d1df3de8a5d1951 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalPosition.y @@ -2787,31 +2774,23 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalPosition.z -<<<<<<< HEAD value: 0 -======= - value: 2.9987931 ->>>>>>> b497d93549b08891620e82813d1df3de8a5d1951 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalRotation.y -<<<<<<< HEAD value: 0.9848078 -======= - value: 0.9302254 ->>>>>>> b497d93549b08891620e82813d1df3de8a5d1951 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalRotation.w - value: 0.3669889 + value: 0.17364825 objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_RootOrder @@ -2819,7 +2798,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400004, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 136.94 + value: 160 objectReference: {fileID: 0} - target: {fileID: 9500000, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} propertyPath: m_Controller @@ -2853,278 +2832,6 @@ Prefab: propertyPath: m_Name value: CharacterMan objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: -0.00000004656612 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: -0.000000007450594 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: -0.0752587 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.997164 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: -0.11924573 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: 0.18230543 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: 0.014253192 - objectReference: {fileID: 0} - - target: {fileID: 400072, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -8.632 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: -0.2965976 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: 0.1541748 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7078602 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.6222492 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: -0.299 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: -0.017 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.061 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -35.972 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -16.365002 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 102.711006 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: 0.1413829 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: -0.034974232 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: 0.08077637 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.986034 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: -0.5457838 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: -0.019459397 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.028016508 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 16.527 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -2.7580001 - objectReference: {fileID: 0} - - target: {fileID: 400026, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 8.966001 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: -0.40493554 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: 0.018323721 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: -0.040031314 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9132847 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: -0.5499491 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: -0.01467137 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: 0.030378059 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -47.576004 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 5.6050005 - objectReference: {fileID: 0} - - target: {fileID: 400028, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -7.4920006 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: -0.009089411 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: -0.04934385 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: -0.6499996 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7582764 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: 0.341 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: 0.016 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.048 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -4.4700003 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -3.624 - objectReference: {fileID: 0} - - target: {fileID: 400082, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -81.065 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: -0.046391763 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: -0.1196545 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: -0.08594468 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.98800004 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: 0.5457852 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: -0.019448131 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.027892193 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -6.4440002 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -13.292001 - objectReference: {fileID: 0} - - target: {fileID: 400088, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -9.191 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.x - value: 0.012900466 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.y - value: 0.007906369 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.z - value: -0.0075613437 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalRotation.w - value: 0.999857 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.x - value: 0.5504741 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.y - value: -0.014557843 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalPosition.z - value: 0.030357677 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 1.485 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.89500004 - objectReference: {fileID: 0} - - target: {fileID: 400090, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.855 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0ed08faf6b2c64f13ae389013c74d2d7, type: 3} m_IsPrefabParent: 0 @@ -3210,7 +2917,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 06f8921ba8e88ff43a1412d03790f2c0, type: 2} m_StaticBatchInfo: @@ -3529,7 +3235,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -4138,7 +3843,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -4538,7 +4242,6 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -4966,7 +4669,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: fe5b40f8d11bed74b98d37c7c84e503e, type: 2} m_StaticBatchInfo: @@ -5079,7 +4781,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -5169,7 +4870,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -5641,7 +5341,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -5731,7 +5430,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -5973,7 +5671,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -6931,7 +6628,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -7785,7 +7481,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -8262,7 +7957,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -8422,7 +8116,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -8492,7 +8185,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 06f8921ba8e88ff43a1412d03790f2c0, type: 2} m_StaticBatchInfo: @@ -8875,7 +8567,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 13ebf3dfbc268ff4dae4fef7bb954011, type: 3} m_StaticBatchInfo: @@ -9162,4 +8853,4 @@ CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2140033789} + m_GameObject: {fileID: 2140033789} \ No newline at end of file diff --git a/Reabilitacao-Motora/ProjectSettings/EditorBuildSettings.asset b/Reabilitacao-Motora/ProjectSettings/EditorBuildSettings.asset index 70954f25..013efdc7 100644 --- a/Reabilitacao-Motora/ProjectSettings/EditorBuildSettings.asset +++ b/Reabilitacao-Motora/ProjectSettings/EditorBuildSettings.asset @@ -101,12 +101,12 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/RealtimeGraphUDPPhysio.unity guid: dfccca85fc9e6094baf3ad84f3f0cb83 + - enabled: 1 + path: Assets/Scenes/Session.unity + guid: 68b8941c23a9e0d4c84f4b28dfbc6b59 - enabled: 1 path: Assets/Scenes/UpdatePatient.unity guid: fb2d71682eb1cca478c3f0fb513674b3 - enabled: 1 path: Assets/Scenes/UpdatePhysiotherapist.unity guid: 7829b2da0b76e97459e12ac28e2e27be - - enabled: 1 - path: Assets/Scenes/Session.unity - guid: 68b8941c23a9e0d4c84f4b28dfbc6b59 diff --git a/Reabilitacao-Motora/ProjectSettings/ProjectSettings.asset b/Reabilitacao-Motora/ProjectSettings/ProjectSettings.asset index fd19d80a..85889dd8 100644 --- a/Reabilitacao-Motora/ProjectSettings/ProjectSettings.asset +++ b/Reabilitacao-Motora/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 13 productGUID: b80daf7c4acc34abea32b0bc4fff8f2b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -61,7 +61,6 @@ PlayerSettings: allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 - preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 androidBlitType: 0 defaultIsFullScreen: 1 @@ -92,6 +91,7 @@ PlayerSettings: allowFullscreenSwitch: 1 graphicsJobMode: 0 macFullscreenMode: 2 + d3d9FullscreenMode: 1 d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -101,6 +101,7 @@ PlayerSettings: n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 + ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneSResolution: 0 xboxOneXResolution: 3 @@ -129,7 +130,6 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 - wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 @@ -142,14 +142,8 @@ PlayerSettings: useSustainedPerformanceMode: 0 enableVideoLayer: 0 useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 0 - oculus: - sharedDepthBuffer: 0 - dashSupport: 0 protectGraphicsMemory: 0 useHDRDisplay: 0 m_ColorGamuts: 00000000 @@ -225,8 +219,6 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 - iOSLaunchScreenCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -238,7 +230,6 @@ PlayerSettings: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: appleEnableAutomaticSigning: 0 - clonedFromGUID: 00000000000000000000000000000000 AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -267,13 +258,6 @@ PlayerSettings: Android: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 1 - - m_BuildTarget: XboxOne - m_EncodingQuality: 1 - - m_BuildTarget: PS4 - m_EncodingQuality: 1 wiiUTitleID: 0005000011000000 wiiUGroupID: 00010000 wiiUCommonSaveSize: 4096 @@ -442,8 +426,6 @@ PlayerSettings: ps4PronunciationSIGPath: ps4BackgroundImagePath: ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: ps4SaveDataImagePath: ps4SdkOverride: ps4BGMPath: @@ -609,6 +591,12 @@ PlayerSettings: n3dsTitle: GameName n3dsProductCode: n3dsApplicationId: 0xFF3FF + stvDeviceAddress: + stvProductDescription: + stvProductAuthor: + stvProductAuthorEmail: + stvProductLink: + stvProductCategory: 0 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: