From c4f89d89701148ad6be184bd33764e33d585977b Mon Sep 17 00:00:00 2001 From: tigerchen Date: Tue, 10 Dec 2019 10:58:59 +0800 Subject: [PATCH] [01_ForstCoronation/Unity-19050-01_ForstCoronation] Updated. --- .../Packages/com.ultracombos.osc | 1 - .../Packages/com.ultracombos.tuio | 1 - .../Packages/manifest.json | 25 ++++++++-------- .../ProjectSettings/ProjectSettings.asset | 30 ++++--------------- .../ProjectSettings/ProjectVersion.txt | 3 +- .../ProjectSettings/QualitySettings.asset | 2 +- .../UnityConnectSettings.asset | 2 +- 7 files changed, 20 insertions(+), 44 deletions(-) delete mode 160000 01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.osc delete mode 160000 01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.tuio diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.osc b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.osc deleted file mode 160000 index e594dfc..0000000 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.osc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e594dfc8647586530b53cd990d56caa0d07adde2 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.tuio b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.tuio deleted file mode 160000 index 7fb3c4f..0000000 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.tuio +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7fb3c4f677d0f087ccb4bc603055ea8f4ca9da10 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json index cd32adb..ff2c60a 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json @@ -2,20 +2,19 @@ "dependencies": { "com.ultracombos.configuration": "file:/../../../../../_Package/com.ultracombos.configuration", "com.ultracombos.grpc": "file:/../../../../../_Package/com.ultracombos.grpc", - "KlakSpout": "file:/../../../../../_Package/KlakSpout", - "com.unity.collab-proxy": "1.2.16", - "com.unity.ext.nunit": "1.0.0", - "com.unity.ide.rider": "1.1.0", - "com.unity.ide.vscode": "1.1.2", - "com.unity.package-manager-ui": "2.2.0", - "com.unity.render-pipelines.high-definition": "6.9.2-preview", - "com.unity.test-framework": "1.0.13", - "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.1.0", - "com.unity.ugui": "1.0.0", - "com.unity.visualeffectgraph": "6.9.2-preview", + "com.ultracombos.osc": "file:/../../../../../_Package/com.ultracombos.osc", + "com.ultracombos.tuio": "file:/../../../../../_Package/com.ultracombos.tuio", + "jp.keijiro.klak.spout": "file:/../../../../../_Package/KlakSpout", + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.8", + "com.unity.postprocessing": "2.2.2", + "com.unity.purchasing": "2.0.3", + "com.unity.render-pipelines.high-definition": "4.10.0-preview", + "com.unity.textmeshpro": "1.4.1", + "com.unity.visualeffectgraph": "4.10.0-preview", "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectSettings.asset b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectSettings.asset index bb04058..b5994f3 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectSettings.asset +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectSettings.asset @@ -65,7 +65,6 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 - androidUseSwappy: 0 androidBlitType: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -80,7 +79,6 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 - useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games @@ -127,6 +125,7 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 + isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -141,12 +140,6 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 oculus: sharedDepthBuffer: 1 dashSupport: 1 @@ -154,7 +147,6 @@ PlayerSettings: protectedContext: 0 v2Signing: 0 enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 protectGraphicsMemory: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 @@ -203,10 +195,6 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -266,14 +254,11 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - AndroidValidateAppBundleSize: 1 - AndroidAppBundleSizeToValidate: 150 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] @@ -295,10 +280,9 @@ PlayerSettings: m_APIs: 10000000 m_Automatic: 0 m_BuildTargetVRSettings: [] + m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 - openGLRequireES32: 0 - vuforiaEnabled: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -490,7 +474,6 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 - playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -524,7 +507,6 @@ PlayerSettings: monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1 @@ -539,9 +521,8 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: + 1: UNITY_POST_PROCESSING_STACK_V2 4: UNITY_POST_PROCESSING_STACK_V2 7: UNITY_POST_PROCESSING_STACK_V2 13: UNITY_POST_PROCESSING_STACK_V2 @@ -564,8 +545,6 @@ PlayerSettings: allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - gcIncremental: 0 - gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -596,6 +575,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -634,7 +614,7 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_SignPackage: 1 + m_PrivateKeyPath: luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectVersion.txt b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectVersion.txt index f499f71..12efb65 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectVersion.txt +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 2019.2.13f1 -m_EditorVersionWithRevision: 2019.2.13f1 (e20f6c7e5017) +m_EditorVersion: 2018.4.12f1 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/QualitySettings.asset b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/QualitySettings.asset index c75d812..f1383b7 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/QualitySettings.asset +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - skinWeights: 255 + blendWeights: 1 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/UnityConnectSettings.asset b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/UnityConnectSettings.asset index fa0b146..c3ae9a0 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/ProjectSettings/UnityConnectSettings.asset +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/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