Upgrade to Unity 5.6

This commit is contained in:
Robert Cupisz 2017-04-04 12:27:05 +02:00
parent fc99d4650f
commit 57e7e4303a
6 changed files with 30 additions and 29 deletions

View File

@ -18,7 +18,7 @@ Pass
v2f vert (appdata_base v) v2f vert (appdata_base v)
{ {
v2f o; v2f o;
o.pos = mul (UNITY_MATRIX_MVP, v.vertex); o.pos = UnityObjectToClipPos (v.vertex);
return o; return o;
} }

View File

@ -3,7 +3,7 @@
--- !u!30 &1 --- !u!30 &1
GraphicsSettings: GraphicsSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 7 serializedVersion: 9
m_Deferred: m_Deferred:
m_Mode: 1 m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@ -39,22 +39,18 @@ GraphicsSettings:
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0} type: 0}
m_ShaderSettings_Tier1: m_TierSettings_Tier1:
renderingPath: 3
useCascadedShadowMaps: 1 useCascadedShadowMaps: 1
standardShaderQuality: 2 m_TierSettings_Tier2:
useReflectionProbeBoxProjection: 1 renderingPath: 3
useReflectionProbeBlending: 1
m_ShaderSettings_Tier2:
useCascadedShadowMaps: 1 useCascadedShadowMaps: 1
standardShaderQuality: 2 m_TierSettings_Tier3:
useReflectionProbeBoxProjection: 1 renderingPath: 3
useReflectionProbeBlending: 1
m_ShaderSettings_Tier3:
useCascadedShadowMaps: 1 useCascadedShadowMaps: 1
standardShaderQuality: 2 m_DefaultRenderingPath: 3
useReflectionProbeBoxProjection: 1 m_DefaultMobileRenderingPath: 1
useReflectionProbeBlending: 1 m_TierSettings: []
m_BuildTargetShaderSettings: []
m_LightmapStripping: 0 m_LightmapStripping: 0
m_FogStripping: 0 m_FogStripping: 0
m_LightmapKeepPlain: 1 m_LightmapKeepPlain: 1

View File

@ -123,6 +123,7 @@ PlayerSettings:
iPhoneTargetOSVersion: 24 iPhoneTargetOSVersion: 24
tvOSSdkVersion: 0 tvOSSdkVersion: 0
tvOSTargetOSVersion: 900 tvOSTargetOSVersion: 900
tvOSRequireExtendedGameController: 0
uIPrerenderedIcon: 0 uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0 uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1 uIRequiresFullScreen: 1
@ -162,6 +163,7 @@ PlayerSettings:
iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreeniPadCustomXibPath:
iOSDeviceRequirements: [] iOSDeviceRequirements: []
iOSURLSchemes: [] iOSURLSchemes: []
appleDeveloperTeamID:
AndroidTargetDevice: 0 AndroidTargetDevice: 0
AndroidSplashScreenScale: 0 AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0} androidSplashScreen: {fileID: 0}
@ -206,12 +208,15 @@ PlayerSettings:
wiiUSystemHeapSize: 128 wiiUSystemHeapSize: 128
wiiUTVStartupScreen: {fileID: 0} wiiUTVStartupScreen: {fileID: 0}
wiiUGamePadStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0}
wiiUDrcBufferDisabled: 0
wiiUProfilerLibPath: wiiUProfilerLibPath:
actionOnDotNetUnhandledException: 1 actionOnDotNetUnhandledException: 1
enableInternalProfiler: 0 enableInternalProfiler: 0
logObjCUncaughtExceptions: 1 logObjCUncaughtExceptions: 1
enableCrashReportAPI: 0 enableCrashReportAPI: 0
cameraUsageDescription:
locationUsageDescription: locationUsageDescription:
microphoneUsageDescription:
XboxTitleId: XboxTitleId:
XboxImageXexPath: XboxImageXexPath:
XboxSpaPath: XboxSpaPath:
@ -251,7 +256,8 @@ PlayerSettings:
ps4AppType: 0 ps4AppType: 0
ps4ParamSfxPath: ps4ParamSfxPath:
ps4VideoOutPixelFormat: 0 ps4VideoOutPixelFormat: 0
ps4VideoOutResolution: 4 ps4VideoOutInitialWidth: 1920
ps4VideoOutReprojectionRate: 120
ps4PronunciationXMLPath: ps4PronunciationXMLPath:
ps4PronunciationSIGPath: ps4PronunciationSIGPath:
ps4BackgroundImagePath: ps4BackgroundImagePath:
@ -280,9 +286,12 @@ PlayerSettings:
ps4pnFriends: 1 ps4pnFriends: 1
ps4pnGameCustomData: 1 ps4pnGameCustomData: 1
playerPrefsSupport: 0 playerPrefsSupport: 0
ps4UseResolutionFallback: 0
restrictedAudioUsageRights: 0
ps4ReprojectionSupport: 0 ps4ReprojectionSupport: 0
ps4UseAudio3dBackend: 0 ps4UseAudio3dBackend: 0
ps4SocialScreenEnabled: 0 ps4SocialScreenEnabled: 0
ps4ScriptOptimizationLevel: 3
ps4Audio3dVirtualSpeakerCount: 14 ps4Audio3dVirtualSpeakerCount: 14
ps4attribCpuUsage: 0 ps4attribCpuUsage: 0
ps4PatchPkgPath: ps4PatchPkgPath:

View File

@ -1,2 +1 @@
m_EditorVersion: 5.4.1f1 m_EditorVersion: 5.5.0f3
m_StandardAssetsVersion: 0

View File

@ -1,11 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!292 &1
UnityAdsSettings:
m_ObjectHideFlags: 0
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId:

View File

@ -10,6 +10,7 @@ UnityConnectSettings:
CrashReportingSettings: CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
m_Enabled: 0 m_Enabled: 0
m_CaptureEditorExceptions: 1
UnityPurchasingSettings: UnityPurchasingSettings:
m_Enabled: 0 m_Enabled: 0
m_TestMode: 0 m_TestMode: 0
@ -19,3 +20,10 @@ UnityConnectSettings:
m_TestMode: 0 m_TestMode: 0
m_TestEventUrl: m_TestEventUrl:
m_TestConfigUrl: m_TestConfigUrl:
UnityAdsSettings:
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId: