From f64cf6e3dba7cd555cc1b093899e657b11088825 Mon Sep 17 00:00:00 2001 From: Chris Langsenkamp Date: Wed, 1 Jan 2020 12:34:30 -0500 Subject: [PATCH] Update Prefabs & Scenes to Master --- .../AdditiveScenes/Prefabs/Capsule.prefab | 1 - .../AdditiveScenes/Prefabs/Cube.prefab | 1 - .../AdditiveScenes/Prefabs/Cylinder.prefab | 1 - .../AdditiveScenes/Prefabs/Player.prefab | 8 +- .../AdditiveScenes/Prefabs/Sphere.prefab | 1 - .../AdditiveScenes/Prefabs/Tank.prefab | 1 - .../AdditiveScenes/Scenes/MainScene.unity | 19 +++ .../AdditiveScenes/Scenes/SubScene.unity | 112 ++++++++++-------- .../Examples/Basic/Prefabs/Player.prefab | 2 +- .../Examples/Chat/Prefabs/Player.prefab | 3 + .../Mirror/Examples/Pong/Prefabs/Ball.prefab | 3 +- .../Examples/Pong/Prefabs/Racket.prefab | 2 +- .../Mirror/Examples/Pong/Scenes/Scene.unity | 17 +-- .../Examples/Room/Prefabs/GamePlayer.prefab | 2 +- .../Examples/Room/Prefabs/RoomPlayer.prefab | 2 +- .../Examples/Room/Scenes/OfflineScene.unity | 2 +- .../Examples/Tanks/Prefabs/Projectile.prefab | 2 +- .../Mirror/Examples/Tanks/Prefabs/Tank.prefab | 2 +- 18 files changed, 98 insertions(+), 83 deletions(-) diff --git a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab index 40a5b83e8..d8ccd864d 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab +++ b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab @@ -68,7 +68,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab index 7f3970863..42a4c9119 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab +++ b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab @@ -68,7 +68,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab index 90609dc40..c0612f0b3 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab +++ b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab @@ -68,7 +68,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab index 143d322a5..da53210b2 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab +++ b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab @@ -194,16 +194,15 @@ MonoBehaviour: syncInterval: 0 characterController: {fileID: 8993127209816276930} moveSpeed: 8 - turnSpeedAccel: 5 - turnSpeedDecel: 5 + turnSensitivity: 5 maxTurnSpeed: 150 - jumpSpeed: 0 - jumpFactor: 0.025 horizontal: 0 vertical: 0 turn: 0 + jumpSpeed: 0 isGrounded: 1 isFalling: 0 + velocity: {x: 0, y: 0, z: 0} --- !u!114 &3086414693581178039 MonoBehaviour: m_ObjectHideFlags: 0 @@ -251,3 +250,4 @@ MonoBehaviour: syncMode: 0 syncInterval: 0 compressRotation: 1 + clientAuthority: 1 diff --git a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab index 3717de89a..dbd7ef1ca 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab +++ b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab @@ -68,7 +68,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab index e6b72c27e..4a5b25e3f 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab +++ b/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab @@ -334,7 +334,6 @@ SkinnedMeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity b/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity index a21ecae47..d67d13697 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity +++ b/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity @@ -432,6 +432,10 @@ PrefabInstance: propertyPath: m_Name value: reconTank objectReference: {fileID: 0} + - target: {fileID: 160176458, guid: ab222ed73ada1ac4ba2f61e843d7627c, type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} - target: {fileID: 160176459, guid: ab222ed73ada1ac4ba2f61e843d7627c, type: 3} propertyPath: m_AssetId value: ab222ed73ada1ac4ba2f61e843d7627c @@ -844,6 +848,11 @@ PrefabInstance: propertyPath: m_Name value: Sphere objectReference: {fileID: 0} + - target: {fileID: 855244094988030908, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, + type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} - target: {fileID: 855244094988030909, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, type: 3} propertyPath: m_LocalPosition.x @@ -1167,6 +1176,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6852530814182375317, guid: 12a4c14e672c00b4b840f937d824b890, + type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6852530814182375318, guid: 12a4c14e672c00b4b840f937d824b890, type: 3} propertyPath: m_SceneId @@ -2083,5 +2097,10 @@ PrefabInstance: propertyPath: m_SceneId value: 2061538488 objectReference: {fileID: 0} + - target: {fileID: 5697694911122891659, guid: e1971f4a8c7661546bc509b44bd91b80, + type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1971f4a8c7661546bc509b44bd91b80, type: 3} diff --git a/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity b/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity index 223f82efa..e337704c6 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity +++ b/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 12 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,7 +62,6 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,16 +76,10 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -94,8 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 112000002, guid: b287b2046ddc6af4b9ddc48ab35ca3cb, type: 2} m_UseShadowmask: 1 @@ -178,7 +170,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -281,6 +272,11 @@ PrefabInstance: propertyPath: castLayers.m_Bits value: 256 objectReference: {fileID: 0} + - target: {fileID: 5697694911122891659, guid: e1971f4a8c7661546bc509b44bd91b80, + type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1971f4a8c7661546bc509b44bd91b80, type: 3} --- !u!1 &222935521 @@ -340,7 +336,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -418,7 +413,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -530,7 +524,6 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -563,6 +556,16 @@ PrefabInstance: propertyPath: m_Name value: Sphere objectReference: {fileID: 0} + - target: {fileID: 855244094988030908, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, + type: 3} + propertyPath: castLayers.m_Bits + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 855244094988030908, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, + type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} - target: {fileID: 855244094988030909, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, type: 3} propertyPath: m_LocalPosition.x @@ -623,11 +626,6 @@ PrefabInstance: propertyPath: m_SceneId value: 11893259 objectReference: {fileID: 0} - - target: {fileID: 855244094988030908, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, - type: 3} - propertyPath: castLayers.m_Bits - value: 256 - objectReference: {fileID: 0} - target: {fileID: 855244096231524078, guid: f6d08eb9a8e35d84fa30a7e3ae64181a, type: 3} propertyPath: m_CastShadows @@ -652,15 +650,35 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5623359707189648430, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + - target: {fileID: 5623359706949397433, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3} - propertyPath: m_Name - value: Cube + propertyPath: m_CastShadows + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5623359707189648430, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + - target: {fileID: 5623359706949397433, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3} - propertyPath: m_Icon - value: + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5623359706949397433, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5623359707189648404, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + type: 3} + propertyPath: m_SceneId + value: 4733130 + objectReference: {fileID: 0} + - target: {fileID: 5623359707189648405, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + type: 3} + propertyPath: castLayers.m_Bits + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 5623359707189648405, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + type: 3} + propertyPath: forceHidden + value: 0 objectReference: {fileID: 0} - target: {fileID: 5623359707189648426, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3} @@ -717,30 +735,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5623359707189648404, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + - target: {fileID: 5623359707189648430, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3} - propertyPath: m_SceneId - value: 4733130 + propertyPath: m_Name + value: Cube objectReference: {fileID: 0} - - target: {fileID: 5623359707189648405, guid: 4ff300cf6bb3c6342a9552c4f18788c8, + - target: {fileID: 5623359707189648430, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3} - propertyPath: castLayers.m_Bits - value: 256 - objectReference: {fileID: 0} - - target: {fileID: 5623359706949397433, guid: 4ff300cf6bb3c6342a9552c4f18788c8, - type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5623359706949397433, guid: 4ff300cf6bb3c6342a9552c4f18788c8, - type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5623359706949397433, guid: 4ff300cf6bb3c6342a9552c4f18788c8, - type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 + propertyPath: m_Icon + value: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ff300cf6bb3c6342a9552c4f18788c8, type: 3} @@ -811,6 +814,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6852530814182375317, guid: 12a4c14e672c00b4b840f937d824b890, + type: 3} + propertyPath: castLayers.m_Bits + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 6852530814182375317, guid: 12a4c14e672c00b4b840f937d824b890, + type: 3} + propertyPath: forceHidden + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6852530814182375318, guid: 12a4c14e672c00b4b840f937d824b890, type: 3} propertyPath: m_AssetId @@ -821,10 +834,5 @@ PrefabInstance: propertyPath: m_SceneId value: 4633990 objectReference: {fileID: 0} - - target: {fileID: 6852530814182375317, guid: 12a4c14e672c00b4b840f937d824b890, - type: 3} - propertyPath: castLayers.m_Bits - value: 256 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12a4c14e672c00b4b840f937d824b890, type: 3} diff --git a/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab b/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab index 7a5251364..5a369e493 100644 --- a/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab +++ b/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab @@ -185,7 +185,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serverOnly: 0 - m_AssetId: 22f1fa3a0aff72b46a371f667bb4fb30 + m_AssetId: m_SceneId: 0 --- !u!1 &1088833924003616756 GameObject: diff --git a/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab b/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab index 1298eeaf2..c4fb98f13 100644 --- a/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab +++ b/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab @@ -44,6 +44,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3addc5ad220944ed6888319897606739, type: 3} m_Name: m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + playerName: --- !u!114 &114398755512196590 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab b/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab index a2d75cc20..b4186143c 100644 --- a/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab +++ b/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab @@ -144,7 +144,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serverOnly: 0 - m_AssetId: 5f7a7f34494ed40268eff49dbf9168bf + m_AssetId: m_SceneId: 0 --- !u!114 &114692463781779748 MonoBehaviour: @@ -177,3 +177,4 @@ MonoBehaviour: syncMode: 0 syncInterval: 0 compressRotation: 1 + clientAuthority: 0 diff --git a/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab b/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab index cdd4e0fd1..76f8b218a 100644 --- a/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab +++ b/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab @@ -144,7 +144,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serverOnly: 0 - m_AssetId: b1651eaf8c7564a1c86031dfbb8a7b28 + m_AssetId: m_SceneId: 0 --- !u!114 &114626868563338794 MonoBehaviour: diff --git a/Assets/Mirror/Examples/Pong/Scenes/Scene.unity b/Assets/Mirror/Examples/Pong/Scenes/Scene.unity index 8ffe2b485..daac6da64 100644 --- a/Assets/Mirror/Examples/Pong/Scenes/Scene.unity +++ b/Assets/Mirror/Examples/Pong/Scenes/Scene.unity @@ -880,6 +880,7 @@ MonoBehaviour: transport: {fileID: 1886246553} networkAddress: localhost maxConnections: 4 + authenticator: {fileID: 0} playerPrefab: {fileID: 1240244544407914, guid: b1651eaf8c7564a1c86031dfbb8a7b28, type: 3} autoCreatePlayer: 1 @@ -903,40 +904,28 @@ MonoBehaviour: OnClientConnected: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null OnClientDataReceived: m_PersistentCalls: m_Calls: [] - m_TypeName: Mirror.UnityEventByteArray, Mirror, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null OnClientError: m_PersistentCalls: m_Calls: [] - m_TypeName: Mirror.UnityEventException, Mirror, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null OnClientDisconnected: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null OnServerConnected: m_PersistentCalls: m_Calls: [] - m_TypeName: Mirror.UnityEventInt, Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null OnServerDataReceived: m_PersistentCalls: m_Calls: [] - m_TypeName: Mirror.UnityEventIntByteArray, Mirror, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null OnServerError: m_PersistentCalls: m_Calls: [] - m_TypeName: Mirror.UnityEventIntException, Mirror, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null OnServerDisconnected: m_PersistentCalls: m_Calls: [] - m_TypeName: Mirror.UnityEventInt, Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null port: 7777 NoDelay: 1 + serverMaxMessageSize: 16384 + clientMaxMessageSize: 16384 diff --git a/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab b/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab index 941c771cf..b65b9b74c 100644 --- a/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab +++ b/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab @@ -250,7 +250,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serverOnly: 0 - m_AssetId: 21daf89214c6ee443ad6875b73083c60 + m_AssetId: m_SceneId: 0 --- !u!114 &114265392388239132 MonoBehaviour: diff --git a/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab b/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab index 9aab1071a..05a7f237a 100644 --- a/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab +++ b/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: serverOnly: 0 m_AssetId: - m_SceneId: 1375022854 + m_SceneId: 0 --- !u!114 &114033720796874720 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity b/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity index b536b68fb..466d22b90 100644 --- a/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity +++ b/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity @@ -163,7 +163,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60 + field of view: 26.991467 orthographic: 0 orthographic size: 5 m_Depth: -1 diff --git a/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab b/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab index 72ce693dc..af00b7329 100644 --- a/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab +++ b/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab @@ -127,7 +127,7 @@ MonoBehaviour: m_EditorClassIdentifier: serverOnly: 0 m_AssetId: - m_SceneId: 3146823364 + m_SceneId: 0 --- !u!136 &2355290524794870353 CapsuleCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab b/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab index 4b317f656..78bb8f8fb 100644 --- a/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab +++ b/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab @@ -52,7 +52,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serverOnly: 0 - m_AssetId: 6f43bf5488a7443d19ab2a83c6b91f35 + m_AssetId: m_SceneId: 0 --- !u!95 &2240606817507776182 Animator: