Revert "fix(AdditiveLevels): Text instead of TMP"

This reverts commit 648fb0a489.

Assets/Mirror/Examples/AdditiveLevels/Prefabs/Portal.prefab

@@ -28,14 +28,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1098173225717622925}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6310510557204038809}
+  - {fileID: 1355348187805494562}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1098173225717622922
 MeshFilter:
@@ -62,8 +62,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -97,17 +95,8 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1098173225717622925}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 2
   m_Radius: 0.2
   m_Height: 1
   m_Direction: 1
@@ -127,7 +116,7 @@ MonoBehaviour:
   sceneId: 0
   _assetId: 1770499856
   serverOnly: 0
-  visibility: 0
+  visible: 0
   hasSpawned: 0
 --- !u!114 &5948271423698091598
 MonoBehaviour:
@@ -146,9 +135,9 @@ MonoBehaviour:
   syncInterval: 0.1
   destinationScene: 
   startPosition: {x: 0, y: 0, z: 0}
-  label: {fileID: 196696687462809087}
+  label: {fileID: 8197110483235692531}
   labelText: 
---- !u!1 &7239359504399476199
+--- !u!1 &5961932215084527574
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -156,189 +145,110 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7248691719992067284}
+  - component: {fileID: 1355348187805494562}
-  - component: {fileID: 1017926149738021198}
+  - component: {fileID: 5428053421152709616}
-  - component: {fileID: 196696687462809087}
+  - component: {fileID: 3243959486819493908}
-  m_Layer: 5
+  - component: {fileID: 8197110483235692531}
-  m_Name: TextLabel
+  m_Layer: 9
+  m_Name: Label_TMP
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &7248691719992067284
+--- !u!224 &1355348187805494562
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7239359504399476199}
+  m_GameObject: {fileID: 5961932215084527574}
   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_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6310510557204038809}
+  m_Father: {fileID: 1098173225717622921}
+  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_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 220, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1017926149738021198
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7239359504399476199}
-  m_CullTransparentMesh: 1
---- !u!114 &196696687462809087
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7239359504399476199}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 40
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 254
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: Sub Level 2
---- !u!1 &7676122842037577140
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6310510557204038809}
-  - component: {fileID: 225937381063041484}
-  - component: {fileID: 1701913631314820104}
-  - component: {fileID: 3375702683146421090}
-  - component: {fileID: 385208237666037165}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6310510557204038809
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7676122842037577140}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7248691719992067284}
-  m_Father: {fileID: 1098173225717622921}
-  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: 1.5}
-  m_SizeDelta: {x: 220, y: 50}
+  m_SizeDelta: {x: 20, y: 5}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &225937381063041484
+--- !u!23 &5428053421152709616
-Canvas:
+MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7676122842037577140}
+  m_GameObject: {fileID: 5961932215084527574}
   m_Enabled: 1
-  serializedVersion: 3
+  m_CastShadows: 0
-  m_RenderMode: 2
+  m_ReceiveShadows: 0
-  m_Camera: {fileID: 0}
+  m_DynamicOccludee: 1
-  m_PlaneDistance: 100
+  m_StaticShadowCaster: 0
-  m_PixelPerfect: 0
+  m_MotionVectors: 1
-  m_ReceivesEvents: 1
+  m_LightProbeUsage: 1
-  m_OverrideSorting: 0
+  m_ReflectionProbeUsage: 1
-  m_OverridePixelPerfect: 0
+  m_RayTracingMode: 2
-  m_SortingBucketNormalizedSize: 0
+  m_RayTraceProcedural: 0
-  m_VertexColorAlwaysGammaSpace: 0
+  m_RenderingLayerMask: 1
-  m_AdditionalShaderChannelsFlag: 0
+  m_RendererPriority: 0
-  m_UpdateRectTransformForStandalone: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, 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: 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_TargetDisplay: 0
+  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &1701913631314820104
+--- !u!114 &3243959486819493908
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7676122842037577140}
+  m_GameObject: {fileID: 5961932215084527574}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Script: {fileID: 11500000, guid: cc58300ee45438a418d9e32957fdc0c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+--- !u!102 &8197110483235692531
-  m_ReferencePixelsPerUnit: 100
+TextMesh:
-  m_ScaleFactor: 1
+  serializedVersion: 3
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
---- !u!114 &3375702683146421090
-MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7676122842037577140}
+  m_GameObject: {fileID: 5961932215084527574}
-  m_Enabled: 1
+  m_Text: 
-  m_EditorHideFlags: 0
+  m_OffsetZ: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_CharacterSize: 0.05
-  m_Name: 
+  m_LineSpacing: 1
-  m_EditorClassIdentifier: 
+  m_Anchor: 4
-  m_IgnoreReversedGraphics: 1
+  m_Alignment: 1
-  m_BlockingObjects: 0
+  m_TabSize: 4
-  m_BlockingMask:
+  m_FontSize: 100
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 0}
+  m_Color:
     serializedVersion: 2
-    m_Bits: 4294967295
+    rgba: 4294967295
---- !u!114 &385208237666037165
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7676122842037577140}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: afa2d590c474413d9fc183551385ed85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Mirror/Examples/AdditiveLevels/Scripts/Portal.cs

@@ -3,7 +3,6 @@
 using System.Text.RegularExpressions;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityEngine.UI;
 
 namespace Mirror.Examples.AdditiveLevels
 {
@@ -16,7 +15,7 @@ public class Portal : NetworkBehaviour
         public Vector3 startPosition;
 
         [Tooltip("Reference to child TextMesh label")]
-        public Text label; // don't depend on TMPro. 2019 errors.
+        public TextMesh label; // don't depend on TMPro. 2019 errors.
 
         [SyncVar(hook = nameof(OnLabelTextChanged))]
         public string labelText;