Merge branch 'master'

635e9a32 · Artem · 929eca46 · 48eb0d29 · 635e9a32 · 635e9a32
Commit 635e9a32 authored 5 years ago by Artem
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 545 additions and 23 deletions
+545 -23
--- a/Assets/DomiDo/AvvyLand/Fonts/Montserrat-SemiBold(600) SDF.asset
+++ b/Assets/DomiDo/AvvyLand/Fonts/Montserrat-SemiBold(600) SDF.asset
--- a/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages.meta
+++ b/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages.meta
+fileFormatVersion: 2
+guid: e1cfe90b164619344b2ffb3b8099fa3c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Saved.svg
+++ b/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Saved.svg
--- a/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Saved.svg.meta
+++ b/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Saved.svg.meta
+fileFormatVersion: 2
+guid: dbd6e5cfe9fdfc344988c805bbc2cd6e
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 0
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 128
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 0
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: b3880f8202c52cf46a8d8f9128a74224
+      internalID: 0
+    PhysicsOutlines: []
--- a/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Vector.svg
+++ b/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Vector.svg
--- a/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Vector.svg.meta
+++ b/Assets/DomiDo/AvvyLand/Images/ARNewDesignImages/Vector.svg.meta
+fileFormatVersion: 2
+guid: 105b3caca7140fa4084135f2570fd992
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 0
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 128
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 0
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: 893c34a0fd7519d40b070bca0b346c50
+      internalID: 0
+    PhysicsOutlines: []
--- a/Assets/DomiDo/AvvyLand/Images/Group 380.svg
+++ b/Assets/DomiDo/AvvyLand/Images/Group 380.svg
--- a/Assets/DomiDo/AvvyLand/Images/Group 380.svg.meta
+++ b/Assets/DomiDo/AvvyLand/Images/Group 380.svg.meta
+fileFormatVersion: 2
+guid: 43e2a46c2f51d44caab56936dc267438
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 0
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 128
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 0
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: 1137035f0ff854fe791fc7f5553a344e
+      internalID: 0
+    PhysicsOutlines: []
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign.meta
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign.meta
+fileFormatVersion: 2
+guid: 9913dcc3bb963f84b90faea841987bc7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign/LibraryGradientMaterial.mat
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign/LibraryGradientMaterial.mat
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LibraryGradientMaterial
+  m_Shader: {fileID: 4800000, guid: 99c85337d12b1c94c8540cf58fba2c42, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        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_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Scale: 1
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.050980393, g: 0.06666667, b: 0.10980392, a: 1}
+    - _Color2: {r: 0.050980393, g: 0.06666667, b: 0.10980392, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign/LibraryGradientMaterial.mat.meta
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign/LibraryGradientMaterial.mat.meta
+fileFormatVersion: 2
+guid: e372d27b6de26b640963a6cded8ec01b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Pixel.svg
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Pixel.svg
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Pixel.svg.meta
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Pixel.svg.meta
+fileFormatVersion: 2
+guid: f68d8506b61d5a645960651f5b07c2d7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 0
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 128
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 0
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: 6d48a814dc55f5145a7b4d19556fcde7
+      internalID: 0
+    PhysicsOutlines: []
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Search.svg
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Search.svg
--- a/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Search.svg.meta
+++ b/Assets/DomiDo/AvvyLand/Images/LibraryDesign/Search.svg.meta
+fileFormatVersion: 2
+guid: 124a7cddd2e32a94fb60963c23e878ce
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 0
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 128
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 0
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: 59967653ae35e5a43b733a27a129b29e
+      internalID: 0
+    PhysicsOutlines: []
--- a/Assets/DomiDo/AvvyLand/Images/Rectangle 663 (1).png
+++ b/Assets/DomiDo/AvvyLand/Images/Rectangle 663 (1).png
--- a/Assets/DomiDo/AvvyLand/Images/Rectangle 663 (1).png.meta
+++ b/Assets/DomiDo/AvvyLand/Images/Rectangle 663 (1).png.meta
--- a/Assets/DomiDo/AvvyLand/Images/ReportPopup.meta
+++ b/Assets/DomiDo/AvvyLand/Images/ReportPopup.meta
+fileFormatVersion: 2
+guid: 9fed301b234a915498c6b988911d1301
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DomiDo/AvvyLand/Images/ReportPopup/Right.svg
+++ b/Assets/DomiDo/AvvyLand/Images/ReportPopup/Right.svg
--- a/Assets/DomiDo/AvvyLand/Images/ReportPopup/Right.svg.meta
+++ b/Assets/DomiDo/AvvyLand/Images/ReportPopup/Right.svg.meta
+fileFormatVersion: 2
+guid: eb0a1d1f764ce934494f965caa40d5a8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 0
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 128
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 0
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: 5564229304b10eb46b27cfa2cf27194c
+      internalID: 0
+    PhysicsOutlines: []