Version 0.8

demonixis · Mar 29, 2018 · 29eb35c · 29eb35c
1 parent d0f371a
commit 29eb35c
Show file tree

Hide file tree

Showing 22 changed files with 484 additions and 121 deletions.
diff --git a/Assets/Materials/GUIOverlay.mat b/Assets/Materials/GUIOverlay.mat
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: GUIOverlay
+  m_Shader: {fileID: 4800000, guid: 3955f306692091e40a7120f9c6ef104c, type: 3}
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
+  m_LightmapFlags: 5
+  m_EnableInstancingVariants: 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: 2800000, guid: ca849f0f639dff84faf630957499dc50, type: 3}
+        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
+    - _Glossiness: 0.5
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/GUIOverlay.mat.meta b/Assets/Materials/GUIOverlay.mat.meta
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
@@ -81,7 +81,7 @@ GameObject:
   m_IsActive: 1
 --- !u!1 &1000013604504344
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
@@ -109,6 +109,7 @@ GameObject:
   - component: {fileID: 114000012947587150}
   - component: {fileID: 114000014037808996}
   - component: {fileID: 114204427439299378}
+  - component: {fileID: 114941094485981810}
   m_Layer: 0
   m_Name: Player
   m_TagString: Player
@@ -254,6 +255,7 @@ Transform:
   m_Children:
   - {fileID: 4000013377317106}
   - {fileID: 4000011114332734}
+  - {fileID: 4000012374394250}
   m_Father: {fileID: 4000010397047646}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -268,7 +270,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4000010397047646}
-  - {fileID: 4000012374394250}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -278,12 +279,12 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1000013604504344}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.29999995, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 4000012289534432}
-  m_RootOrder: 1
+  m_Father: {fileID: 4000012171920516}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4000013377317106
 Transform:
@@ -754,9 +755,23 @@ MonoBehaviour:
     type: 2}
   m_TeleporterLinePrefab: {fileID: 1673332131935090, guid: 2147af4bafca3d44fa6e6fb46e7426d5,
     type: 2}
-  m_MaxDistance: 5
+  m_MaxDistance: 10
   m_LeftHand: 0
   m_Button: 10
+--- !u!114 &114941094485981810
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000014283173620}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 201d3915a464cbb459c7eca25d6ee92f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MoveSpeed: 3
+  m_StrafeSpeed: 1.5
+  m_RotationSpeed: 75
 --- !u!114 &114968490010128300
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -788,7 +803,7 @@ MonoBehaviour:
     type: 2}
   m_TeleporterLinePrefab: {fileID: 1673332131935090, guid: 2147af4bafca3d44fa6e6fb46e7426d5,
     type: 2}
-  m_MaxDistance: 5
+  m_MaxDistance: 10
   m_LeftHand: 1
   m_Button: 10
 --- !u!124 &124000013977040076

diff --git a/Assets/Prefabs/TESUnity.prefab b/Assets/Prefabs/TESUnity.prefab
@@ -49,9 +49,9 @@ MonoBehaviour:
   enableLog: 0
   waterQuality: 0
   useStaticBatching: 1
-  cellRadius: 2
+  cellRadius: 1
   cellDetailRadius: 3
-  cellRadiusOnLoad: 2
+  cellRadiusOnLoad: 1
   materialType: 1
   renderPath: 2
   cameraFarClip: 500
@@ -68,11 +68,11 @@ MonoBehaviour:
   animateLights: 1
   dayNightCycle: 1
   generateNormalMap: 1
-  normalGeneratorIntensity: 10
-  postProcessingQuality: 2
-  antiAliasing: 1
+  normalGeneratorIntensity: 1
+  postProcessingQuality: 3
+  antiAliasing: 3
   waterBackSideTransparent: 0
-  followHeadDirection: 1
+  followHeadDirection: 0
   directModePreview: 1
   roomScale: 0
   forceControllers: 1

diff --git a/Assets/Resources/Materials/Lightweight-PBR-Cutout.mat b/Assets/Resources/Materials/Lightweight-PBR-Cutout.mat
@@ -75,7 +75,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.15
+    - _Glossiness: 0.2
     - _GlossinessSource: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Resources/Materials/Lightweight-PBR.mat b/Assets/Resources/Materials/Lightweight-PBR.mat
@@ -75,7 +75,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.15
+    - _Glossiness: 0.2
     - _GlossinessSource: 0
     - _GlossyReflections: 1
     - _Metallic: 0

diff --git a/Assets/Resources/Materials/Lightweight-Simple-Cutout.mat b/Assets/Resources/Materials/Lightweight-Simple-Cutout.mat
@@ -83,7 +83,7 @@ Material:
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _ReflectionSource: 0
-    - _Shininess: 0.15
+    - _Shininess: 0.8
     - _SmoothnessTextureChannel: 0
     - _SpecSource: 0
     - _SpecularHighlights: 1

diff --git a/Assets/Resources/Materials/Lightweight-Simple.mat b/Assets/Resources/Materials/Lightweight-Simple.mat
@@ -83,7 +83,7 @@ Material:
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _ReflectionSource: 0
-    - _Shininess: 0.15
+    - _Shininess: 0.8
     - _SmoothnessTextureChannel: 0
     - _SpecSource: 0
     - _SpecularHighlights: 1