fix for ping in .butter, reduced parallelism of file loading to make …

…it less laggy during load, fixes for new multiplayer system
robidasdavid · Feb 12, 2022 · eab8f5b · eab8f5b
1 parent 0f8c645
commit eab8f5b
Show file tree

Hide file tree

Showing 16 changed files with 900 additions and 1,069 deletions.
diff --git a/Demo Viewer/Assets/Arena V4/Materials/Disc_Bubble.mat b/Demo Viewer/Assets/Arena V4/Materials/Disc_Bubble.mat
@@ -116,7 +116,7 @@ Material:
         a: 1}
     - Color_ec2d5cd3706e40728f20bb7bd83d0f0f: {r: 0.31764707, g: 0.6862745, b: 1,
         a: 1}
-    - CurrentColor: {r: 0.31764707, g: 0.6862745, b: 1, a: 1}
+    - CurrentColor: {r: 1, g: 0.67058825, b: 0.4745098, a: 1}
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Demo Viewer/Assets/Prefabs/Avatars/NetworkPlayer.prefab b/Demo Viewer/Assets/Prefabs/Avatars/NetworkPlayer.prefab
@@ -302,6 +302,7 @@ GameObject:
   - component: {fileID: 5455352993768156582}
   - component: {fileID: 4420248241329178537}
   - component: {fileID: 7483616477654398534}
+  - component: {fileID: 3261197888607294591}
   m_Layer: 0
   m_Name: NetworkPlayer
   m_TagString: Untagged
@@ -361,6 +362,38 @@ MonoBehaviour:
   useLocalTransform: 0
   teleportDistance: 0
   teleportAngle: 0
+--- !u!114 &3261197888607294591
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5455352993768156633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 32489d17682c03d4782af414f066bac6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 0}
+  followPosition: 1
+  positionFollowType: 0
+  positionForceMult: 1000
+  useFixedUpdatePos: 0
+  positionOffset: {x: 0, y: 0, z: 0}
+  positionOffsetCoordinateSystem: 1
+  snapIfDistanceGreaterThan: 0
+  followRotation: 1
+  rotationFollowType: 0
+  rotationForceMult: 1
+  useFixedUpdateRot: 0
+  rotationOffset: {x: 0, y: 0, z: 0, w: 1}
+  rotationOffsetVector3: {x: 0, y: 0, z: 0}
+  useVector3RotationOffset: 0
+  rotationOffsetCoordinateSystem: 1
+  singleAxisRotation: 0
+  singleAxisRotationAxis: 0
+  snapIfAngleGreaterThan: 0
+  smoothness: 0
 --- !u!1 &7522948635520783987
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Demo Viewer/Assets/Prefabs/MenuTablet.prefab b/Demo Viewer/Assets/Prefabs/MenuTablet.prefab
@@ -2739,10 +2739,10 @@ RectTransform:
   m_Father: {fileID: 858599452921387823}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 36}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 218.73, y: -7.1016846}
+  m_SizeDelta: {x: 866.27, y: 36}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3933920286375240065
 CanvasRenderer:
@@ -6105,7 +6105,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 68}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &6306690418028948359
 MonoBehaviour:
@@ -6780,7 +6780,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -6839,7 +6839,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3834589049739962155
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7192,9 +7192,9 @@ RectTransform:
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 0}
+  m_SizeDelta: {x: 20, y: -17}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &3834589049958901828
 CanvasRenderer:
@@ -7356,9 +7356,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -17}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3834589050309137920
 CanvasRenderer:
@@ -7811,7 +7811,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -15954,10 +15954,10 @@ RectTransform:
   m_Father: {fileID: 858599452921387823}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 50}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10, y: -0.10168457}
+  m_SizeDelta: {x: 203.73, y: 50}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3877468310208980683
 CanvasRenderer:
@@ -17785,7 +17785,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 115.48, y: -184}
+  m_AnchoredPosition: {x: 115.48, y: -157}
   m_SizeDelta: {x: 400, y: 500}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4655382260321863606
@@ -18236,10 +18236,10 @@ RectTransform:
   m_Father: {fileID: 858599452921387823}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 36}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 1090, y: -7.1016846}
+  m_SizeDelta: {x: 100, y: 36}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5067968669553254944
 CanvasRenderer:
@@ -18988,7 +18988,7 @@ PrefabInstance:
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
@@ -18998,12 +18998,12 @@ PrefabInstance:
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1192
       objectReference: {fileID: 0}
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
@@ -19048,12 +19048,12 @@ PrefabInstance:
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 600
       objectReference: {fileID: 0}
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -34
       objectReference: {fileID: 0}
     - target: {fileID: 6270421486806569032, guid: 9e97163eeb07c604aad259c32d2c2bf9,
         type: 3}