diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index ec16d41..001e787 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -58,7 +58,7 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 + m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8c6ad3f..84c379c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -4,11 +4,7 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 23 -<<<<<<< HEAD - productGUID: fc4d705c3ad52bb46a9c8d0e2e8e3dff -======= - productGUID: 2c6681e446a284b8cbace77d010757b1 ->>>>>>> 3ccdbf5 (changed chury) + productGUID: 9876005b726e7414593d3951da769d5f AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -17,11 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany -<<<<<<< HEAD - productName: Mission_Rosetta_NEU -======= productName: Mission_Rosetta_XR ->>>>>>> 3ccdbf5 (changed chury) defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1} @@ -55,7 +47,7 @@ PlayerSettings: defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 + m_ActiveColorSpace: 1 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 @@ -143,12 +135,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 1.0 -<<<<<<< HEAD - preloadedAssets: - - {fileID: 0} -======= preloadedAssets: [] ->>>>>>> 3ccdbf5 (changed chury) metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -167,23 +154,15 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 -<<<<<<< HEAD applicationIdentifier: - Android: com.DefaultCompany.Mission_Rosetta_NEU -======= - applicationIdentifier: {} ->>>>>>> 3ccdbf5 (changed chury) + Android: com.DefaultCompany.Mission_Rosetta_XR buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 -<<<<<<< HEAD AndroidMinSdkVersion: 23 -======= - AndroidMinSdkVersion: 22 ->>>>>>> 3ccdbf5 (changed chury) AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 0 aotOptions: @@ -593,7 +572,7 @@ PlayerSettings: ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 playerPrefsMaxSize: 32768 - ps4Passcode: V8gsn4cXpfMzMEPdXvIn13mlLYLkE7UN + ps4Passcode: dpCO6qJtsjRLY3mMmV9G0lQVelHGNilG ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -667,22 +646,14 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 -<<<<<<< HEAD - metroPackageName: Mission_Rosetta_NEU -======= metroPackageName: Mission_Rosetta_XR ->>>>>>> 3ccdbf5 (changed chury) metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 -<<<<<<< HEAD - metroApplicationDescription: Mission_Rosetta_NEU -======= metroApplicationDescription: Mission_Rosetta_XR ->>>>>>> 3ccdbf5 (changed chury) wsaImages: {} metroTileShortName: metroTileShowName: 0