From 7fda0ae9f9c874c4cf1854736b62ac9af1c19f93 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 28 Apr 2019 19:02:33 +0200 Subject: [PATCH] Do stuff --- Assets/Animators/Player.controller | 18 +++++++++--------- Assets/Sprites/ChMov1.png.meta | 2 +- Assets/Sprites/ChMov2.png.meta | 2 +- Assets/Sprites/ChMov3.png.meta | 2 +- Assets/Sprites/ChMov4.png.meta | 2 +- Assets/Sprites/ChMov5.png.meta | 2 +- Assets/Sprites/ChMov6.png.meta | 2 +- Assets/Sprites/ChMov7.png.meta | 2 +- Assets/Sprites/ChMov8.png.meta | 2 +- ProjectSettings/QualitySettings.asset | 16 +--------------- ProjectSettings/UnityConnectSettings.asset | 2 +- 11 files changed, 19 insertions(+), 33 deletions(-) diff --git a/Assets/Animators/Player.controller b/Assets/Animators/Player.controller index 5a12439..6cb9f60 100644 --- a/Assets/Animators/Player.controller +++ b/Assets/Animators/Player.controller @@ -44,11 +44,11 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75409836 - m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -91,7 +91,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 1 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -149,11 +149,11 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.625 - m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 diff --git a/Assets/Sprites/ChMov1.png.meta b/Assets/Sprites/ChMov1.png.meta index c99cdae..29c8275 100644 --- a/Assets/Sprites/ChMov1.png.meta +++ b/Assets/Sprites/ChMov1.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov2.png.meta b/Assets/Sprites/ChMov2.png.meta index 4b0e0b7..59be5c1 100644 --- a/Assets/Sprites/ChMov2.png.meta +++ b/Assets/Sprites/ChMov2.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov3.png.meta b/Assets/Sprites/ChMov3.png.meta index e5c92ad..e3df714 100644 --- a/Assets/Sprites/ChMov3.png.meta +++ b/Assets/Sprites/ChMov3.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov4.png.meta b/Assets/Sprites/ChMov4.png.meta index 74c9be4..357f444 100644 --- a/Assets/Sprites/ChMov4.png.meta +++ b/Assets/Sprites/ChMov4.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov5.png.meta b/Assets/Sprites/ChMov5.png.meta index 66f1465..20856f0 100644 --- a/Assets/Sprites/ChMov5.png.meta +++ b/Assets/Sprites/ChMov5.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov6.png.meta b/Assets/Sprites/ChMov6.png.meta index 09d157c..e9b927b 100644 --- a/Assets/Sprites/ChMov6.png.meta +++ b/Assets/Sprites/ChMov6.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov7.png.meta b/Assets/Sprites/ChMov7.png.meta index 26dbbf7..7d98283 100644 --- a/Assets/Sprites/ChMov7.png.meta +++ b/Assets/Sprites/ChMov7.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/ChMov8.png.meta b/Assets/Sprites/ChMov8.png.meta index 2555a0e..a95f9af 100644 --- a/Assets/Sprites/ChMov8.png.meta +++ b/Assets/Sprites/ChMov8.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 35 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 931c141..9bafb84 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -41,18 +41,4 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 0 - Nintendo 3DS: 0 - Nintendo Switch: 0 - PS4: 0 - PSM: 0 - PSP2: 0 - Standalone: 0 - Tizen: 0 - WebGL: 0 - WiiU: 0 - Windows Store Apps: 0 - XboxOne: 0 - iPhone: 0 - tvOS: 0 + m_PerPlatformDefaultQuality: {} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events