Merge branch 'v0.2.2' into dev

reputage · May 2, 2019 · 77b7977 · 77b7977
2 parents 5f0d232 + 42bc5ce
commit 77b7977
Show file tree

Hide file tree

Showing 12,067 changed files with 1,353,880 additions and 296,403 deletions.
diff --git a/Unity/SeedQuest_V0_1/Assets/.gitignore → Unity/SeedQuest/Assets/.gitignore b/Unity/SeedQuest_V0_1/Assets/.gitignore → Unity/SeedQuest/Assets/.gitignore
diff --git a/...y/SeedQuest_V0_1/Assets/SeedCanvas.prefab → Unity/SeedQuest/Assets/SeedCanvas.prefab b/...y/SeedQuest_V0_1/Assets/SeedCanvas.prefab → Unity/SeedQuest/Assets/SeedCanvas.prefab
diff --git a/...dQuest_V0_1/Assets/SeedCanvas.prefab.meta → ...y/SeedQuest/Assets/SeedCanvas.prefab.meta b/...dQuest_V0_1/Assets/SeedCanvas.prefab.meta → ...y/SeedQuest/Assets/SeedCanvas.prefab.meta
diff --git a/...Quest_V0_1/Assets/SeedQuestPrototype.meta → .../SeedQuest/Assets/SeedQuestPrototype.meta b/...Quest_V0_1/Assets/SeedQuestPrototype.meta → .../SeedQuest/Assets/SeedQuestPrototype.meta
diff --git a/...t_V0_1/Assets/SeedQuestPrototype/Art.meta → ...dQuest/Assets/SeedQuestPrototype/Art.meta b/...t_V0_1/Assets/SeedQuestPrototype/Art.meta → ...dQuest/Assets/SeedQuestPrototype/Art.meta
diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay.meta
diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Materials.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Materials.meta
diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Materials/Arabian_Prop_Mat.mat b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Materials/Arabian_Prop_Mat.mat
@@ -0,0 +1,77 @@
+%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: Arabian_Prop_Mat
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  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
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.5754717, g: 0.25312492, b: 0.111294046, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Materials/Arabian_Prop_Mat.mat.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Materials/Arabian_Prop_Mat.mat.meta
diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Prefabs.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/Prefabs.meta