Merge commit 'c08f0d1ab0094c178fc9b3e23d1980a4142d73cf'
# Conflicts: # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectSettings.asset
This commit is contained in:
		
						commit
						f3d4a30be7
					
				
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										8
									
								
								Assets/Scenes/Unity_Game_Raum_17_03_22_1940.fbm.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								Assets/Scenes/Unity_Game_Raum_17_03_22_1940.fbm.meta
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: c7b5e9a24e14b4c11bdfea08d388e9c9
 | 
				
			||||||
 | 
					folderAsset: yes
 | 
				
			||||||
 | 
					DefaultImporter:
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 28 MiB  | 
@ -0,0 +1,96 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 235c65434ea564767ba72eb61f8d5448
 | 
				
			||||||
 | 
					TextureImporter:
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 11
 | 
				
			||||||
 | 
					  mipmaps:
 | 
				
			||||||
 | 
					    mipMapMode: 0
 | 
				
			||||||
 | 
					    enableMipMap: 1
 | 
				
			||||||
 | 
					    sRGBTexture: 1
 | 
				
			||||||
 | 
					    linearTexture: 0
 | 
				
			||||||
 | 
					    fadeOut: 0
 | 
				
			||||||
 | 
					    borderMipMap: 0
 | 
				
			||||||
 | 
					    mipMapsPreserveCoverage: 0
 | 
				
			||||||
 | 
					    alphaTestReferenceValue: 0.5
 | 
				
			||||||
 | 
					    mipMapFadeDistanceStart: 1
 | 
				
			||||||
 | 
					    mipMapFadeDistanceEnd: 3
 | 
				
			||||||
 | 
					  bumpmap:
 | 
				
			||||||
 | 
					    convertToNormalMap: 0
 | 
				
			||||||
 | 
					    externalNormalMap: 0
 | 
				
			||||||
 | 
					    heightScale: 0.25
 | 
				
			||||||
 | 
					    normalMapFilter: 0
 | 
				
			||||||
 | 
					  isReadable: 0
 | 
				
			||||||
 | 
					  streamingMipmaps: 0
 | 
				
			||||||
 | 
					  streamingMipmapsPriority: 0
 | 
				
			||||||
 | 
					  vTOnly: 0
 | 
				
			||||||
 | 
					  grayScaleToAlpha: 0
 | 
				
			||||||
 | 
					  generateCubemap: 6
 | 
				
			||||||
 | 
					  cubemapConvolution: 0
 | 
				
			||||||
 | 
					  seamlessCubemap: 0
 | 
				
			||||||
 | 
					  textureFormat: 1
 | 
				
			||||||
 | 
					  maxTextureSize: 2048
 | 
				
			||||||
 | 
					  textureSettings:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    filterMode: 1
 | 
				
			||||||
 | 
					    aniso: 1
 | 
				
			||||||
 | 
					    mipBias: 0
 | 
				
			||||||
 | 
					    wrapU: 0
 | 
				
			||||||
 | 
					    wrapV: 0
 | 
				
			||||||
 | 
					    wrapW: 0
 | 
				
			||||||
 | 
					  nPOTScale: 1
 | 
				
			||||||
 | 
					  lightmap: 0
 | 
				
			||||||
 | 
					  compressionQuality: 50
 | 
				
			||||||
 | 
					  spriteMode: 0
 | 
				
			||||||
 | 
					  spriteExtrude: 1
 | 
				
			||||||
 | 
					  spriteMeshType: 1
 | 
				
			||||||
 | 
					  alignment: 0
 | 
				
			||||||
 | 
					  spritePivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
 | 
					  spritePixelsToUnits: 100
 | 
				
			||||||
 | 
					  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
 | 
				
			||||||
 | 
					  spriteGenerateFallbackPhysicsShape: 1
 | 
				
			||||||
 | 
					  alphaUsage: 1
 | 
				
			||||||
 | 
					  alphaIsTransparency: 0
 | 
				
			||||||
 | 
					  spriteTessellationDetail: -1
 | 
				
			||||||
 | 
					  textureType: 0
 | 
				
			||||||
 | 
					  textureShape: 1
 | 
				
			||||||
 | 
					  singleChannelComponent: 0
 | 
				
			||||||
 | 
					  flipbookRows: 1
 | 
				
			||||||
 | 
					  flipbookColumns: 1
 | 
				
			||||||
 | 
					  maxTextureSizeSet: 0
 | 
				
			||||||
 | 
					  compressionQualitySet: 0
 | 
				
			||||||
 | 
					  textureFormatSet: 0
 | 
				
			||||||
 | 
					  ignorePngGamma: 0
 | 
				
			||||||
 | 
					  applyGammaDecoding: 0
 | 
				
			||||||
 | 
					  platformSettings:
 | 
				
			||||||
 | 
					  - serializedVersion: 3
 | 
				
			||||||
 | 
					    buildTarget: DefaultTexturePlatform
 | 
				
			||||||
 | 
					    maxTextureSize: 2048
 | 
				
			||||||
 | 
					    resizeAlgorithm: 0
 | 
				
			||||||
 | 
					    textureFormat: -1
 | 
				
			||||||
 | 
					    textureCompression: 1
 | 
				
			||||||
 | 
					    compressionQuality: 50
 | 
				
			||||||
 | 
					    crunchedCompression: 0
 | 
				
			||||||
 | 
					    allowsAlphaSplitting: 0
 | 
				
			||||||
 | 
					    overridden: 0
 | 
				
			||||||
 | 
					    androidETC2FallbackOverride: 0
 | 
				
			||||||
 | 
					    forceMaximumCompressionQuality_BC6H_BC7: 0
 | 
				
			||||||
 | 
					  spriteSheet:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    sprites: []
 | 
				
			||||||
 | 
					    outline: []
 | 
				
			||||||
 | 
					    physicsShape: []
 | 
				
			||||||
 | 
					    bones: []
 | 
				
			||||||
 | 
					    spriteID: 
 | 
				
			||||||
 | 
					    internalID: 0
 | 
				
			||||||
 | 
					    vertices: []
 | 
				
			||||||
 | 
					    indices: 
 | 
				
			||||||
 | 
					    edges: []
 | 
				
			||||||
 | 
					    weights: []
 | 
				
			||||||
 | 
					    secondaryTextures: []
 | 
				
			||||||
 | 
					  spritePackingTag: 
 | 
				
			||||||
 | 
					  pSDRemoveMatte: 0
 | 
				
			||||||
 | 
					  pSDShowRemoveMatteOption: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 53 MiB  | 
@ -0,0 +1,96 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 04624bbe7a5ec4de991110c2412dcdcc
 | 
				
			||||||
 | 
					TextureImporter:
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 11
 | 
				
			||||||
 | 
					  mipmaps:
 | 
				
			||||||
 | 
					    mipMapMode: 0
 | 
				
			||||||
 | 
					    enableMipMap: 1
 | 
				
			||||||
 | 
					    sRGBTexture: 0
 | 
				
			||||||
 | 
					    linearTexture: 0
 | 
				
			||||||
 | 
					    fadeOut: 0
 | 
				
			||||||
 | 
					    borderMipMap: 0
 | 
				
			||||||
 | 
					    mipMapsPreserveCoverage: 0
 | 
				
			||||||
 | 
					    alphaTestReferenceValue: 0.5
 | 
				
			||||||
 | 
					    mipMapFadeDistanceStart: 1
 | 
				
			||||||
 | 
					    mipMapFadeDistanceEnd: 3
 | 
				
			||||||
 | 
					  bumpmap:
 | 
				
			||||||
 | 
					    convertToNormalMap: 0
 | 
				
			||||||
 | 
					    externalNormalMap: 0
 | 
				
			||||||
 | 
					    heightScale: 0.25
 | 
				
			||||||
 | 
					    normalMapFilter: 0
 | 
				
			||||||
 | 
					  isReadable: 0
 | 
				
			||||||
 | 
					  streamingMipmaps: 0
 | 
				
			||||||
 | 
					  streamingMipmapsPriority: 0
 | 
				
			||||||
 | 
					  vTOnly: 0
 | 
				
			||||||
 | 
					  grayScaleToAlpha: 0
 | 
				
			||||||
 | 
					  generateCubemap: 6
 | 
				
			||||||
 | 
					  cubemapConvolution: 0
 | 
				
			||||||
 | 
					  seamlessCubemap: 0
 | 
				
			||||||
 | 
					  textureFormat: 1
 | 
				
			||||||
 | 
					  maxTextureSize: 2048
 | 
				
			||||||
 | 
					  textureSettings:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    filterMode: 1
 | 
				
			||||||
 | 
					    aniso: 1
 | 
				
			||||||
 | 
					    mipBias: 0
 | 
				
			||||||
 | 
					    wrapU: 0
 | 
				
			||||||
 | 
					    wrapV: 0
 | 
				
			||||||
 | 
					    wrapW: 0
 | 
				
			||||||
 | 
					  nPOTScale: 1
 | 
				
			||||||
 | 
					  lightmap: 0
 | 
				
			||||||
 | 
					  compressionQuality: 50
 | 
				
			||||||
 | 
					  spriteMode: 0
 | 
				
			||||||
 | 
					  spriteExtrude: 1
 | 
				
			||||||
 | 
					  spriteMeshType: 1
 | 
				
			||||||
 | 
					  alignment: 0
 | 
				
			||||||
 | 
					  spritePivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
 | 
					  spritePixelsToUnits: 100
 | 
				
			||||||
 | 
					  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
 | 
				
			||||||
 | 
					  spriteGenerateFallbackPhysicsShape: 1
 | 
				
			||||||
 | 
					  alphaUsage: 1
 | 
				
			||||||
 | 
					  alphaIsTransparency: 0
 | 
				
			||||||
 | 
					  spriteTessellationDetail: -1
 | 
				
			||||||
 | 
					  textureType: 1
 | 
				
			||||||
 | 
					  textureShape: 1
 | 
				
			||||||
 | 
					  singleChannelComponent: 0
 | 
				
			||||||
 | 
					  flipbookRows: 1
 | 
				
			||||||
 | 
					  flipbookColumns: 1
 | 
				
			||||||
 | 
					  maxTextureSizeSet: 0
 | 
				
			||||||
 | 
					  compressionQualitySet: 0
 | 
				
			||||||
 | 
					  textureFormatSet: 0
 | 
				
			||||||
 | 
					  ignorePngGamma: 0
 | 
				
			||||||
 | 
					  applyGammaDecoding: 0
 | 
				
			||||||
 | 
					  platformSettings:
 | 
				
			||||||
 | 
					  - serializedVersion: 3
 | 
				
			||||||
 | 
					    buildTarget: DefaultTexturePlatform
 | 
				
			||||||
 | 
					    maxTextureSize: 2048
 | 
				
			||||||
 | 
					    resizeAlgorithm: 0
 | 
				
			||||||
 | 
					    textureFormat: -1
 | 
				
			||||||
 | 
					    textureCompression: 1
 | 
				
			||||||
 | 
					    compressionQuality: 50
 | 
				
			||||||
 | 
					    crunchedCompression: 0
 | 
				
			||||||
 | 
					    allowsAlphaSplitting: 0
 | 
				
			||||||
 | 
					    overridden: 0
 | 
				
			||||||
 | 
					    androidETC2FallbackOverride: 0
 | 
				
			||||||
 | 
					    forceMaximumCompressionQuality_BC6H_BC7: 0
 | 
				
			||||||
 | 
					  spriteSheet:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    sprites: []
 | 
				
			||||||
 | 
					    outline: []
 | 
				
			||||||
 | 
					    physicsShape: []
 | 
				
			||||||
 | 
					    bones: []
 | 
				
			||||||
 | 
					    spriteID: 
 | 
				
			||||||
 | 
					    internalID: 0
 | 
				
			||||||
 | 
					    vertices: []
 | 
				
			||||||
 | 
					    indices: 
 | 
				
			||||||
 | 
					    edges: []
 | 
				
			||||||
 | 
					    weights: []
 | 
				
			||||||
 | 
					    secondaryTextures: []
 | 
				
			||||||
 | 
					  spritePackingTag: 
 | 
				
			||||||
 | 
					  pSDRemoveMatte: 0
 | 
				
			||||||
 | 
					  pSDShowRemoveMatteOption: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 7.5 MiB  | 
@ -0,0 +1,96 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 41640a2a87bb346d9b0afbc6a9e97679
 | 
				
			||||||
 | 
					TextureImporter:
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 11
 | 
				
			||||||
 | 
					  mipmaps:
 | 
				
			||||||
 | 
					    mipMapMode: 0
 | 
				
			||||||
 | 
					    enableMipMap: 1
 | 
				
			||||||
 | 
					    sRGBTexture: 1
 | 
				
			||||||
 | 
					    linearTexture: 0
 | 
				
			||||||
 | 
					    fadeOut: 0
 | 
				
			||||||
 | 
					    borderMipMap: 0
 | 
				
			||||||
 | 
					    mipMapsPreserveCoverage: 0
 | 
				
			||||||
 | 
					    alphaTestReferenceValue: 0.5
 | 
				
			||||||
 | 
					    mipMapFadeDistanceStart: 1
 | 
				
			||||||
 | 
					    mipMapFadeDistanceEnd: 3
 | 
				
			||||||
 | 
					  bumpmap:
 | 
				
			||||||
 | 
					    convertToNormalMap: 0
 | 
				
			||||||
 | 
					    externalNormalMap: 0
 | 
				
			||||||
 | 
					    heightScale: 0.25
 | 
				
			||||||
 | 
					    normalMapFilter: 0
 | 
				
			||||||
 | 
					  isReadable: 0
 | 
				
			||||||
 | 
					  streamingMipmaps: 0
 | 
				
			||||||
 | 
					  streamingMipmapsPriority: 0
 | 
				
			||||||
 | 
					  vTOnly: 0
 | 
				
			||||||
 | 
					  grayScaleToAlpha: 0
 | 
				
			||||||
 | 
					  generateCubemap: 6
 | 
				
			||||||
 | 
					  cubemapConvolution: 0
 | 
				
			||||||
 | 
					  seamlessCubemap: 0
 | 
				
			||||||
 | 
					  textureFormat: 1
 | 
				
			||||||
 | 
					  maxTextureSize: 2048
 | 
				
			||||||
 | 
					  textureSettings:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    filterMode: 1
 | 
				
			||||||
 | 
					    aniso: 1
 | 
				
			||||||
 | 
					    mipBias: 0
 | 
				
			||||||
 | 
					    wrapU: 0
 | 
				
			||||||
 | 
					    wrapV: 0
 | 
				
			||||||
 | 
					    wrapW: 0
 | 
				
			||||||
 | 
					  nPOTScale: 1
 | 
				
			||||||
 | 
					  lightmap: 0
 | 
				
			||||||
 | 
					  compressionQuality: 50
 | 
				
			||||||
 | 
					  spriteMode: 0
 | 
				
			||||||
 | 
					  spriteExtrude: 1
 | 
				
			||||||
 | 
					  spriteMeshType: 1
 | 
				
			||||||
 | 
					  alignment: 0
 | 
				
			||||||
 | 
					  spritePivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
 | 
					  spritePixelsToUnits: 100
 | 
				
			||||||
 | 
					  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
 | 
				
			||||||
 | 
					  spriteGenerateFallbackPhysicsShape: 1
 | 
				
			||||||
 | 
					  alphaUsage: 1
 | 
				
			||||||
 | 
					  alphaIsTransparency: 0
 | 
				
			||||||
 | 
					  spriteTessellationDetail: -1
 | 
				
			||||||
 | 
					  textureType: 0
 | 
				
			||||||
 | 
					  textureShape: 1
 | 
				
			||||||
 | 
					  singleChannelComponent: 0
 | 
				
			||||||
 | 
					  flipbookRows: 1
 | 
				
			||||||
 | 
					  flipbookColumns: 1
 | 
				
			||||||
 | 
					  maxTextureSizeSet: 0
 | 
				
			||||||
 | 
					  compressionQualitySet: 0
 | 
				
			||||||
 | 
					  textureFormatSet: 0
 | 
				
			||||||
 | 
					  ignorePngGamma: 0
 | 
				
			||||||
 | 
					  applyGammaDecoding: 0
 | 
				
			||||||
 | 
					  platformSettings:
 | 
				
			||||||
 | 
					  - serializedVersion: 3
 | 
				
			||||||
 | 
					    buildTarget: DefaultTexturePlatform
 | 
				
			||||||
 | 
					    maxTextureSize: 2048
 | 
				
			||||||
 | 
					    resizeAlgorithm: 0
 | 
				
			||||||
 | 
					    textureFormat: -1
 | 
				
			||||||
 | 
					    textureCompression: 1
 | 
				
			||||||
 | 
					    compressionQuality: 50
 | 
				
			||||||
 | 
					    crunchedCompression: 0
 | 
				
			||||||
 | 
					    allowsAlphaSplitting: 0
 | 
				
			||||||
 | 
					    overridden: 0
 | 
				
			||||||
 | 
					    androidETC2FallbackOverride: 0
 | 
				
			||||||
 | 
					    forceMaximumCompressionQuality_BC6H_BC7: 0
 | 
				
			||||||
 | 
					  spriteSheet:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    sprites: []
 | 
				
			||||||
 | 
					    outline: []
 | 
				
			||||||
 | 
					    physicsShape: []
 | 
				
			||||||
 | 
					    bones: []
 | 
				
			||||||
 | 
					    spriteID: 
 | 
				
			||||||
 | 
					    internalID: 0
 | 
				
			||||||
 | 
					    vertices: []
 | 
				
			||||||
 | 
					    indices: 
 | 
				
			||||||
 | 
					    edges: []
 | 
				
			||||||
 | 
					    weights: []
 | 
				
			||||||
 | 
					    secondaryTextures: []
 | 
				
			||||||
 | 
					  spritePackingTag: 
 | 
				
			||||||
 | 
					  pSDRemoveMatte: 0
 | 
				
			||||||
 | 
					  pSDShowRemoveMatteOption: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 124 MiB  | 
@ -0,0 +1,96 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 592e90f49aff4462da8eb96b1789e319
 | 
				
			||||||
 | 
					TextureImporter:
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 11
 | 
				
			||||||
 | 
					  mipmaps:
 | 
				
			||||||
 | 
					    mipMapMode: 0
 | 
				
			||||||
 | 
					    enableMipMap: 1
 | 
				
			||||||
 | 
					    sRGBTexture: 1
 | 
				
			||||||
 | 
					    linearTexture: 0
 | 
				
			||||||
 | 
					    fadeOut: 0
 | 
				
			||||||
 | 
					    borderMipMap: 0
 | 
				
			||||||
 | 
					    mipMapsPreserveCoverage: 0
 | 
				
			||||||
 | 
					    alphaTestReferenceValue: 0.5
 | 
				
			||||||
 | 
					    mipMapFadeDistanceStart: 1
 | 
				
			||||||
 | 
					    mipMapFadeDistanceEnd: 3
 | 
				
			||||||
 | 
					  bumpmap:
 | 
				
			||||||
 | 
					    convertToNormalMap: 0
 | 
				
			||||||
 | 
					    externalNormalMap: 0
 | 
				
			||||||
 | 
					    heightScale: 0.25
 | 
				
			||||||
 | 
					    normalMapFilter: 0
 | 
				
			||||||
 | 
					  isReadable: 0
 | 
				
			||||||
 | 
					  streamingMipmaps: 0
 | 
				
			||||||
 | 
					  streamingMipmapsPriority: 0
 | 
				
			||||||
 | 
					  vTOnly: 0
 | 
				
			||||||
 | 
					  grayScaleToAlpha: 0
 | 
				
			||||||
 | 
					  generateCubemap: 6
 | 
				
			||||||
 | 
					  cubemapConvolution: 0
 | 
				
			||||||
 | 
					  seamlessCubemap: 0
 | 
				
			||||||
 | 
					  textureFormat: 1
 | 
				
			||||||
 | 
					  maxTextureSize: 2048
 | 
				
			||||||
 | 
					  textureSettings:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    filterMode: 1
 | 
				
			||||||
 | 
					    aniso: 1
 | 
				
			||||||
 | 
					    mipBias: 0
 | 
				
			||||||
 | 
					    wrapU: 0
 | 
				
			||||||
 | 
					    wrapV: 0
 | 
				
			||||||
 | 
					    wrapW: 0
 | 
				
			||||||
 | 
					  nPOTScale: 1
 | 
				
			||||||
 | 
					  lightmap: 0
 | 
				
			||||||
 | 
					  compressionQuality: 50
 | 
				
			||||||
 | 
					  spriteMode: 0
 | 
				
			||||||
 | 
					  spriteExtrude: 1
 | 
				
			||||||
 | 
					  spriteMeshType: 1
 | 
				
			||||||
 | 
					  alignment: 0
 | 
				
			||||||
 | 
					  spritePivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
 | 
					  spritePixelsToUnits: 100
 | 
				
			||||||
 | 
					  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
 | 
				
			||||||
 | 
					  spriteGenerateFallbackPhysicsShape: 1
 | 
				
			||||||
 | 
					  alphaUsage: 1
 | 
				
			||||||
 | 
					  alphaIsTransparency: 0
 | 
				
			||||||
 | 
					  spriteTessellationDetail: -1
 | 
				
			||||||
 | 
					  textureType: 0
 | 
				
			||||||
 | 
					  textureShape: 1
 | 
				
			||||||
 | 
					  singleChannelComponent: 0
 | 
				
			||||||
 | 
					  flipbookRows: 1
 | 
				
			||||||
 | 
					  flipbookColumns: 1
 | 
				
			||||||
 | 
					  maxTextureSizeSet: 0
 | 
				
			||||||
 | 
					  compressionQualitySet: 0
 | 
				
			||||||
 | 
					  textureFormatSet: 0
 | 
				
			||||||
 | 
					  ignorePngGamma: 0
 | 
				
			||||||
 | 
					  applyGammaDecoding: 0
 | 
				
			||||||
 | 
					  platformSettings:
 | 
				
			||||||
 | 
					  - serializedVersion: 3
 | 
				
			||||||
 | 
					    buildTarget: DefaultTexturePlatform
 | 
				
			||||||
 | 
					    maxTextureSize: 2048
 | 
				
			||||||
 | 
					    resizeAlgorithm: 0
 | 
				
			||||||
 | 
					    textureFormat: -1
 | 
				
			||||||
 | 
					    textureCompression: 1
 | 
				
			||||||
 | 
					    compressionQuality: 50
 | 
				
			||||||
 | 
					    crunchedCompression: 0
 | 
				
			||||||
 | 
					    allowsAlphaSplitting: 0
 | 
				
			||||||
 | 
					    overridden: 0
 | 
				
			||||||
 | 
					    androidETC2FallbackOverride: 0
 | 
				
			||||||
 | 
					    forceMaximumCompressionQuality_BC6H_BC7: 0
 | 
				
			||||||
 | 
					  spriteSheet:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    sprites: []
 | 
				
			||||||
 | 
					    outline: []
 | 
				
			||||||
 | 
					    physicsShape: []
 | 
				
			||||||
 | 
					    bones: []
 | 
				
			||||||
 | 
					    spriteID: 
 | 
				
			||||||
 | 
					    internalID: 0
 | 
				
			||||||
 | 
					    vertices: []
 | 
				
			||||||
 | 
					    indices: 
 | 
				
			||||||
 | 
					    edges: []
 | 
				
			||||||
 | 
					    weights: []
 | 
				
			||||||
 | 
					    secondaryTextures: []
 | 
				
			||||||
 | 
					  spritePackingTag: 
 | 
				
			||||||
 | 
					  pSDRemoveMatte: 0
 | 
				
			||||||
 | 
					  pSDShowRemoveMatteOption: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 371 MiB  | 
@ -0,0 +1,96 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: f38cf523fae544cb6a64ce7f04b15ee8
 | 
				
			||||||
 | 
					TextureImporter:
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 11
 | 
				
			||||||
 | 
					  mipmaps:
 | 
				
			||||||
 | 
					    mipMapMode: 0
 | 
				
			||||||
 | 
					    enableMipMap: 1
 | 
				
			||||||
 | 
					    sRGBTexture: 0
 | 
				
			||||||
 | 
					    linearTexture: 0
 | 
				
			||||||
 | 
					    fadeOut: 0
 | 
				
			||||||
 | 
					    borderMipMap: 0
 | 
				
			||||||
 | 
					    mipMapsPreserveCoverage: 0
 | 
				
			||||||
 | 
					    alphaTestReferenceValue: 0.5
 | 
				
			||||||
 | 
					    mipMapFadeDistanceStart: 1
 | 
				
			||||||
 | 
					    mipMapFadeDistanceEnd: 3
 | 
				
			||||||
 | 
					  bumpmap:
 | 
				
			||||||
 | 
					    convertToNormalMap: 0
 | 
				
			||||||
 | 
					    externalNormalMap: 0
 | 
				
			||||||
 | 
					    heightScale: 0.25
 | 
				
			||||||
 | 
					    normalMapFilter: 0
 | 
				
			||||||
 | 
					  isReadable: 0
 | 
				
			||||||
 | 
					  streamingMipmaps: 0
 | 
				
			||||||
 | 
					  streamingMipmapsPriority: 0
 | 
				
			||||||
 | 
					  vTOnly: 0
 | 
				
			||||||
 | 
					  grayScaleToAlpha: 0
 | 
				
			||||||
 | 
					  generateCubemap: 6
 | 
				
			||||||
 | 
					  cubemapConvolution: 0
 | 
				
			||||||
 | 
					  seamlessCubemap: 0
 | 
				
			||||||
 | 
					  textureFormat: 1
 | 
				
			||||||
 | 
					  maxTextureSize: 2048
 | 
				
			||||||
 | 
					  textureSettings:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    filterMode: 1
 | 
				
			||||||
 | 
					    aniso: 1
 | 
				
			||||||
 | 
					    mipBias: 0
 | 
				
			||||||
 | 
					    wrapU: 0
 | 
				
			||||||
 | 
					    wrapV: 0
 | 
				
			||||||
 | 
					    wrapW: 0
 | 
				
			||||||
 | 
					  nPOTScale: 1
 | 
				
			||||||
 | 
					  lightmap: 0
 | 
				
			||||||
 | 
					  compressionQuality: 50
 | 
				
			||||||
 | 
					  spriteMode: 0
 | 
				
			||||||
 | 
					  spriteExtrude: 1
 | 
				
			||||||
 | 
					  spriteMeshType: 1
 | 
				
			||||||
 | 
					  alignment: 0
 | 
				
			||||||
 | 
					  spritePivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
 | 
					  spritePixelsToUnits: 100
 | 
				
			||||||
 | 
					  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
 | 
				
			||||||
 | 
					  spriteGenerateFallbackPhysicsShape: 1
 | 
				
			||||||
 | 
					  alphaUsage: 1
 | 
				
			||||||
 | 
					  alphaIsTransparency: 0
 | 
				
			||||||
 | 
					  spriteTessellationDetail: -1
 | 
				
			||||||
 | 
					  textureType: 1
 | 
				
			||||||
 | 
					  textureShape: 1
 | 
				
			||||||
 | 
					  singleChannelComponent: 0
 | 
				
			||||||
 | 
					  flipbookRows: 1
 | 
				
			||||||
 | 
					  flipbookColumns: 1
 | 
				
			||||||
 | 
					  maxTextureSizeSet: 0
 | 
				
			||||||
 | 
					  compressionQualitySet: 0
 | 
				
			||||||
 | 
					  textureFormatSet: 0
 | 
				
			||||||
 | 
					  ignorePngGamma: 0
 | 
				
			||||||
 | 
					  applyGammaDecoding: 0
 | 
				
			||||||
 | 
					  platformSettings:
 | 
				
			||||||
 | 
					  - serializedVersion: 3
 | 
				
			||||||
 | 
					    buildTarget: DefaultTexturePlatform
 | 
				
			||||||
 | 
					    maxTextureSize: 2048
 | 
				
			||||||
 | 
					    resizeAlgorithm: 0
 | 
				
			||||||
 | 
					    textureFormat: -1
 | 
				
			||||||
 | 
					    textureCompression: 1
 | 
				
			||||||
 | 
					    compressionQuality: 50
 | 
				
			||||||
 | 
					    crunchedCompression: 0
 | 
				
			||||||
 | 
					    allowsAlphaSplitting: 0
 | 
				
			||||||
 | 
					    overridden: 0
 | 
				
			||||||
 | 
					    androidETC2FallbackOverride: 0
 | 
				
			||||||
 | 
					    forceMaximumCompressionQuality_BC6H_BC7: 0
 | 
				
			||||||
 | 
					  spriteSheet:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    sprites: []
 | 
				
			||||||
 | 
					    outline: []
 | 
				
			||||||
 | 
					    physicsShape: []
 | 
				
			||||||
 | 
					    bones: []
 | 
				
			||||||
 | 
					    spriteID: 
 | 
				
			||||||
 | 
					    internalID: 0
 | 
				
			||||||
 | 
					    vertices: []
 | 
				
			||||||
 | 
					    indices: 
 | 
				
			||||||
 | 
					    edges: []
 | 
				
			||||||
 | 
					    weights: []
 | 
				
			||||||
 | 
					    secondaryTextures: []
 | 
				
			||||||
 | 
					  spritePackingTag: 
 | 
				
			||||||
 | 
					  pSDRemoveMatte: 0
 | 
				
			||||||
 | 
					  pSDShowRemoveMatteOption: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 42 MiB  | 
@ -0,0 +1,96 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 2de049dc5c0924c6a8bc68b859497d60
 | 
				
			||||||
 | 
					TextureImporter:
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 11
 | 
				
			||||||
 | 
					  mipmaps:
 | 
				
			||||||
 | 
					    mipMapMode: 0
 | 
				
			||||||
 | 
					    enableMipMap: 1
 | 
				
			||||||
 | 
					    sRGBTexture: 1
 | 
				
			||||||
 | 
					    linearTexture: 0
 | 
				
			||||||
 | 
					    fadeOut: 0
 | 
				
			||||||
 | 
					    borderMipMap: 0
 | 
				
			||||||
 | 
					    mipMapsPreserveCoverage: 0
 | 
				
			||||||
 | 
					    alphaTestReferenceValue: 0.5
 | 
				
			||||||
 | 
					    mipMapFadeDistanceStart: 1
 | 
				
			||||||
 | 
					    mipMapFadeDistanceEnd: 3
 | 
				
			||||||
 | 
					  bumpmap:
 | 
				
			||||||
 | 
					    convertToNormalMap: 0
 | 
				
			||||||
 | 
					    externalNormalMap: 0
 | 
				
			||||||
 | 
					    heightScale: 0.25
 | 
				
			||||||
 | 
					    normalMapFilter: 0
 | 
				
			||||||
 | 
					  isReadable: 0
 | 
				
			||||||
 | 
					  streamingMipmaps: 0
 | 
				
			||||||
 | 
					  streamingMipmapsPriority: 0
 | 
				
			||||||
 | 
					  vTOnly: 0
 | 
				
			||||||
 | 
					  grayScaleToAlpha: 0
 | 
				
			||||||
 | 
					  generateCubemap: 6
 | 
				
			||||||
 | 
					  cubemapConvolution: 0
 | 
				
			||||||
 | 
					  seamlessCubemap: 0
 | 
				
			||||||
 | 
					  textureFormat: 1
 | 
				
			||||||
 | 
					  maxTextureSize: 2048
 | 
				
			||||||
 | 
					  textureSettings:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    filterMode: 1
 | 
				
			||||||
 | 
					    aniso: 1
 | 
				
			||||||
 | 
					    mipBias: 0
 | 
				
			||||||
 | 
					    wrapU: 0
 | 
				
			||||||
 | 
					    wrapV: 0
 | 
				
			||||||
 | 
					    wrapW: 0
 | 
				
			||||||
 | 
					  nPOTScale: 1
 | 
				
			||||||
 | 
					  lightmap: 0
 | 
				
			||||||
 | 
					  compressionQuality: 50
 | 
				
			||||||
 | 
					  spriteMode: 0
 | 
				
			||||||
 | 
					  spriteExtrude: 1
 | 
				
			||||||
 | 
					  spriteMeshType: 1
 | 
				
			||||||
 | 
					  alignment: 0
 | 
				
			||||||
 | 
					  spritePivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
 | 
					  spritePixelsToUnits: 100
 | 
				
			||||||
 | 
					  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
 | 
				
			||||||
 | 
					  spriteGenerateFallbackPhysicsShape: 1
 | 
				
			||||||
 | 
					  alphaUsage: 1
 | 
				
			||||||
 | 
					  alphaIsTransparency: 0
 | 
				
			||||||
 | 
					  spriteTessellationDetail: -1
 | 
				
			||||||
 | 
					  textureType: 0
 | 
				
			||||||
 | 
					  textureShape: 1
 | 
				
			||||||
 | 
					  singleChannelComponent: 0
 | 
				
			||||||
 | 
					  flipbookRows: 1
 | 
				
			||||||
 | 
					  flipbookColumns: 1
 | 
				
			||||||
 | 
					  maxTextureSizeSet: 0
 | 
				
			||||||
 | 
					  compressionQualitySet: 0
 | 
				
			||||||
 | 
					  textureFormatSet: 0
 | 
				
			||||||
 | 
					  ignorePngGamma: 0
 | 
				
			||||||
 | 
					  applyGammaDecoding: 0
 | 
				
			||||||
 | 
					  platformSettings:
 | 
				
			||||||
 | 
					  - serializedVersion: 3
 | 
				
			||||||
 | 
					    buildTarget: DefaultTexturePlatform
 | 
				
			||||||
 | 
					    maxTextureSize: 2048
 | 
				
			||||||
 | 
					    resizeAlgorithm: 0
 | 
				
			||||||
 | 
					    textureFormat: -1
 | 
				
			||||||
 | 
					    textureCompression: 1
 | 
				
			||||||
 | 
					    compressionQuality: 50
 | 
				
			||||||
 | 
					    crunchedCompression: 0
 | 
				
			||||||
 | 
					    allowsAlphaSplitting: 0
 | 
				
			||||||
 | 
					    overridden: 0
 | 
				
			||||||
 | 
					    androidETC2FallbackOverride: 0
 | 
				
			||||||
 | 
					    forceMaximumCompressionQuality_BC6H_BC7: 0
 | 
				
			||||||
 | 
					  spriteSheet:
 | 
				
			||||||
 | 
					    serializedVersion: 2
 | 
				
			||||||
 | 
					    sprites: []
 | 
				
			||||||
 | 
					    outline: []
 | 
				
			||||||
 | 
					    physicsShape: []
 | 
				
			||||||
 | 
					    bones: []
 | 
				
			||||||
 | 
					    spriteID: 
 | 
				
			||||||
 | 
					    internalID: 0
 | 
				
			||||||
 | 
					    vertices: []
 | 
				
			||||||
 | 
					    indices: 
 | 
				
			||||||
 | 
					    edges: []
 | 
				
			||||||
 | 
					    weights: []
 | 
				
			||||||
 | 
					    secondaryTextures: []
 | 
				
			||||||
 | 
					  spritePackingTag: 
 | 
				
			||||||
 | 
					  pSDRemoveMatte: 0
 | 
				
			||||||
 | 
					  pSDShowRemoveMatteOption: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								Assets/Scenes/Unity_Game_Raum_17_03_22_1940.fbx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Assets/Scenes/Unity_Game_Raum_17_03_22_1940.fbx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										102
									
								
								Assets/Scenes/Unity_Game_Raum_17_03_22_1940.fbx.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										102
									
								
								Assets/Scenes/Unity_Game_Raum_17_03_22_1940.fbx.meta
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,102 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 48e50157d5e9f4529b7541bb2fcfe627
 | 
				
			||||||
 | 
					ModelImporter:
 | 
				
			||||||
 | 
					  serializedVersion: 20200
 | 
				
			||||||
 | 
					  internalIDToNameTable: []
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  materials:
 | 
				
			||||||
 | 
					    materialImportMode: 2
 | 
				
			||||||
 | 
					    materialName: 0
 | 
				
			||||||
 | 
					    materialSearch: 1
 | 
				
			||||||
 | 
					    materialLocation: 1
 | 
				
			||||||
 | 
					  animations:
 | 
				
			||||||
 | 
					    legacyGenerateAnimations: 4
 | 
				
			||||||
 | 
					    bakeSimulation: 0
 | 
				
			||||||
 | 
					    resampleCurves: 1
 | 
				
			||||||
 | 
					    optimizeGameObjects: 0
 | 
				
			||||||
 | 
					    motionNodeName: 
 | 
				
			||||||
 | 
					    rigImportErrors: 
 | 
				
			||||||
 | 
					    rigImportWarnings: 
 | 
				
			||||||
 | 
					    animationImportErrors: 
 | 
				
			||||||
 | 
					    animationImportWarnings: 
 | 
				
			||||||
 | 
					    animationRetargetingWarnings: 
 | 
				
			||||||
 | 
					    animationDoRetargetingWarnings: 0
 | 
				
			||||||
 | 
					    importAnimatedCustomProperties: 0
 | 
				
			||||||
 | 
					    importConstraints: 0
 | 
				
			||||||
 | 
					    animationCompression: 1
 | 
				
			||||||
 | 
					    animationRotationError: 0.5
 | 
				
			||||||
 | 
					    animationPositionError: 0.5
 | 
				
			||||||
 | 
					    animationScaleError: 0.5
 | 
				
			||||||
 | 
					    animationWrapMode: 0
 | 
				
			||||||
 | 
					    extraExposedTransformPaths: []
 | 
				
			||||||
 | 
					    extraUserProperties: []
 | 
				
			||||||
 | 
					    clipAnimations: []
 | 
				
			||||||
 | 
					    isReadable: 0
 | 
				
			||||||
 | 
					  meshes:
 | 
				
			||||||
 | 
					    lODScreenPercentages: []
 | 
				
			||||||
 | 
					    globalScale: 1
 | 
				
			||||||
 | 
					    meshCompression: 0
 | 
				
			||||||
 | 
					    addColliders: 0
 | 
				
			||||||
 | 
					    useSRGBMaterialColor: 1
 | 
				
			||||||
 | 
					    sortHierarchyByName: 1
 | 
				
			||||||
 | 
					    importVisibility: 1
 | 
				
			||||||
 | 
					    importBlendShapes: 1
 | 
				
			||||||
 | 
					    importCameras: 1
 | 
				
			||||||
 | 
					    importLights: 1
 | 
				
			||||||
 | 
					    fileIdsGeneration: 2
 | 
				
			||||||
 | 
					    swapUVChannels: 0
 | 
				
			||||||
 | 
					    generateSecondaryUV: 0
 | 
				
			||||||
 | 
					    useFileUnits: 1
 | 
				
			||||||
 | 
					    keepQuads: 0
 | 
				
			||||||
 | 
					    weldVertices: 1
 | 
				
			||||||
 | 
					    bakeAxisConversion: 0
 | 
				
			||||||
 | 
					    preserveHierarchy: 0
 | 
				
			||||||
 | 
					    skinWeightsMode: 0
 | 
				
			||||||
 | 
					    maxBonesPerVertex: 4
 | 
				
			||||||
 | 
					    minBoneWeight: 0.001
 | 
				
			||||||
 | 
					    meshOptimizationFlags: -1
 | 
				
			||||||
 | 
					    indexFormat: 0
 | 
				
			||||||
 | 
					    secondaryUVAngleDistortion: 8
 | 
				
			||||||
 | 
					    secondaryUVAreaDistortion: 15.000001
 | 
				
			||||||
 | 
					    secondaryUVHardAngle: 88
 | 
				
			||||||
 | 
					    secondaryUVMarginMethod: 1
 | 
				
			||||||
 | 
					    secondaryUVMinLightmapResolution: 40
 | 
				
			||||||
 | 
					    secondaryUVMinObjectScale: 1
 | 
				
			||||||
 | 
					    secondaryUVPackMargin: 4
 | 
				
			||||||
 | 
					    useFileScale: 1
 | 
				
			||||||
 | 
					  tangentSpace:
 | 
				
			||||||
 | 
					    normalSmoothAngle: 60
 | 
				
			||||||
 | 
					    normalImportMode: 0
 | 
				
			||||||
 | 
					    tangentImportMode: 3
 | 
				
			||||||
 | 
					    normalCalculationMode: 4
 | 
				
			||||||
 | 
					    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
 | 
				
			||||||
 | 
					    blendShapeNormalImportMode: 1
 | 
				
			||||||
 | 
					    normalSmoothingSource: 0
 | 
				
			||||||
 | 
					  referencedClips: []
 | 
				
			||||||
 | 
					  importAnimation: 1
 | 
				
			||||||
 | 
					  humanDescription:
 | 
				
			||||||
 | 
					    serializedVersion: 3
 | 
				
			||||||
 | 
					    human: []
 | 
				
			||||||
 | 
					    skeleton: []
 | 
				
			||||||
 | 
					    armTwist: 0.5
 | 
				
			||||||
 | 
					    foreArmTwist: 0.5
 | 
				
			||||||
 | 
					    upperLegTwist: 0.5
 | 
				
			||||||
 | 
					    legTwist: 0.5
 | 
				
			||||||
 | 
					    armStretch: 0.05
 | 
				
			||||||
 | 
					    legStretch: 0.05
 | 
				
			||||||
 | 
					    feetSpacing: 0
 | 
				
			||||||
 | 
					    globalScale: 1
 | 
				
			||||||
 | 
					    rootMotionBoneName: 
 | 
				
			||||||
 | 
					    hasTranslationDoF: 0
 | 
				
			||||||
 | 
					    hasExtraRoot: 0
 | 
				
			||||||
 | 
					    skeletonHasParents: 1
 | 
				
			||||||
 | 
					  lastHumanDescriptionAvatarSource: {instanceID: 0}
 | 
				
			||||||
 | 
					  autoGenerateAvatarMappingIfUnspecified: 1
 | 
				
			||||||
 | 
					  animationType: 2
 | 
				
			||||||
 | 
					  humanoidOversampling: 1
 | 
				
			||||||
 | 
					  avatarSetup: 0
 | 
				
			||||||
 | 
					  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
 | 
				
			||||||
 | 
					  additionalBone: 0
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
@ -6,8 +6,13 @@ EditorBuildSettings:
 | 
				
			|||||||
  serializedVersion: 2
 | 
					  serializedVersion: 2
 | 
				
			||||||
  m_Scenes:
 | 
					  m_Scenes:
 | 
				
			||||||
  - enabled: 1
 | 
					  - enabled: 1
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
    path: Assets/Scenes/Room Noah.unity
 | 
					    path: Assets/Scenes/Room Noah.unity
 | 
				
			||||||
    guid: 61951a1951b1742eea6dd27420fae56b
 | 
					    guid: 61951a1951b1742eea6dd27420fae56b
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					    path: Assets/Scenes/Room Lisa.unity
 | 
				
			||||||
 | 
					    guid: 9fc0d4010bbf28b4594072e72b8655ab
 | 
				
			||||||
 | 
					>>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
 | 
				
			||||||
  m_configObjects:
 | 
					  m_configObjects:
 | 
				
			||||||
    Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 49ee9a368d2424ce0a5faa9d0c644242, type: 2}
 | 
					    Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 49ee9a368d2424ce0a5faa9d0c644242, type: 2}
 | 
				
			||||||
    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: d4a8a8d4ef2d74adb9267620f3853997, type: 2}
 | 
					    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: d4a8a8d4ef2d74adb9267620f3853997, type: 2}
 | 
				
			||||||
 | 
				
			|||||||
@ -138,6 +138,10 @@ PlayerSettings:
 | 
				
			|||||||
  preloadedAssets:
 | 
					  preloadedAssets:
 | 
				
			||||||
  - {fileID: 0}
 | 
					  - {fileID: 0}
 | 
				
			||||||
  - {fileID: 0}
 | 
					  - {fileID: 0}
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					  - {fileID: 0}
 | 
				
			||||||
 | 
					>>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
 | 
				
			||||||
  metroInputSource: 0
 | 
					  metroInputSource: 0
 | 
				
			||||||
  wsaTransparentSwapchain: 0
 | 
					  wsaTransparentSwapchain: 0
 | 
				
			||||||
  m_HolographicPauseOnTrackingLoss: 1
 | 
					  m_HolographicPauseOnTrackingLoss: 1
 | 
				
			||||||
@ -237,7 +241,7 @@ PlayerSettings:
 | 
				
			|||||||
  clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
 | 
					  clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
 | 
				
			||||||
  templatePackageId: com.unity.template.3d@5.0.4
 | 
					  templatePackageId: com.unity.template.3d@5.0.4
 | 
				
			||||||
  templateDefaultScene: Assets/Scenes/SampleScene.unity
 | 
					  templateDefaultScene: Assets/Scenes/SampleScene.unity
 | 
				
			||||||
  useCustomMainManifest: 0
 | 
					  useCustomMainManifest: 1
 | 
				
			||||||
  useCustomLauncherManifest: 0
 | 
					  useCustomLauncherManifest: 0
 | 
				
			||||||
  useCustomMainGradleTemplate: 0
 | 
					  useCustomMainGradleTemplate: 0
 | 
				
			||||||
  useCustomLauncherGradleManifest: 0
 | 
					  useCustomLauncherGradleManifest: 0
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user