Merge branch 'dev' of https://github.com/vladimirdlc/UbisoftGameLab2017…

… into dev

Assets/EXITSIGN_02.prefab

@@ -21,6 +21,7 @@ GameObject:
   - component: {fileID: 4912823390561954}
   - component: {fileID: 33280952469394296}
   - component: {fileID: 23082196277329184}
+  - component: {fileID: 108074150822451490}
   m_Layer: 0
   m_Name: EXITSIGN_02
   m_TagString: Untagged
@@ -34,13 +35,13 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1207364831789686}
-  m_LocalRotation: {x: -0.7071068, y: -0.000000057601163, z: -0.000000057601163, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 100, y: 100, z: 100}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
+  m_LocalPosition: {x: 1.263, y: 3.219, z: 12.366}
+  m_LocalScale: {x: 120, y: 120, z: 120}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -90.00001, y: 180, z: 0}
 --- !u!23 &23082196277329184
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -54,8 +55,8 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 2100000, guid: 675032c11de400c47a95d7ee3bdf3528, type: 2}
-  - {fileID: 2100000, guid: d41e30dd6b33261479cda5bea3b86234, type: 2}
+  - {fileID: 2100000, guid: ec5e51c92ac6ff04abd3d074829d66fe, type: 2}
+  - {fileID: 2100000, guid: 6f3672a35f5a0ad4b932a440323e0162, type: 2}
   - {fileID: 2100000, guid: 6f3672a35f5a0ad4b932a440323e0162, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
@@ -81,3 +82,37 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1207364831789686}
   m_Mesh: {fileID: 4300000, guid: 8c1284f055f794a478520871cb4804fd, type: 3}
+--- !u!108 &108074150822451490
+Light:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1207364831789686}
+  m_Enabled: 1
+  serializedVersion: 7
+  m_Type: 2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 5
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0

Assets/Materials/Fern_Green_006.mat

@@ -8,8 +8,8 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: Fern_Green_006
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
   m_SavedProperties:

Assets/Materials/Flooring.mat

@@ -7,8 +7,8 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Flooring
-  m_Shader: {fileID: 4800000, guid: 9ec7ccbd4289d0543939f61121224d93, type: 3}
-  m_ShaderKeywords: TCP2_RAMPTEXT TCP2_SPEC_TOON _EMISSION
+  m_Shader: {fileID: 4800000, guid: 6782973e3ca8b2543beddb0a3dc3175e, type: 3}
+  m_ShaderKeywords: TCP2_RAMPTEXT _EMISSION
   m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}

Assets/Materials/Sign_light.001.mat

@@ -7,8 +7,8 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Sign_light.001
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION
+  m_Shader: {fileID: 4800000, guid: 6782973e3ca8b2543beddb0a3dc3175e, type: 3}
+  m_ShaderKeywords: TCP2_RAMPTEXT _EMISSION
   m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
@@ -69,6 +69,12 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - first:
+        name: _Ramp
+      second:
+        m_Texture: {fileID: 2800000, guid: 2bebb5799b426a74aaf1179cb5aa0db7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - first:
         name: _BumpScale
@@ -103,6 +109,12 @@ Material:
     - first:
         name: _Parallax
       second: 0.02
+    - first:
+        name: _RampSmooth
+      second: 0.1
+    - first:
+        name: _RampThreshold
+      second: 0.5
     - first:
         name: _SmoothnessTextureChannel
       second: 0
@@ -121,7 +133,13 @@ Material:
     m_Colors:
     - first:
         name: _Color
-      second: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+      second: {r: 1, g: 1, b: 1, a: 1}
     - first:
         name: _EmissionColor
       second: {r: 1.44, g: 1.44, b: 1.44, a: 1}
+    - first:
+        name: _HColor
+      second: {r: 1, g: 1, b: 1, a: 1}
+    - first:
+        name: _SColor
+      second: {r: 0.4, g: 0.4, b: 0.4, a: 1}