Project update 6

knapeczadam · Nov 23, 2018 · 828cf67 · 828cf67
1 parent 8dcaaee
commit 828cf67
Show file tree

Hide file tree

Showing 38 changed files with 16,386 additions and 1,325 deletions.
diff --git a/...ts/Materials/120-129/129_01_Grayscale.mat → ...s/Materials/120-129/129_01_Grayscale1.mat b/...ts/Materials/120-129/129_01_Grayscale.mat → ...s/Materials/120-129/129_01_Grayscale1.mat
@@ -6,7 +6,7 @@ Material:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: 129_01_Grayscale
+  m_Name: 129_01_Grayscale1
   m_Shader: {fileID: 4800000, guid: 4ea70651e4863644587f7af8cde5a0ab, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
@@ -19,7 +19,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 016f207d3217bd74d9bca328fbd4c814, type: 3}
+        m_Texture: {fileID: 2800000, guid: e7f78facada8b2940b0ae7d815be9b6a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:

diff --git a/Assets/Materials/120-129/129_01_Grayscale1.mat.meta b/Assets/Materials/120-129/129_01_Grayscale1.mat.meta
diff --git a/Assets/Materials/120-129/129_01_Grayscale2.mat b/Assets/Materials/120-129/129_01_Grayscale2.mat
@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 129_01_Grayscale2
+  m_Shader: {fileID: 4800000, guid: 4ea70651e4863644587f7af8cde5a0ab, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 28e3875267da8b248830de7a964f9568, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AnimFreq: 1
+    - _AnimOffsetX: 0
+    - _AnimOffsetY: 0
+    - _AnimOffsetZ: 1
+    - _AnimPowerX: 0.2
+    - _AnimPowerY: 0
+    - _AnimPowerZ: 0
+    - _AnimSpeed: 5
+    - _Degree: 0
+    - _Offset: 0.01
+    - _OffsetX: 0.498
+    - _OffsetY: 0.491
+    m_Colors: []
diff --git a/...terials/120-129/129_01_Grayscale.mat.meta → ...erials/120-129/129_01_Grayscale2.mat.meta b/...terials/120-129/129_01_Grayscale.mat.meta → ...erials/120-129/129_01_Grayscale2.mat.meta
diff --git a/Assets/Materials/140-149/140_03_Magnet1.mat b/Assets/Materials/140-149/140_03_Magnet1.mat
@@ -82,6 +82,6 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _MagnetDir: {r: -0.1084175, g: 0.4082483, b: 0.90641, a: 0}
+    - _MagnetDir: {r: 0.21208657, g: 0.40824828, b: 0.8878922, a: 0}
     - _MagnetLoc: {r: -1.2898542, g: 2.973, b: -0.70185435, a: 0}
     - myLocator: {r: 3.4, g: 1.785, b: 0.975, a: 0}
diff --git a/Assets/Materials/140-149/145_Half_Lambert.mat b/Assets/Materials/140-149/145_Half_Lambert.mat
@@ -39,7 +39,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 986fc79fcc3ae4e4da1ea23ff3bf7286, type: 3}
+        m_Texture: {fileID: 2800000, guid: 0a0e8af2869fa45f78e25460db578482, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MatCap:
@@ -51,7 +51,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _NormalMap:
-        m_Texture: {fileID: 2800000, guid: 5eacc7beca523d34db5f65d91a876e2f, type: 3}
+        m_Texture: {fileID: 2800000, guid: 94c473c9137744d7eabd829f1150da8d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OcclusionMap:

diff --git a/Assets/Materials/140-149/146_Banded.mat b/Assets/Materials/140-149/146_Banded.mat
@@ -39,7 +39,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 986fc79fcc3ae4e4da1ea23ff3bf7286, type: 3}
+        m_Texture: {fileID: 2800000, guid: 0a0e8af2869fa45f78e25460db578482, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MatCap:
@@ -51,7 +51,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _NormalMap:
-        m_Texture: {fileID: 2800000, guid: 5eacc7beca523d34db5f65d91a876e2f, type: 3}
+        m_Texture: {fileID: 2800000, guid: 94c473c9137744d7eabd829f1150da8d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OcclusionMap:

diff --git a/Assets/Materials/160-169/167_05_Debug_Bitangents.mat b/Assets/Materials/160-169/167_05_Debug_Bitangents.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: 167_05_Debug_Bitangents
   m_Shader: {fileID: 4800000, guid: b561b3ec678db6346b6bb1d9d99ec5d8, type: 3}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/Materials/3D Game Kit/Spitter.mat b/Assets/Materials/3D Game Kit/Spitter.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: Spitter
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/Models/Adam Character Pack - Adam, Guard, Lu/Adam.FBX b/Assets/Models/Adam Character Pack - Adam, Guard, Lu/Adam.FBX