merge
This commit is contained in:
1 parent
c2fe73f6f5
commit
4425c4d9eb
11 files changed
+484
-210
No files matched your search
@@ -58,7 +58,7 @@ GraphicsSettings:
|
||||
m_FogKeepExp: 1
|
||||
m_FogKeepExp2: 1
|
||||
m_AlbedoSwatchInfos: []
|
||||
m_LightsUseLinearIntensity: 1
|
||||
m_LightsUseLinearIntensity: 0
|
||||
m_LightsUseColorTemperature: 1
|
||||
m_DefaultRenderingLayerMask: 1
|
||||
m_LogWhenShaderIsCompiled: 0
|
||||
|
||||
@@ -4,7 +4,11 @@
|
||||
PlayerSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 23
|
||||
<<<<<<< HEAD
|
||||
productGUID: fc4d705c3ad52bb46a9c8d0e2e8e3dff
|
||||
=======
|
||||
productGUID: 2c6681e446a284b8cbace77d010757b1
|
||||
>>>>>>> 3ccdbf5 (changed chury)
|
||||
AndroidProfiler: 0
|
||||
AndroidFilterTouchesWhenObscured: 0
|
||||
AndroidEnableSustainedPerformanceMode: 0
|
||||
@@ -13,7 +17,11 @@ 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}
|
||||
@@ -47,7 +55,7 @@ PlayerSettings:
|
||||
defaultScreenWidthWeb: 960
|
||||
defaultScreenHeightWeb: 600
|
||||
m_StereoRenderingPath: 0
|
||||
m_ActiveColorSpace: 1
|
||||
m_ActiveColorSpace: 0
|
||||
m_MTRendering: 1
|
||||
mipStripping: 0
|
||||
numberOfMipsStripped: 0
|
||||
@@ -135,8 +143,12 @@ PlayerSettings:
|
||||
16:9: 1
|
||||
Others: 1
|
||||
bundleVersion: 1.0
|
||||
<<<<<<< HEAD
|
||||
preloadedAssets:
|
||||
- {fileID: 0}
|
||||
=======
|
||||
preloadedAssets: []
|
||||
>>>>>>> 3ccdbf5 (changed chury)
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
@@ -155,15 +167,23 @@ PlayerSettings:
|
||||
resetResolutionOnWindowResize: 0
|
||||
androidSupportedAspectRatio: 1
|
||||
androidMaxAspectRatio: 2.1
|
||||
<<<<<<< HEAD
|
||||
applicationIdentifier:
|
||||
Android: com.DefaultCompany.Mission_Rosetta_NEU
|
||||
=======
|
||||
applicationIdentifier: {}
|
||||
>>>>>>> 3ccdbf5 (changed chury)
|
||||
buildNumber:
|
||||
Standalone: 0
|
||||
iPhone: 0
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 0
|
||||
AndroidBundleVersionCode: 1
|
||||
<<<<<<< HEAD
|
||||
AndroidMinSdkVersion: 23
|
||||
=======
|
||||
AndroidMinSdkVersion: 22
|
||||
>>>>>>> 3ccdbf5 (changed chury)
|
||||
AndroidTargetSdkVersion: 0
|
||||
AndroidPreferredInstallLocation: 0
|
||||
aotOptions:
|
||||
@@ -573,7 +593,7 @@ PlayerSettings:
|
||||
ps4GarlicHeapSize: 2048
|
||||
ps4ProGarlicHeapSize: 2560
|
||||
playerPrefsMaxSize: 32768
|
||||
ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
|
||||
ps4Passcode: V8gsn4cXpfMzMEPdXvIn13mlLYLkE7UN
|
||||
ps4pnSessions: 1
|
||||
ps4pnPresence: 1
|
||||
ps4pnFriends: 1
|
||||
@@ -647,14 +667,22 @@ 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
|
||||
|
||||
Reference in new issue
Block a user