diff --git a/Assets/Klak/NDI/Plugin/iOS/PluginEntry.cpp b/Assets/Klak/NDI/Plugin/iOS/PluginEntry.cpp index 0f526c9..dcbeeca 100644 --- a/Assets/Klak/NDI/Plugin/iOS/PluginEntry.cpp +++ b/Assets/Klak/NDI/Plugin/iOS/PluginEntry.cpp @@ -1,3 +1,4 @@ +#include #include #include "Sender.h" diff --git a/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Frameworks/libndi.3.dylib b/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Frameworks/libndi.3.dylib index 1405c66..9f25a72 100644 Binary files a/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Frameworks/libndi.3.dylib and b/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Frameworks/libndi.3.dylib differ diff --git a/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Info.plist b/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Info.plist index 8d3f4f7..e4ec57d 100644 --- a/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Info.plist +++ b/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 17G65 + 18C54 CFBundleDevelopmentRegion en CFBundleExecutable @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 10A255 + 10B61 DTPlatformVersion GM DTSDKBuild - 18A384 + 18B71 DTSDKName macosx10.14 DTXcode - 1000 + 1010 DTXcodeBuild - 10A255 + 10B61 NSHumanReadableCopyright Copyright © 2018 Keijiro Takahashi. All rights reserved. diff --git a/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/MacOS/KlakNDI b/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/MacOS/KlakNDI index d874d21..bdf3d82 100755 Binary files a/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/MacOS/KlakNDI and b/Assets/Klak/NDI/Plugin/macOS/KlakNDI.bundle/Contents/MacOS/KlakNDI differ diff --git a/Assets/Klak/NDI/Plugin/x64/KlakNDI.dll b/Assets/Klak/NDI/Plugin/x64/KlakNDI.dll index 911e983..c878f81 100644 Binary files a/Assets/Klak/NDI/Plugin/x64/KlakNDI.dll and b/Assets/Klak/NDI/Plugin/x64/KlakNDI.dll differ diff --git a/Assets/Klak/NDI/Plugin/x64/Processing.NDI.Lib.x64.dll b/Assets/Klak/NDI/Plugin/x64/Processing.NDI.Lib.x64.dll index 5559a71..8139090 100644 Binary files a/Assets/Klak/NDI/Plugin/x64/Processing.NDI.Lib.x64.dll and b/Assets/Klak/NDI/Plugin/x64/Processing.NDI.Lib.x64.dll differ diff --git a/Assets/Klak/NDI/Plugin/x86/KlakNDI.dll b/Assets/Klak/NDI/Plugin/x86/KlakNDI.dll index ee6ff4e..d537e0a 100644 Binary files a/Assets/Klak/NDI/Plugin/x86/KlakNDI.dll and b/Assets/Klak/NDI/Plugin/x86/KlakNDI.dll differ diff --git a/Assets/Klak/NDI/Plugin/x86/Processing.NDI.Lib.x86.dll b/Assets/Klak/NDI/Plugin/x86/Processing.NDI.Lib.x86.dll index b1c30a6..274632d 100644 Binary files a/Assets/Klak/NDI/Plugin/x86/Processing.NDI.Lib.x86.dll and b/Assets/Klak/NDI/Plugin/x86/Processing.NDI.Lib.x86.dll differ diff --git a/Assets/Test/Quad.unity b/Assets/Test/Quad.unity index e605d8f..98b6479 100644 --- a/Assets/Test/Quad.unity +++ b/Assets/Test/Quad.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028583, g: 0.22571579, b: 0.3069232, a: 1} + m_IndirectSpecularColor: {r: 0.18028617, g: 0.22571613, b: 0.30692387, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -167,7 +167,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 8400000, guid: 2745251d3ce96ee4aa4e71e8bb1d288d, type: 2} m_UVRect: serializedVersion: 2 @@ -309,7 +310,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 8400000, guid: 74a6e3248007c094cb23c5800f003e80, type: 2} m_UVRect: serializedVersion: 2 @@ -380,7 +382,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -389,6 +392,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &262447665 CanvasRenderer: m_ObjectHideFlags: 0 @@ -467,7 +471,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &365162264 MonoBehaviour: m_ObjectHideFlags: 0 @@ -486,7 +491,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -495,6 +501,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &365162265 CanvasRenderer: m_ObjectHideFlags: 0 @@ -629,7 +636,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -753,7 +761,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null m_IsOn: 1 --- !u!1 &677568167 GameObject: @@ -810,7 +819,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -819,6 +829,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &677568170 CanvasRenderer: m_ObjectHideFlags: 0 @@ -872,7 +883,6 @@ MonoBehaviour: m_EditorClassIdentifier: _sourceTexture: {fileID: 8400000, guid: 24cea74e7ac849844be12d55f169d889, type: 2} _alphaSupport: 1 - _shader: {fileID: 4800000, guid: bed99414d2a0d46449ed7f070aaea7e3, type: 3} --- !u!1 &726789822 GameObject: m_ObjectHideFlags: 0 @@ -953,7 +963,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Dropdown+DropdownEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Dropdown+DropdownEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!224 &726789824 RectTransform: m_ObjectHideFlags: 0 @@ -994,7 +1005,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1003,6 +1015,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &726789826 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1057,7 +1070,6 @@ MonoBehaviour: m_EditorClassIdentifier: _sourceTexture: {fileID: 0} _alphaSupport: 0 - _shader: {fileID: 4800000, guid: bed99414d2a0d46449ed7f070aaea7e3, type: 3} --- !u!20 &837768020 Camera: m_ObjectHideFlags: 0 @@ -1370,7 +1382,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1569,7 +1582,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1578,6 +1592,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1142878025 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1631,7 +1646,6 @@ MonoBehaviour: m_EditorClassIdentifier: _sourceTexture: {fileID: 8400000, guid: 74a6e3248007c094cb23c5800f003e80, type: 2} _alphaSupport: 0 - _shader: {fileID: 4800000, guid: bed99414d2a0d46449ed7f070aaea7e3, type: 3} --- !u!1 &1205248835 GameObject: m_ObjectHideFlags: 0 @@ -5436,7 +5450,7 @@ ParticleSystem: serializedVersion: 2 enabled: 0 subEmitters: - - serializedVersion: 2 + - serializedVersion: 3 emitter: {fileID: 0} type: 0 properties: 0 @@ -5624,6 +5638,7 @@ ParticleSystem: inheritParticleColor: 1 generateLightingData: 0 splitSubEmitterRibbons: 0 + attachRibbonsToTransform: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -6476,7 +6491,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6485,6 +6501,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1365751925 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6590,7 +6607,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &1616979219 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6609,7 +6627,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6618,6 +6637,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1616979220 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6682,7 +6702,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 8400000, guid: 3770f9d5521a2e44aa7901ab1286ee0c, type: 2} m_UVRect: serializedVersion: 2 @@ -6814,7 +6835,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 8400000, guid: 24cea74e7ac849844be12d55f169d889, type: 2} m_UVRect: serializedVersion: 2 @@ -6885,7 +6907,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -6946,7 +6969,6 @@ MonoBehaviour: m_EditorClassIdentifier: _sourceTexture: {fileID: 8400000, guid: 2745251d3ce96ee4aa4e71e8bb1d288d, type: 2} _alphaSupport: 0 - _shader: {fileID: 4800000, guid: bed99414d2a0d46449ed7f070aaea7e3, type: 3} --- !u!1 &2040500669 GameObject: m_ObjectHideFlags: 0 @@ -7002,7 +7024,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -7011,6 +7034,7 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2040500672 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index e57130f..4387309 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,6 @@ { "dependencies": { - "com.unity.package-manager-ui": "2.0.1", + "com.unity.package-manager-ui": "2.0.3", "com.unity.modules.particlesystem": "1.0.0", "com.unity.modules.ui": "1.0.0", "com.unity.modules.wind": "1.0.0" diff --git a/Plugin/Include/Common.h b/Plugin/Include/Common.h index f92195b..334c239 100644 --- a/Plugin/Include/Common.h +++ b/Plugin/Include/Common.h @@ -10,4 +10,5 @@ #endif +#include #include diff --git a/Plugin/Windows/KlakNDI.vcxproj b/Plugin/Windows/KlakNDI.vcxproj index 9cec2b1..fbc28c8 100644 --- a/Plugin/Windows/KlakNDI.vcxproj +++ b/Plugin/Windows/KlakNDI.vcxproj @@ -23,7 +23,7 @@ {5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6} Win32Proj KlakNDI - 10.0.17134.0 + 10.0.17763.0 @@ -183,4 +183,4 @@ - + \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ef5245a..9c69d99 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -52,7 +52,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 iosAllowHTTPDownload: 1 @@ -64,6 +63,8 @@ PlayerSettings: use32BitDisplayBuffer: 1 preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -97,9 +98,6 @@ PlayerSettings: xboxEnableGuest: 0 xboxEnablePIXSampling: 0 metalFramebufferOnly: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 xboxOneResolution: 0 xboxOneSResolution: 0 xboxOneXResolution: 3 @@ -108,9 +106,7 @@ PlayerSettings: xboxOneDisableEsram: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 + vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -124,6 +120,7 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 + isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -138,11 +135,12 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 - enable360StereoCapture: 0 oculus: sharedDepthBuffer: 0 dashSupport: 0 + enable360StereoCapture: 0 protectGraphicsMemory: 0 + enableFrameTimingStats: 0 useHDRDisplay: 0 m_ColorGamuts: 0000000003000000 targetPixelDensity: 30 @@ -167,7 +165,7 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 8.0 + iOSTargetOSVersionString: 9.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 9.0 @@ -228,6 +226,8 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 appleEnableProMotion: 0 @@ -239,6 +239,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 0 @@ -299,6 +300,7 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -420,7 +422,11 @@ PlayerSettings: switchAllowsVideoCapturing: 1 switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -477,6 +483,7 @@ PlayerSettings: ps4pnGameCustomData: 1 playerPrefsSupport: 0 enableApplicationExit: 0 + resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 @@ -500,53 +507,6 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] monoEnv: - psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: - psp2NPSupportGBMorGJP: 0 - psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: - psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui - psp2KeystoneFile: - psp2MemoryExpansionMode: 0 - psp2DRMType: 0 - psp2StorageType: 0 - psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: - psp2SaveDataQuota: 10240 - psp2ParentalLevel: 1 - psp2ShortTitle: Not Set - psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF - psp2Category: 0 - psp2MasterVersion: 01.00 - psp2AppVersion: 01.00 - psp2TVBootMode: 0 - psp2EnterButtonAssignment: 2 - psp2TVDisableEmu: 0 - psp2AllowTwitterDialog: 1 - psp2Upgradable: 0 - psp2HealthWarning: 0 - psp2UseLibLocation: 0 - psp2InfoBarOnStartup: 0 - psp2InfoBarColor: 0 - psp2ScriptOptimizationLevel: 0 splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: @@ -562,6 +522,7 @@ PlayerSettings: webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 webGLLinkerTarget: 0 + webGLThreadsSupport: 0 scriptingDefineSymbols: 1: UNITY_POST_PROCESSING_STACK_V2 4: UNITY_POST_PROCESSING_STACK_V2 @@ -579,10 +540,11 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 1 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -596,11 +558,12 @@ PlayerSettings: metroApplicationDescription: Template_3D wsaImages: {} metroTileShortName: - metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 metroDefaultTileSize: 1 metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} @@ -608,29 +571,11 @@ PlayerSettings: a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} + metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - tizenDeploymentTarget: - tizenDeploymentTargetType: -1 - tizenMinOSVersion: 1 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -640,6 +585,7 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: @@ -655,17 +601,37 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 xboxOneScriptCompiler: 0 + XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: UNet: 1 + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_PrivateKeyPath: + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: facebookSdkVersion: 7.9.4 - apiCompatibilityLevel: 2 + facebookAppId: + facebookCookies: 1 + facebookLogging: 1 + facebookStatus: 1 + facebookXfbml: 0 + facebookFrictionlessRequests: 1 + apiCompatibilityLevel: 6 cloudProjectId: + framebufferDepthMemorylessMode: 0 projectName: Template_3D organizationId: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 + legacyClampBlendShapeWeights: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index c2f4163..ca32b1e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.0b3 +m_EditorVersion: 2018.3.0f2 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 0def846..06db74a 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -21,6 +21,7 @@ UnityConnectSettings: UnityAnalyticsSettings: m_Enabled: 1 m_TestMode: 0 + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1