fixed lags in menu

Saarg · Apr 3, 2018 · af7afe4 · af7afe4
1 parent e91ffbd
commit af7afe4
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 86 deletions.
diff --git a/Assets/Imports/Graphy - Ultimate Stats Monitor/Materials/FPS_Graph.mat b/Assets/Imports/Graphy - Ultimate Stats Monitor/Materials/FPS_Graph.mat
@@ -60,13 +60,13 @@ Material:
     - ScrollSpeed: 0.2
     - _AmazingThreshold: 0.72
     - _BumpScale: 1
-    - _CautionThreshold: 1
+    - _CautionThreshold: 0.16216215
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _Glossiness: 0.5
-    - _GoodThreshold: 2
+    - _GoodThreshold: 0.3243243
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1

diff --git a/...ts/Imports/RootMotion/Shared Demo Assets/Humanoid Animations/Materials/face_color_map.mat b/...ts/Imports/RootMotion/Shared Demo Assets/Humanoid Animations/Materials/face_color_map.mat
@@ -8,8 +8,8 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: face_color_map
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -59,11 +59,15 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _GlossMapScale: 1
     - _Glossiness: 0.5
+    - _GlossyReflections: 1
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1

diff --git a/Assets/Prefabs/Lobby/Player_Lobby.prefab b/Assets/Prefabs/Lobby/Player_Lobby.prefab
@@ -367,7 +367,7 @@ GameObject:
   m_IsActive: 1
 --- !u!114 &114047955841595384
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1923263510466990}
@@ -379,7 +379,7 @@ MonoBehaviour:
   _guid: c4d02054-1ab4-400d-9a04-5d31620d25a0
 --- !u!114 &114054055739802848
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1945821046297192}
@@ -504,7 +504,7 @@ MonoBehaviour:
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &114090055731196464
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1061077455751698}
@@ -600,7 +600,7 @@ MonoBehaviour:
   m_UseGraphicAlpha: 1
 --- !u!114 &114255537467003042
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1804457912953938}
@@ -612,7 +612,7 @@ MonoBehaviour:
   _guid: eac48d03-5c54-48d5-96d3-63e373717f31
 --- !u!114 &114270830707830528
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1477532786316492}
@@ -720,7 +720,7 @@ MonoBehaviour:
   m_Text: Game master
 --- !u!114 &114306712964824358
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1297712118397848}
@@ -732,7 +732,7 @@ MonoBehaviour:
   _guid: 84daa3ca-b8e7-4f38-9ddb-8e2fb4021590
 --- !u!114 &114308681016056110
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1746000738277234}
@@ -804,7 +804,7 @@ MonoBehaviour:
   m_FillOrigin: 0
 --- !u!114 &114391393480405224
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1116073835295598}
@@ -832,7 +832,7 @@ MonoBehaviour:
     m_Bits: 4294967295
 --- !u!114 &114405441479499356
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1160718009356118}
@@ -871,7 +871,7 @@ MonoBehaviour:
   m_FillOrigin: 0
 --- !u!114 &114453199032242308
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1417168130197134}
@@ -883,7 +883,7 @@ MonoBehaviour:
   _guid: 73b0d2ce-2ed3-462d-b795-ed91df8ce7d8
 --- !u!114 &114456977477087264
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1105656879179580}
@@ -1056,7 +1056,7 @@ MonoBehaviour:
   m_FillOrigin: 0
 --- !u!114 &114641273032133808
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1559897664118614}
@@ -1068,7 +1068,7 @@ MonoBehaviour:
   _guid: f7f3e7f3-5527-40aa-adaa-7999e81eaabc
 --- !u!114 &114649134108239528
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1886539708931792}
@@ -1293,7 +1293,7 @@ MonoBehaviour:
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &114704812626763758
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1222170572369008}
@@ -1453,7 +1453,7 @@ MonoBehaviour:
     m_Bits: 4294967295
 --- !u!114 &114782989017353996
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1991078775203426}
@@ -1498,7 +1498,7 @@ MonoBehaviour:
   m_Text: 
 --- !u!114 &114822313316535046
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1190177473380156}
@@ -1562,7 +1562,7 @@ MonoBehaviour:
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &114828443858722218
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1460888258915898}
@@ -1574,7 +1574,7 @@ MonoBehaviour:
   _guid: 43627ba9-9a3f-47a5-aeab-d158b6391c83
 --- !u!114 &114902043231412498
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1208662964534996}
@@ -1586,7 +1586,7 @@ MonoBehaviour:
   _guid: 1a89bad2-940c-4066-a594-f7bc024f375a
 --- !u!114 &114937693079837210
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1945821046297192}
@@ -1662,7 +1662,7 @@ MonoBehaviour:
   m_UseGraphicAlpha: 1
 --- !u!114 &114998571880550668
 MonoBehaviour:
-  m_ObjectHideFlags: 11
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1856155812064942}
@@ -1867,7 +1867,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -200, y: 135}
+  m_AnchoredPosition: {x: -200, y: 75.00001}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224183508494519846
@@ -1979,7 +1979,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 280, y: 170.03445}
+  m_AnchoredPosition: {x: 280, y: 110.03446}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224660870193799080
@@ -2080,7 +2080,7 @@ RectTransform:
   m_GameObject: {fileID: 1945821046297192}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 224006373080316268}
   - {fileID: 224658741853713106}
@@ -2090,11 +2090,11 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 960, y: 540}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!224 &224802695100954658
 RectTransform:
   m_ObjectHideFlags: 1
@@ -2129,7 +2129,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -200, y: 135}
+  m_AnchoredPosition: {x: -200, y: 75}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224861045194765388

diff --git a/Assets/Scenes/_Lobby/_Lobby.unity b/Assets/Scenes/_Lobby/_Lobby.unity
@@ -1188,13 +1188,13 @@ Camera:
     m_Bits: 4096
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: c4b6c69475223c94d9ac0e09587f8dcc, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
+  m_TargetDisplay: 1
+  m_TargetEye: 0
+  m_HDR: 0
+  m_AllowMSAA: 0
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
+  m_OcclusionCulling: 0
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
 --- !u!4 &59338687
@@ -23115,13 +23115,13 @@ Camera:
     m_Bits: 4096
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: aa8ba79386d1a9f468522f7e05075a65, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
+  m_TargetDisplay: 1
+  m_TargetEye: 0
+  m_HDR: 0
+  m_AllowMSAA: 0
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
+  m_OcclusionCulling: 0
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
 --- !u!4 &532531723
@@ -23211,13 +23211,13 @@ Camera:
     m_Bits: 4096
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: 9202fd21cc7cddd45a3c128c2859be70, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
+  m_TargetDisplay: 1
+  m_TargetEye: 0
+  m_HDR: 0
+  m_AllowMSAA: 0
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
+  m_OcclusionCulling: 0
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
 --- !u!4 &538575896
@@ -40905,12 +40905,12 @@ Camera:
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
+  m_TargetEye: 0
+  m_HDR: 0
   m_AllowMSAA: 1
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
+  m_OcclusionCulling: 0
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
 --- !u!4 &971462712
@@ -53319,7 +53319,7 @@ Transform:
     type: 2}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1280691392}
-  m_LocalRotation: {x: 0.81860405, y: -0.07735156, z: -0.16525161, w: 0.54460645}
+  m_LocalRotation: {x: 0.81860393, y: -0.077351555, z: -0.1652516, w: 0.5446064}
   m_LocalPosition: {x: -6.946268, y: -14.841343, z: -30.790438}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
@@ -58456,13 +58456,13 @@ Camera:
     m_Bits: 4096
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: 8b97c3c4df1c087409bd59b7464abf6d, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
+  m_TargetDisplay: 1
+  m_TargetEye: 0
+  m_HDR: 0
+  m_AllowMSAA: 0
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
+  m_OcclusionCulling: 0
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
 --- !u!4 &1481064480