light theme

uw-cmg · Jun 8, 2015 · 10e8276 · 10e8276
1 parent 7616908
commit 10e8276
Show file tree

Hide file tree

Showing 11 changed files with 245 additions and 34 deletions.
diff --git a/Assets/A_Scenes/AtomTouch_Main.unity b/Assets/A_Scenes/AtomTouch_Main.unity
@@ -207,7 +207,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
 --- !u!1001 &157047559
 Prefab:
   m_ObjectHideFlags: 0
@@ -245,7 +245,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 22427912, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
       propertyPath: m_RootOrder
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 22427912, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
       propertyPath: m_AnchoredPosition.x
@@ -467,6 +467,166 @@ Prefab:
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 11427934, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .0784313679
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427934, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.a
+      value: .627451003
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427934, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427860, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427858, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427900, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427932, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427860, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .0784313679
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427860, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.a
+      value: .627451003
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427932, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.a
+      value: .70588237
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427858, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.a
+      value: .70588237
+      objectReference: {fileID: 0}
+    - target: {fileID: 127920, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427914, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427880, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .12272203
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427880, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .288966179
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427880, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .549019635
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427862, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .0457670093
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427862, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .320623964
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427862, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .486274511
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427890, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .0457670093
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427890, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .320623964
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427890, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .486274511
+      objectReference: {fileID: 0}
+    - target: {fileID: 11444168, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .0457670093
+      objectReference: {fileID: 0}
+    - target: {fileID: 11444168, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .320623964
+      objectReference: {fileID: 0}
+    - target: {fileID: 11444168, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .486274511
+      objectReference: {fileID: 0}
+    - target: {fileID: 11406868, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .0457670093
+      objectReference: {fileID: 0}
+    - target: {fileID: 11406868, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .320623994
+      objectReference: {fileID: 0}
+    - target: {fileID: 11406868, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .486274511
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427828, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .0470588244
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427828, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .321568638
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427828, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .486274511
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427874, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.r
+      value: .0470588244
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427874, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.g
+      value: .321568638
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427874, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Color.b
+      value: .486274511
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427926, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Colors.m_NormalColor.r
+      value: .450503647
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427926, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Colors.m_NormalColor.g
+      value: .524832785
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427926, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Colors.m_NormalColor.b
+      value: .760784328
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427820, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Colors.m_NormalColor.r
+      value: .519677043
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427820, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Colors.m_NormalColor.g
+      value: .58725214
+      objectReference: {fileID: 0}
+    - target: {fileID: 11427820, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
+      propertyPath: m_Colors.m_NormalColor.b
+      value: .752941191
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
   m_IsPrefabParent: 0
@@ -754,7 +914,7 @@ Transform:
   - {fileID: 275708122}
   - {fileID: 588189262}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
 --- !u!1 &1500188032 stripped
 GameObject:
   m_PrefabParentObject: {fileID: 143662, guid: a68afe71e8aaa3d46a11bef9e639ca71, type: 2}
@@ -1140,13 +1300,13 @@ GameObject:
   - 92: {fileID: 1960553275}
   - 124: {fileID: 1960553274}
   - 81: {fileID: 1960553273}
-  - 45: {fileID: 1960553278}
   - 114: {fileID: 1960553281}
   - 114: {fileID: 1960553280}
   - 114: {fileID: 1960553279}
   - 114: {fileID: 1960553282}
   - 114: {fileID: 1960553283}
   - 114: {fileID: 1960553286}
+  - 45: {fileID: 1960553278}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -1225,8 +1385,8 @@ Skybox:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1960553272}
-  m_Enabled: 0
-  m_CustomSkybox: {fileID: 2100000, guid: b6a90f2536a08064eb4aa03f3e28120e, type: 2}
+  m_Enabled: 1
+  m_CustomSkybox: {fileID: 2100000, guid: fcb0aa1311a1941ea94e9ed997db7a82, type: 2}
 --- !u!114 &1960553279
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1354,7 +1514,7 @@ MonoBehaviour:
   centerPos: {x: 0, y: 0, z: 0}
   errorBuffer: .5
   lineMat: {fileID: 2100000, guid: 9647efc6732774f7191fa2cc8259d8f1, type: 2}
-  lineColor: {r: .80392158, g: .372549027, b: .184313729, a: .611764729}
+  lineColor: {r: .286764711, g: .25, b: .387773901, a: .0117647061}
   lineWidth: .100000001
   width: 20
   height: 20

diff --git a/Assets/Materials/AtomTouch_Skybox.mat b/Assets/Materials/AtomTouch_Skybox.mat
@@ -2,13 +2,14 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 4
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: AtomTouch_Skybox
   m_Shader: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _LIGHTMAPPING_REALTIME
+  m_LightmapFlags: 5
   m_CustomRenderQueue: -1
   m_SavedProperties:
     serializedVersion: 2
@@ -29,35 +30,35 @@ Material:
           m_Offset: {x: 0, y: 0}
       data:
         first:
-          name: _EmissionMap
+          name: _DetailNormalMap
         second:
           m_Texture: {fileID: 0}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:
         first:
-          name: _DetailNormalMap
+          name: _Tex
         second:
           m_Texture: {fileID: 0}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:
         first:
-          name: _Tex
+          name: _ParallaxMap
         second:
           m_Texture: {fileID: 0}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:
         first:
-          name: _ParallaxMap
+          name: _OcclusionMap
         second:
           m_Texture: {fileID: 0}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:
         first:
-          name: _OcclusionMap
+          name: _EmissionMap
         second:
           m_Texture: {fileID: 0}
           m_Scale: {x: 1, y: 1}
@@ -83,27 +84,65 @@ Material:
           m_Texture: {fileID: 0}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _FrontTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _BackTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _LeftTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _RightTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _UpTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DownTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
     m_Floats:
       data:
         first:
           name: _Cutoff
         second: .5
-      data:
-        first:
-          name: _Lightmapping
-        second: 1
       data:
         first:
           name: _Exposure
-        second: .400000006
+        second: 2.70000005
       data:
         first:
           name: _SunSize
         second: 0
       data:
         first:
           name: _AtmosphereThickness
-        second: .409999996
+        second: .649999976
       data:
         first:
           name: _SrcBlend
@@ -152,6 +191,10 @@ Material:
         first:
           name: _Metallic
         second: 0
+      data:
+        first:
+          name: _Lightmapping
+        second: 1
       data:
         first:
           name: _Rotation
@@ -168,11 +211,11 @@ Material:
       data:
         first:
           name: _SkyTint
-        second: {r: .333333343, g: .752941251, b: .956862807, a: 1}
+        second: {r: .760784328, g: .652955651, b: .5370242, a: 1}
       data:
         first:
           name: _GroundColor
-        second: {r: .0340614133, g: .170614913, b: .33088237, a: 1}
+        second: {r: .376470596, g: .4627451, b: .549019635, a: 1}
       data:
         first:
           name: _EmissionColorUI