Add Bakery

2020-12-03 20:09:51 +02:00
parent 2b9669daac
commit fdd88dc640
830 changed files with 14797838 additions and 21577 deletions
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_COLOR.jpg.meta
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_COLOR.jpg.meta
@@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: -1
@@ -73,6 +73,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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: []
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_DISP.jpg.meta
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_DISP.jpg.meta
@@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: -1
@@ -73,6 +73,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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: []
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_NRM.jpg.meta
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_NRM.jpg.meta
@@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: -1
@@ -73,6 +73,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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: []
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_OCC.jpg.meta
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_OCC.jpg.meta
@@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: -1
@@ -73,6 +73,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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: []
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_SPEC.jpg.meta
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_SPEC.jpg.meta
@@ -6,7 +6,7 @@ TextureImporter:
  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
    sRGBTexture: 0
    linearTexture: 0
    fadeOut: 0
@@ -32,7 +32,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: -1
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_render.jpg
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_render.jpg
--- a/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_render.jpg.meta
+++ b/Assets/Materials/Floor/Black_Marble_001/Black_Marble_001_render.jpg.meta
@@ -1,94 +0,0 @@
-fileFormatVersion: 2
-guid: 359ce27af76decb4d94f8f32fcd24ee2
-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: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  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
-  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: 
--- a/Assets/Materials/Floor/Black_Marble_001/Marble_Black_PBR.mat
+++ b/Assets/Materials/Floor/Black_Marble_001/Marble_Black_PBR.mat
@@ -9,10 +9,10 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: Marble_Black_PBR
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _SPECULAR_SETUP
+  m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 1
-  m_DoubleSidedGI: 1
+  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 2000
  stringTagMap:
    RenderType: Opaque
@@ -22,7 +22,7 @@ Material:
    m_TexEnvs:
    - _BaseMap:
        m_Texture: {fileID: 2800000, guid: 0608be080380d384484f05e6bd296749, type: 3}
-        m_Scale: {x: 20, y: 20}
+        m_Scale: {x: 80, y: 80}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
        m_Texture: {fileID: 2800000, guid: 1f48f02d689dfbe41865febcd08df8a6, type: 3}
@@ -46,14 +46,14 @@ Material:
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 0608be080380d384484f05e6bd296749, type: 3}
-        m_Scale: {x: 20, y: 20}
+        m_Scale: {x: 80, y: 80}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 189f3ad0674a1df4aadf1559d07372b3, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _ParallaxMap:
@@ -67,9 +67,9 @@ Material:
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
-    - _BumpScale: 1
+    - _BumpScale: 0.7
    - _Cull: 2
-    - _Cutoff: 0.5
+    - _Cutoff: 0
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _EnvironmentReflections: 1
@@ -82,7 +82,7 @@ Material:
    - _Parallax: 0.02
    - _QueueOffset: 0
    - _ReceiveShadows: 1
-    - _Smoothness: 0.8
+    - _Smoothness: 0.85
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1