diff --git a/Demo Viewer/Assets/Arena V4/Materials/Disc_Bubble.mat b/Demo Viewer/Assets/Arena V4/Materials/Disc_Bubble.mat index 5f206ca1d..6317c50f6 100644 --- 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 index 906e6b5b5..39a5ccb27 100644 --- 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 index 36668243d..d61a25e34 100644 --- 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} diff --git a/Demo Viewer/Assets/Scenes/Environments/Arena_V4.unity b/Demo Viewer/Assets/Scenes/Environments/Arena_V4.unity index 1d321a32c..4604c6ba0 100644 --- a/Demo Viewer/Assets/Scenes/Environments/Arena_V4.unity +++ b/Demo Viewer/Assets/Scenes/Environments/Arena_V4.unity @@ -4077,955 +4077,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1001 &180690739 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 507943008255351783, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008255351783, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008255351783, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008255351783, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008255351783, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008255351783, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008341670698, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008341670698, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008341670698, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008341670698, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008341670698, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008341670698, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008702104013, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008702104013, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008702104013, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008702104013, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008702104013, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008702104013, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008780319492, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008780319492, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008780319492, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008780319492, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008780319492, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008780319492, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008789598054, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008789598054, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008789598054, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008789598054, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008789598054, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008789598054, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008981288990, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008981288990, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008981288990, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008981288990, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008981288990, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943008981288990, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009071142303, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009071142303, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009071142303, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009071142303, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009071142303, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009071142303, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009197658686, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009197658686, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009197658686, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009197658686, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009197658686, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009197658686, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009203563138, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009203563138, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009203563138, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009203563138, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009203563138, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009203563138, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009372509645, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009372509645, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009372509645, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009372509645, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009372509645, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009372509645, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009415472434, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009415472434, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009415472434, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009415472434, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009415472434, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009415472434, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009478852072, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009478852072, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009478852072, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009478852072, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009478852072, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943009478852072, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010034782949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010034782949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010034782949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010034782949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010034782949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010034782949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010077706027, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 507943010092042388, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010092042388, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010092042388, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010092042388, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010092042388, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 507943010092042388, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965656615630, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965656615630, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965656615630, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965656615630, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965656615630, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965656615630, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965843738815, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965843738815, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965843738815, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965843738815, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965843738815, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965843738815, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.70717925 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7070343 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 37.54 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 2.1179419 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 89.988 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266688, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547965901266689, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_Name - value: Scoreboard Full - objectReference: {fileID: 0} - - target: {fileID: 8815547966170621379, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966170621379, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966170621379, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966170621379, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966170621379, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966170621379, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966245797145, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966245797145, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966245797145, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966245797145, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966245797145, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966245797145, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966497212949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966497212949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966497212949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966497212949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966497212949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966497212949, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966499451561, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966499451561, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966499451561, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966499451561, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966499451561, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966499451561, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966605479398, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966605479398, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966605479398, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966605479398, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966605479398, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966605479398, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966907567540, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966907567540, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966907567540, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966907567540, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966907567540, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966907567540, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966948134965, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966948134965, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966948134965, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966948134965, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966948134965, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547966948134965, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967008168422, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967008168422, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967008168422, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967008168422, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967008168422, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967008168422, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967149384495, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967149384495, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967149384495, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967149384495, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967149384495, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967149384495, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967162898253, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967162898253, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967162898253, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967162898253, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967162898253, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967162898253, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967319335681, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967319335681, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967319335681, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967319335681, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967319335681, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967319335681, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967698191308, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967698191308, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967698191308, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967698191308, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967698191308, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8815547967698191308, guid: 1d57dba87029f664eab45f1d818a0cd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1d57dba87029f664eab45f1d818a0cd4, type: 3} --- !u!1 &185952599 GameObject: m_ObjectHideFlags: 0 @@ -47601,7 +46652,7 @@ Transform: - {fileID: 584528722} - {fileID: 1309024307} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &1869454834 PrefabInstance: diff --git a/Demo Viewer/Assets/Scenes/Environments/Combat/Combustion.unity b/Demo Viewer/Assets/Scenes/Environments/Combat/Combustion.unity index 6fa3c7b7b..0f2f2e168 100644 --- a/Demo Viewer/Assets/Scenes/Environments/Combat/Combustion.unity +++ b/Demo Viewer/Assets/Scenes/Environments/Combat/Combustion.unity @@ -498,6 +498,43 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &53904868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 53904869} + m_Layer: 0 + m_Name: Echo GP Course Spheres + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &53904869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 53904868} + 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_Children: + - {fileID: 719560785} + - {fileID: 1015016262} + - {fileID: 1877771255} + - {fileID: 1901628845} + - {fileID: 870169431} + - {fileID: 1014724422} + - {fileID: 1027184818} + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &88528794 GameObject: m_ObjectHideFlags: 0 @@ -8149,6 +8186,101 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &719560784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 719560785} + - component: {fileID: 719560788} + - component: {fileID: 719560787} + - component: {fileID: 719560786} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &719560785 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719560784} + m_LocalRotation: {x: -0, y: -0.38224122, z: -0, w: 0.9240626} + m_LocalPosition: {x: -69.35, y: 0.58, z: 18.19} + m_LocalScale: {x: 8.210141, y: 8.210141, z: 8.210141} + m_Children: [] + m_Father: {fileID: 53904869} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -44.945, z: 0} +--- !u!135 &719560786 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719560784} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5000001 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &719560787 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719560784} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &719560788 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719560784} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &818764967 PrefabInstance: m_ObjectHideFlags: 0 @@ -8239,6 +8371,101 @@ Transform: type: 3} m_PrefabInstance: {fileID: 818764967} m_PrefabAsset: {fileID: 0} +--- !u!1 &870169430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 870169431} + - component: {fileID: 870169434} + - component: {fileID: 870169433} + - component: {fileID: 870169432} + m_Layer: 0 + m_Name: Cube (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &870169431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870169430} + m_LocalRotation: {x: -0, y: 0.92387974, z: -0, w: 0.38268316} + m_LocalPosition: {x: -10.01, y: -0.2403, z: -11.11} + m_LocalScale: {x: 9.4268, y: 9.4268, z: 9.4268} + m_Children: [] + m_Father: {fileID: 53904869} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 135, z: 0} +--- !u!135 &870169432 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870169430} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5000005 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &870169433 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870169430} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &870169434 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870169430} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &881998772 GameObject: m_ObjectHideFlags: 0 @@ -8641,38 +8868,331 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 997551854} - - component: {fileID: 997551856} - - component: {fileID: 997551855} + - component: {fileID: 997551854} + - component: {fileID: 997551856} + - component: {fileID: 997551855} + m_Layer: 0 + m_Name: New Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &997551854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997551853} + m_LocalRotation: {x: -0, y: -0.9048272, z: -0, w: -0.4257791} + m_LocalPosition: {x: 12.246919, y: 0, z: -10.131543} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 1303642457} + m_RootOrder: 31 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &997551855 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997551853} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7d6e5d112d5597444a3dc6cb8f4d9d68, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &997551856 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997551853} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -3507784821096888589, guid: 6e4bc4df6b0fd984aaeaae0565598d6d, + type: 3} + m_Color: {r: 0, g: 0.77999973, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1014724421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1014724422} + - component: {fileID: 1014724425} + - component: {fileID: 1014724424} + - component: {fileID: 1014724423} + m_Layer: 0 + m_Name: Cube (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1014724422 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014724421} + m_LocalRotation: {x: -0, y: 0.7071072, z: -0, w: 0.7071064} + m_LocalPosition: {x: -30.19, y: 2.96, z: 16.55} + m_LocalScale: {x: 9.4268, y: 9.4268, z: 9.4268} + m_Children: [] + m_Father: {fileID: 53904869} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!135 &1014724423 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014724421} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1014724424 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014724421} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1014724425 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014724421} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1015016261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1015016262} + - component: {fileID: 1015016265} + - component: {fileID: 1015016264} + - component: {fileID: 1015016263} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1015016262 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015016261} + m_LocalRotation: {x: -0, y: -0.38224122, z: -0, w: 0.9240626} + m_LocalPosition: {x: -28.42, y: 3.3607, z: 38.31} + m_LocalScale: {x: 17.44739, y: 17.447386, z: 17.447386} + m_Children: [] + m_Father: {fileID: 53904869} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -44.945, z: 0} +--- !u!135 &1015016263 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015016261} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.50000006 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1015016264 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015016261} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1015016265 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015016261} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1022826683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1022826684} + - component: {fileID: 1022826686} + - component: {fileID: 1022826685} m_Layer: 0 - m_Name: New Sprite + m_Name: New Sprite (19) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &997551854 +--- !u!4 &1022826684 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997551853} - m_LocalRotation: {x: -0, y: -0.9048272, z: -0, w: -0.4257791} - m_LocalPosition: {x: 12.246919, y: 0, z: -10.131543} - m_LocalScale: {x: 2, y: 2, z: 2} + m_GameObject: {fileID: 1022826683} + m_LocalRotation: {x: -0, y: -0.72896844, z: -0, w: 0.6845473} + m_LocalPosition: {x: -15.863138, y: 0, z: -0.99801254} + m_LocalScale: {x: -2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 1303642457} - m_RootOrder: 31 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &997551855 +--- !u!95 &1022826685 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997551853} + m_GameObject: {fileID: 1022826683} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 7d6e5d112d5597444a3dc6cb8f4d9d68, type: 2} @@ -8684,13 +9204,13 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &997551856 +--- !u!212 &1022826686 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997551853} + m_GameObject: {fileID: 1022826683} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -8736,7 +9256,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1022826683 +--- !u!1 &1027184817 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8744,69 +9264,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1022826684} - - component: {fileID: 1022826686} - - component: {fileID: 1022826685} + - component: {fileID: 1027184818} + - component: {fileID: 1027184821} + - component: {fileID: 1027184820} + - component: {fileID: 1027184819} m_Layer: 0 - m_Name: New Sprite (19) + m_Name: Cube (6) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1022826684 +--- !u!4 &1027184818 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1022826683} - m_LocalRotation: {x: -0, y: -0.72896844, z: -0, w: 0.6845473} - m_LocalPosition: {x: -15.863138, y: 0, z: -0.99801254} - m_LocalScale: {x: -2, y: 2, z: 2} + m_GameObject: {fileID: 1027184817} + m_LocalRotation: {x: -0, y: 0.9238798, z: -0, w: 0.38268283} + m_LocalPosition: {x: -67.8064, y: 0.4292, z: 31.4236} + m_LocalScale: {x: 4, y: 4, z: 4} m_Children: [] - m_Father: {fileID: 1303642457} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1022826685 -Animator: - serializedVersion: 3 + m_Father: {fileID: 53904869} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 135, z: 0} +--- !u!135 &1027184819 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1022826683} + m_GameObject: {fileID: 1027184817} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7d6e5d112d5597444a3dc6cb8f4d9d68, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &1022826686 -SpriteRenderer: + serializedVersion: 2 + m_Radius: 0.5000001 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1027184820 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1022826683} + m_GameObject: {fileID: 1027184817} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 + m_RayTracingMode: 2 m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8819,7 +9334,7 @@ SpriteRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -8827,18 +9342,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -3507784821096888589, guid: 6e4bc4df6b0fd984aaeaae0565598d6d, - type: 3} - m_Color: {r: 0, g: 0.77999973, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1027184821 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027184817} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1045074538 PrefabInstance: m_ObjectHideFlags: 0 @@ -17728,6 +18240,196 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1875405700} m_PrefabAsset: {fileID: 0} +--- !u!1 &1877771254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1877771255} + - component: {fileID: 1877771258} + - component: {fileID: 1877771257} + - component: {fileID: 1877771256} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1877771255 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877771254} + m_LocalRotation: {x: -0, y: -0.38224122, z: -0, w: 0.9240626} + m_LocalPosition: {x: 43.6, y: 1.8442, z: 36.45} + m_LocalScale: {x: 15, y: 15, z: 15} + m_Children: [] + m_Father: {fileID: 53904869} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -44.945, z: 0} +--- !u!135 &1877771256 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877771254} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.50000006 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1877771257 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877771254} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1877771258 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877771254} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1901628844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1901628845} + - component: {fileID: 1901628848} + - component: {fileID: 1901628847} + - component: {fileID: 1901628846} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1901628845 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901628844} + m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: 21.05, y: -0.952, z: -0.26} + m_LocalScale: {x: 9.4268, y: 9.4268, z: 9.4268} + m_Children: [] + m_Father: {fileID: 53904869} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!135 &1901628846 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901628844} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1901628847 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901628844} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 99c25d95264b77b4baa60d05d18f174c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1901628848 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901628844} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1910220720 GameObject: m_ObjectHideFlags: 0 diff --git a/Demo Viewer/Assets/Scenes/Environments/Combat/Fission.unity b/Demo Viewer/Assets/Scenes/Environments/Combat/Fission.unity index f32be396a..b0390c86b 100644 --- a/Demo Viewer/Assets/Scenes/Environments/Combat/Fission.unity +++ b/Demo Viewer/Assets/Scenes/Environments/Combat/Fission.unity @@ -15998,6 +15998,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: -4519736104410586773, guid: 4b9349126791321408fe7960a75845cd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4519736104410586773, guid: 4b9349126791321408fe7960a75845cd, type: 3} propertyPath: m_StaticEditorFlags @@ -16008,6 +16013,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: -4440821509589974092, guid: 4b9349126791321408fe7960a75845cd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -4440821509589974092, guid: 4b9349126791321408fe7960a75845cd, type: 3} propertyPath: m_StaticEditorFlags @@ -16028,6 +16038,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: -3101154386762100106, guid: 4b9349126791321408fe7960a75845cd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -3101154386762100106, guid: 4b9349126791321408fe7960a75845cd, type: 3} propertyPath: m_StaticEditorFlags @@ -16068,6 +16083,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: -1015049334227580332, guid: 4b9349126791321408fe7960a75845cd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1015049334227580332, guid: 4b9349126791321408fe7960a75845cd, type: 3} propertyPath: m_StaticEditorFlags @@ -16078,6 +16098,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: -482382381908697537, guid: 4b9349126791321408fe7960a75845cd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -482382381908697537, guid: 4b9349126791321408fe7960a75845cd, type: 3} propertyPath: m_StaticEditorFlags @@ -16088,6 +16113,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: -188038115675459189, guid: 4b9349126791321408fe7960a75845cd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -188038115675459189, guid: 4b9349126791321408fe7960a75845cd, type: 3} propertyPath: m_StaticEditorFlags diff --git a/Demo Viewer/Assets/Scenes/Game Scene.unity b/Demo Viewer/Assets/Scenes/Game Scene.unity index b0f4f0bb3..3da7fa675 100644 --- a/Demo Viewer/Assets/Scenes/Game Scene.unity +++ b/Demo Viewer/Assets/Scenes/Game Scene.unity @@ -17212,7 +17212,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 233344de094f11341bdb834d564708dc, type: 3} m_Name: m_EditorClassIdentifier: - host: 129.158.60.79 + host: 129.159.107.234 port: 80 udpConnected: 0 userid: -1 diff --git a/Demo Viewer/Assets/Scripts/ButterReplays/ButterFile.cs b/Demo Viewer/Assets/Scripts/ButterReplays/ButterFile.cs index a89b12b36..16f37ab97 100644 --- a/Demo Viewer/Assets/Scripts/ButterReplays/ButterFile.cs +++ b/Demo Viewer/Assets/Scripts/ButterReplays/ButterFile.cs @@ -92,7 +92,7 @@ public enum GoalType : byte } // TODO reorder to match terminal appearance - public enum Weapon : byte + public enum Weapon { rocket, // meteor blaster, // nova @@ -101,7 +101,7 @@ public enum Weapon : byte // TODO check mapping } - public enum Ordnance : byte + public enum Ordnance { stun, // stun field det, // detonator @@ -109,7 +109,7 @@ public enum Ordnance : byte arc, // arc mine } - public enum TacMod : byte + public enum TacMod { sensor, // threat scanner wraith, // phase shift @@ -117,7 +117,7 @@ public enum TacMod : byte shield, // energy barrier } - public enum Arm : byte { + public enum Arm { Left, Right, } diff --git a/Demo Viewer/Assets/Scripts/ButterReplays/ButterFrame.cs b/Demo Viewer/Assets/Scripts/ButterReplays/ButterFrame.cs index c15fbb2f0..b3beb8c83 100644 --- a/Demo Viewer/Assets/Scripts/ButterReplays/ButterFrame.cs +++ b/Demo Viewer/Assets/Scripts/ButterReplays/ButterFrame.cs @@ -217,7 +217,7 @@ public byte[] GetBytes() // ping/packetloss if (playerStateBitmask[5]) { - writer.Write((ushort)(player.ping - (lastFramePlayer?.ping ?? 0))); + writer.Write((short)(player.ping - (lastFramePlayer?.ping ?? 0))); writer.WriteHalf((Half)(player.packetlossratio - (lastFramePlayer?.packetlossratio ?? 0))); } diff --git a/Demo Viewer/Assets/Scripts/ButterReplays/Decompressor_v2.cs b/Demo Viewer/Assets/Scripts/ButterReplays/Decompressor_v2.cs index 6dea4f748..f455cd5d8 100644 --- a/Demo Viewer/Assets/Scripts/ButterReplays/Decompressor_v2.cs +++ b/Demo Viewer/Assets/Scripts/ButterReplays/Decompressor_v2.cs @@ -372,7 +372,7 @@ public static List FromBytes(byte formatVersion, BinaryReader fileInput, if (playerStateBitmask[5]) { - p.ping = input.ReadUInt16() + (lastFrame?.GetPlayer(p.userid)?.ping ?? 0); + p.ping = input.ReadInt16() + (lastFrame?.GetPlayer(p.userid)?.ping ?? 0); p.packetlossratio = input.ReadSystemHalf() + (lastFrame?.GetPlayer(p.userid)?.packetlossratio ?? 0); } diff --git a/Demo Viewer/Assets/Scripts/DiscController.cs b/Demo Viewer/Assets/Scripts/DiscController.cs index 93ebd085b..8d5c6e9ba 100644 --- a/Demo Viewer/Assets/Scripts/DiscController.cs +++ b/Demo Viewer/Assets/Scripts/DiscController.cs @@ -82,7 +82,7 @@ private void Update() { if (DemoStart.instance.playhead == null) return; Frame frame = DemoStart.instance.playhead.GetFrame(); - if (frame == null) return; + if (frame?.disc == null) return; discVelocity = frame.disc.velocity.ToVector3(); discPosition = frame.disc.Position; diff --git a/Demo Viewer/Assets/Scripts/EchoVRAPI/Frame.cs b/Demo Viewer/Assets/Scripts/EchoVRAPI/Frame.cs index fe8cd216b..6b1d7b24d 100644 --- a/Demo Viewer/Assets/Scripts/EchoVRAPI/Frame.cs +++ b/Demo Viewer/Assets/Scripts/EchoVRAPI/Frame.cs @@ -7,6 +7,7 @@ using UnityEngine; #else using System.Numerics; +using System.Diagnostics; #endif namespace EchoVRAPI @@ -35,7 +36,7 @@ public class Frame /// This data is from a different API call, but can be combined here to make organization easier /// [JsonIgnore] public Bones bones; - + public int err_code; public string err_description; @@ -264,7 +265,7 @@ public static Frame Lerp(Frame from, Frame to, DateTime t) recorded_time = t, bones = Bones.Lerp(from.bones, to.bones, lerpValue), - + disc = Disc.Lerp(from.disc, to.disc, lerpValue), sessionid = from.sessionid, orange_points = from.orange_points, @@ -314,7 +315,7 @@ public static Frame FromEchoReplayString(string line) if (!string.IsNullOrEmpty(line)) { string[] splitJSON = line.Split('\t'); - string onlyJSON, onlyTime, onlyBones=null; + string onlyJSON, onlyTime, onlyBones = null; switch (splitJSON.Length) { case 3: @@ -396,19 +397,19 @@ public static Frame FromJSON(DateTime timestamp, string session, string bones) f.teams[0].players ??= new List(); f.teams[1].players ??= new List(); f.teams[2].players ??= new List(); - } - if (bones !=null) f.bones = JsonConvert.DeserializeObject(bones); - - // makes loops through all players a lot easier - foreach (Team team in f.teams) - { - foreach (Player player in team.players) + // makes loops through all players a lot easier + foreach (Team team in f.teams) { - player.team_color = team.color; + foreach (Player player in team.players) + { + player.team_color = team.color; + } } } + if (bones != null) f.bones = JsonConvert.DeserializeObject(bones); + return f; } @@ -417,7 +418,7 @@ public static void Log(string message) #if UNITY Debug.Log(message); #else - Console.WriteLine(message); + Debug.WriteLine(message); #endif } } @@ -638,8 +639,8 @@ public static List ToFloatList(this Vector3 vector3) #endif }; } - - + + public static Quaternion ToQuaternion(this float[] input) { if (input.Length != 4) diff --git a/Demo Viewer/Assets/Scripts/Network/VelNetMan.cs b/Demo Viewer/Assets/Scripts/Network/VelNetMan.cs index e49df459c..57148633a 100644 --- a/Demo Viewer/Assets/Scripts/Network/VelNetMan.cs +++ b/Demo Viewer/Assets/Scripts/Network/VelNetMan.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using UnityEngine; +using unityutilities; using VelNet; public class VelNetMan : MonoBehaviour @@ -13,7 +14,7 @@ public class VelNetMan : MonoBehaviour // Start is called before the first frame update private void Start() { - VelNetManager.OnConnectedToServer += () => { VelNetManager.Login(SystemInfo.deviceUniqueIdentifier, "nopass"); }; + VelNetManager.OnConnectedToServer += () => { VelNetManager.Login("Replay Viewer", Hash128.Compute(SystemInfo.deviceUniqueIdentifier).ToString()); }; VelNetManager.OnLoggedIn += () => { // VelNetManager.Join("default"); @@ -22,7 +23,10 @@ private void Start() VelNetManager.OnJoinedRoom += roomId => { Debug.Log("Joined VelNet Room: " + roomId); - playerPrefabReference = VelNetManager.InstantiateNetworkObject(playerPrefab.name); + playerPrefabReference = VelNetManager.NetworkInstantiate(playerPrefab.name); + + playerPrefabReference.GetComponent().SetTarget(Camera.main.transform, false); + playerPrefabReference.transform.GetChild(0).gameObject.SetActive(false); StartCoroutine(WaitOneFrame(() => diff --git a/Demo Viewer/Assets/Scripts/NetworkFrameManager.cs b/Demo Viewer/Assets/Scripts/NetworkFrameManager.cs index 5b6f0ed0e..b4a25195b 100644 --- a/Demo Viewer/Assets/Scripts/NetworkFrameManager.cs +++ b/Demo Viewer/Assets/Scripts/NetworkFrameManager.cs @@ -38,7 +38,14 @@ protected override void SendState(BinaryWriter binaryWriter) binaryWriter.Write(DemoStart.instance.replay.FrameCount); binaryWriter.Write(DemoStart.instance.playhead.playbackMultiplier); binaryWriter.Write(DemoStart.instance.playhead.CurrentFrameIndex); - binaryWriter.Write(DemoStart.instance.playhead.lastPlayheadLocation.ToFileTimeUtc()); + if (DemoStart.instance.playhead.lastPlayheadLocation > DateTime.MinValue) + { + binaryWriter.Write(DemoStart.instance.playhead.lastPlayheadLocation.ToFileTimeUtc()); + } + else + { + binaryWriter.Write((long)0); + } binaryWriter.Write(Path.GetFileNameWithoutExtension(DemoStart.instance.replay.FileName)); ButterFile bf = new ButterFile(); diff --git a/Demo Viewer/Assets/Scripts/ReplayLoader/Replay.cs b/Demo Viewer/Assets/Scripts/ReplayLoader/Replay.cs index 5031038b5..83bb7ea2d 100644 --- a/Demo Viewer/Assets/Scripts/ReplayLoader/Replay.cs +++ b/Demo Viewer/Assets/Scripts/ReplayLoader/Replay.cs @@ -90,6 +90,7 @@ private IEnumerator LoadFileCo(string fileName = "") TemporalLoadProgress?.Invoke((float)processingProgress / game.nFrames); yield return null; } + TemporalLoadProgress?.Invoke(1); TemporalLoadingFinished?.Invoke(); @@ -193,11 +194,13 @@ private void ProcessAllTemporalData(Game game, int threadLoadingId) colors.Clear(); normals.Clear(); - Parallel.For(0, game.nFrames, i => - { - GetFrame(i); - Interlocked.Increment(ref processingProgress); - }); + Parallel.For(0, game.nFrames, + new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount - 1 }, + i => + { + GetFrame(i); + Interlocked.Increment(ref processingProgress); + }); for (int i = 0; i < game.nFrames; i++) { diff --git a/Demo Viewer/Packages/packages-lock.json b/Demo Viewer/Packages/packages-lock.json index b20048777..d35e072c6 100644 --- a/Demo Viewer/Packages/packages-lock.json +++ b/Demo Viewer/Packages/packages-lock.json @@ -290,7 +290,7 @@ "depth": 0, "source": "git", "dependencies": {}, - "hash": "b7bba1f756cb8202082e0bbf992019a110a673c7" + "hash": "373323729efc5afb3ef6cfefbf5e0df29d73d546" }, "jp.keijiro.pcx": { "version": "1.0.1",