diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index d6dd322..658f492 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -13,13 +13,25 @@ MonoBehaviour: m_Name: AddressableAssetSettings m_EditorClassIdentifier: m_DefaultGroup: 1be7c3e87804947feb02531db73c364a + m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 + m_BundleLocalCatalog: 0 + m_CatalogRequestsTimeout: 0 m_DisableCatalogUpdateOnStart: 0 + m_IgnoreUnsupportedFilesInBuild: 0 m_UniqueBundleIds: 0 + m_NonRecursiveBuilding: 0 + m_maxConcurrentWebRequests: 500 + m_ContiguousBundles: 0 + m_ShaderBundleNaming: 0 + m_ShaderBundleCustomNaming: + m_MonoScriptBundleNaming: 0 + m_MonoScriptBundleCustomNaming: m_RemoteCatalogBuildPath: m_Id: m_RemoteCatalogLoadPath: m_Id: + m_ContentStateBuildPath: m_overridePlayerVersion: m_GroupAssets: - {fileID: 11400000, guid: 581e4e257ab6c417bb1290bccf5cf9b1, type: 2} diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index baa491b..7269eea 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta deleted file mode 100644 index 8cb79b2..0000000 --- a/Assets/Plugins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 71e9e97e1b2607546bb2b841fdf91861 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta deleted file mode 100644 index 9ff384b..0000000 --- a/Assets/Plugins/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d8c7dd19afcd91a448e7e3656467374d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Android/launcherTemplate.gradle b/Assets/Plugins/Android/launcherTemplate.gradle deleted file mode 100644 index 9df3c20..0000000 --- a/Assets/Plugins/Android/launcherTemplate.gradle +++ /dev/null @@ -1,84 +0,0 @@ -buildscript { - repositories { - google() - jcenter() - } - dependencies { - // Must be Android Gradle Plugin 3.6.0 or later. For a list of - // compatible Gradle versions refer to: - // https://developer.android.com/studio/releases/gradle-plugin - classpath 'com.android.tools.build:gradle:3.6.0' - } -} - -allprojects { - repositories { - google() - jcenter() - flatDir { - dirs 'libs' - } - } -} - -apply plugin: 'com.android.application' - -dependencies { - implementation project(':unityLibrary') - } - -android { - compileSdkVersion **APIVERSION** - buildToolsVersion '**BUILDTOOLS**' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - minSdkVersion **MINSDKVERSION** - targetSdkVersion **TARGETSDKVERSION** - applicationId '**APPLICATIONID**' - ndk { - abiFilters **ABIFILTERS** - } - versionCode **VERSIONCODE** - versionName '**VERSIONNAME**' - } - - aaptOptions { - noCompress = ['.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**] - ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" - }**SIGN** - - lintOptions { - abortOnError false - } - - buildTypes { - debug { - minifyEnabled **MINIFY_DEBUG** - useProguard **PROGUARD_DEBUG** - proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** - jniDebuggable true - } - release { - minifyEnabled **MINIFY_RELEASE** - useProguard **PROGUARD_RELEASE** - proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** - } - }**PACKAGING_OPTIONS****SPLITS** -**BUILT_APK_LOCATION** - bundle { - language { - enableSplit = false - } - density { - enableSplit = false - } - abi { - enableSplit = true - } - } -}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP** diff --git a/Assets/Plugins/Android/launcherTemplate.gradle.meta b/Assets/Plugins/Android/launcherTemplate.gradle.meta deleted file mode 100644 index 6bcfdf6..0000000 --- a/Assets/Plugins/Android/launcherTemplate.gradle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a58f66645d3d2df4782967dd3f7a3db6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle deleted file mode 100644 index 8afd89f..0000000 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ /dev/null @@ -1,59 +0,0 @@ -buildscript { - repositories { - google() - jcenter() - } - dependencies { - // Must be Android Gradle Plugin 3.6.0 or later. For a list of - // compatible Gradle versions refer to: - // https://developer.android.com/studio/releases/gradle-plugin - classpath 'com.android.tools.build:gradle:3.6.0' - } -} - -allprojects { - repositories { - google() - jcenter() - flatDir { - dirs 'libs' - } - } -} - -apply plugin: 'com.android.library' -**APPLY_PLUGINS** - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) -**DEPS**} - -android { - compileSdkVersion **APIVERSION** - buildToolsVersion '**BUILDTOOLS**' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - minSdkVersion **MINSDKVERSION** - targetSdkVersion **TARGETSDKVERSION** - ndk { - abiFilters **ABIFILTERS** - } - versionCode **VERSIONCODE** - versionName '**VERSIONNAME**' - consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD** - } - - lintOptions { - abortOnError false - } - - aaptOptions { - ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" - }**PACKAGING_OPTIONS** -}**REPOSITORIES****SOURCE_BUILD_SETUP** -**EXTERNAL_SOURCES** diff --git a/Assets/Plugins/Android/mainTemplate.gradle.meta b/Assets/Plugins/Android/mainTemplate.gradle.meta deleted file mode 100644 index 5298c39..0000000 --- a/Assets/Plugins/Android/mainTemplate.gradle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fdb14a249550dc444ba83f877e7a5ba1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/Shadows/Materials/Blue.mat b/Assets/Shaders/Shadows/Materials/Blue.mat index 86d09b4..4f6732d 100644 --- a/Assets/Shaders/Shadows/Materials/Blue.mat +++ b/Assets/Shaders/Shadows/Materials/Blue.mat @@ -64,12 +64,27 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnvironmentReflections: 1 @@ -93,7 +108,7 @@ Material: m_Colors: - _BaseColor: {r: 0, g: 0.74509805, b: 0.8196079, a: 1} - _Color: {r: 0, g: 0.74509805, b: 0.8196079, a: 1} - - _EmissionColor: {r: 0.0627451, g: 0.0627451, b: 0.0627451, a: 1} + - _EmissionColor: {r: 0.005181517, g: 0.005181517, b: 0.005181517, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] --- !u!114 &4790518389463324394 @@ -108,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 4 diff --git a/Assets/Shaders/Shadows/Materials/Orange.mat b/Assets/Shaders/Shadows/Materials/Orange.mat index d5dedd4..99d908a 100644 --- a/Assets/Shaders/Shadows/Materials/Orange.mat +++ b/Assets/Shaders/Shadows/Materials/Orange.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 4 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,12 +77,27 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnvironmentReflections: 1 @@ -106,6 +121,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 0.6617759, b: 0, a: 0.66885626} - _Color: {r: 1, g: 0.66177595, b: 0, a: 0.66885626} - - _EmissionColor: {r: 0.078431375, g: 0.078431375, b: 0.078431375, a: 1} + - _EmissionColor: {r: 0.00699541, g: 0.00699541, b: 0.00699541, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Shaders/Shadows/Materials/Red.mat b/Assets/Shaders/Shadows/Materials/Red.mat index 5d364cb..4a0c60c 100644 --- a/Assets/Shaders/Shadows/Materials/Red.mat +++ b/Assets/Shaders/Shadows/Materials/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 4 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta index 824abc5..065b88b 100644 --- a/Assets/StreamingAssets.meta +++ b/Assets/StreamingAssets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bed79f64d2c18a44697f2c1c01a1fd98 +guid: c6021898840ced641b2ec82d5a74401d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/manifest.json b/Packages/manifest.json index 952fae8..f5113c9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ide.rider": "1.1.4", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.11", "com.unity.ide.vscode": "1.2.3", - "com.unity.localization": "0.7.1-preview", - "com.unity.render-pipelines.universal": "7.3.1", - "com.unity.test-framework": "1.1.19", - "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.10", + "com.unity.localization": "1.0.0-pre.9", + "com.unity.render-pipelines.universal": "10.5.1", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", - "com.unity.xr.arcore": "4.1.5", - "com.unity.xr.arfoundation": "4.1.5", - "com.unity.xr.arkit": "4.1.5", - "com.unity.xr.management": "3.2.16", + "com.unity.xr.arcore": "4.1.7", + "com.unity.xr.arfoundation": "4.1.7", + "com.unity.xr.arkit": "4.1.7", + "com.unity.xr.management": "4.0.7", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b07cff8..4b76db9 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,12 +7,14 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "1.7.5", + "version": "1.18.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.5.10", + "com.unity.scriptablebuildpipeline": "1.18.0", "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, @@ -26,14 +28,14 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.5", - "depth": 1, + "version": "1.0.6", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -41,6 +43,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.visualstudio": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.vscode": { "version": "1.2.3", "depth": 0, @@ -49,24 +60,23 @@ "url": "https://packages.unity.com" }, "com.unity.localization": { - "version": "0.7.1-preview", + "version": "1.0.0-pre.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.addressables": "1.7.5", - "com.unity.nuget.newtonsoft-json": "1.1.2" + "com.unity.addressables": "1.18.2" }, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "1.1.2", + "com.unity.mathematics": { + "version": "1.1.0", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "7.3.1", + "version": "10.5.1", "depth": 1, "source": "registry", "dependencies": { @@ -75,28 +85,37 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.universal": { - "version": "7.3.1", + "version": "10.5.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1", - "com.unity.shadergraph": "7.3.1" + "com.unity.mathematics": "1.1.0", + "com.unity.render-pipelines.core": "10.5.1", + "com.unity.shadergraph": "10.5.1" }, "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.5.10", + "version": "1.18.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.searcher": { + "version": "4.3.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "7.3.1", + "version": "10.5.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "7.3.1" + "com.unity.render-pipelines.core": "10.5.1", + "com.unity.searcher": "4.3.2" }, "url": "https://packages.unity.com" }, @@ -110,18 +129,18 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.19", - "depth": 0, + "version": "1.1.26", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.5", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.0.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -130,10 +149,15 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.10", + "version": "1.4.8", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ugui": { @@ -146,39 +170,39 @@ } }, "com.unity.xr.arcore": { - "version": "4.1.5", + "version": "4.1.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.arsubsystems": "4.1.5", + "com.unity.xr.arsubsystems": "4.1.7", "com.unity.xr.management": "4.0.1", "com.unity.modules.androidjni": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "4.1.5", + "version": "4.1.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.arsubsystems": "4.1.5", + "com.unity.xr.arsubsystems": "4.1.7", "com.unity.xr.management": "4.0.1" }, "url": "https://packages.unity.com" }, "com.unity.xr.arkit": { - "version": "4.1.5", + "version": "4.1.7", "depth": 0, "source": "registry", "dependencies": { "com.unity.editorcoroutines": "1.0.0", - "com.unity.xr.arsubsystems": "4.1.5", + "com.unity.xr.arsubsystems": "4.1.7", "com.unity.xr.management": "4.0.1" }, "url": "https://packages.unity.com" }, "com.unity.xr.arsubsystems": { - "version": "4.1.5", + "version": "4.1.7", "depth": 1, "source": "registry", "dependencies": { @@ -188,7 +212,7 @@ }, "com.unity.xr.legacyinputhelpers": { "version": "2.1.7", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", @@ -197,8 +221,8 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.0.1", - "depth": 1, + "version": "4.0.7", + "depth": 0, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", @@ -319,6 +343,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9ddb2a3..184b61c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/UX/Scenes/UXManagerScene.unity guid: 5d9539f4c7ee5c74c85a038c90cb6e1b - enabled: 1 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index ca9e773..be4a797 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -9,9 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 oneTimeWarningShown: 0 m_Registries: @@ -20,6 +23,7 @@ MonoBehaviour: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 + m_Capabilities: 7 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: @@ -30,6 +34,7 @@ MonoBehaviour: m_Url: m_Scopes: [] m_IsDefault: 0 + m_Capabilities: 0 m_Modified: 0 m_Name: m_Url: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 34873be..c2e6bd6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: af0fdccff30f9a944ac511632c352f67 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -117,6 +119,7 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 @@ -127,37 +130,14 @@ PlayerSettings: bundleVersion: 0.1 preloadedAssets: - {fileID: 11400000, guid: 6f7fbab671a5848ddae17e25cb330888, type: 2} + - {fileID: 207803842820362116, guid: 0c7320f37e3f8b24c9e5b5fd999e40e0, type: 2} + - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -168,8 +148,13 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} + applicationIdentifier: + Android: com.DefaultCompany.ARDemos + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 0 @@ -223,8 +208,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -242,9 +227,17 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.5 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 2 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -262,6 +255,9 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] @@ -441,6 +437,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -450,12 +447,14 @@ PlayerSettings: cameraUsageDescription: AR BABY locationUsageDescription: microphoneUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -473,6 +472,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -488,6 +488,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -503,6 +504,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -518,6 +520,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -580,6 +583,9 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -650,6 +656,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -670,11 +677,13 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: 4: UNITY_XR_ARKIT_LOADER_ENABLED + additionalCompilerArguments: {} platformArchitecture: iPhone: 1 scriptingBackend: @@ -682,7 +691,11 @@ PlayerSettings: il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -745,10 +758,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -763,11 +773,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 88062e3..95c2fc9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.17f1 -m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536) +m_EditorVersion: 2020.3.13f1 +m_EditorVersionWithRevision: 2020.3.13f1 (71691879b7f5) diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index fa89832..3077404 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 1 + m_LastMaterialVersion: 4 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fa0b146..6125b30 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -9,6 +9,7 @@ UnityConnectSettings: m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com