diff --git a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity index 2375bc299..2a2b70490 100644 --- a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity +++ b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity @@ -496,7 +496,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 0.990566, g: 0.9496818, b: 0.82702917, a: 1} - m_Intensity: 1 + m_Intensity: 0.5 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 diff --git a/Assets/Mirror/Examples/PlayerTest/TankPrefab.prefab b/Assets/Mirror/Examples/PlayerTest/TankPrefab.prefab index 326a10b6f..1dd835443 100644 --- a/Assets/Mirror/Examples/PlayerTest/TankPrefab.prefab +++ b/Assets/Mirror/Examples/PlayerTest/TankPrefab.prefab @@ -241,7 +241,7 @@ MonoBehaviour: AutoRun: 114 ToggleUI: 117 controlOptions: 2 - maxMoveSpeed: 5 + maxMoveSpeed: 8 inputSensitivity: 2 inputGravity: 2 maxTurnSpeed: 100 diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.meta b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.meta new file mode 100644 index 000000000..32aa47772 --- /dev/null +++ b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33e4722e9e228b8428c9a8a37f40985b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity index 0f36e7bd4..070f14b3e 100644 --- a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity +++ b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity @@ -20,11 +20,11 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 0, g: 0, b: 0, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 + m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_HaloStrength: 0.5 @@ -37,7 +37,7 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} + m_Sun: {fileID: 151116941} m_IndirectSpecularColor: {r: 0.4366757, g: 0.48427194, b: 0.5645252, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 99d54a76e0a1c424d9afc59563361ea6, + m_LightingDataAsset: {fileID: 112000000, guid: f8d35316bf2026e468f7a3555ec392ba, type: 2} m_UseShadowmask: 1 --- !u!196 &4 diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/LightingData.asset b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/LightingData.asset new file mode 100644 index 000000000..10fbf283f Binary files /dev/null and b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/LightingData.asset differ diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/LightingData.asset.meta b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/LightingData.asset.meta new file mode 100644 index 000000000..1747a52b9 --- /dev/null +++ b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8d35316bf2026e468f7a3555ec392ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/ReflectionProbe-0.exr b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/ReflectionProbe-0.exr new file mode 100644 index 000000000..5bbe43347 Binary files /dev/null and b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/ReflectionProbe-0.exr differ diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/ReflectionProbe-0.exr.meta b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/ReflectionProbe-0.exr.meta new file mode 100644 index 000000000..6396d20a4 --- /dev/null +++ b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame/ReflectionProbe-0.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: dbb3c1c1258bdbe4e8e065a340293089 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/TankTheftAuto/Materials/MaterialTrigger.mat b/Assets/Mirror/Examples/TankTheftAuto/Materials/MaterialTrigger.mat index 9205cc4f7..445034f39 100644 --- a/Assets/Mirror/Examples/TankTheftAuto/Materials/MaterialTrigger.mat +++ b/Assets/Mirror/Examples/TankTheftAuto/Materials/MaterialTrigger.mat @@ -2,16 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: MaterialTrigger m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -58,14 +56,13 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 3 @@ -79,4 +76,3 @@ Material: m_Colors: - _Color: {r: 0, g: 1, b: 1, a: 0.0627451} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.meta b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.meta new file mode 100644 index 000000000..51dbde70a --- /dev/null +++ b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e1ca9a4688eb4b47830f13fc254c02c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity index cd6fa6efd..d5db0eed2 100644 --- a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity +++ b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity @@ -20,7 +20,7 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 0, g: 0, b: 0, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: ae3f8dd37358a144982900f20863f2fd, + type: 2} m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: @@ -237,7 +238,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!114 &88936778 MonoBehaviour: @@ -544,7 +545,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 160176456, guid: d502982feecd043d8bfc6a5c64cd09f9, type: 3} propertyPath: m_RootOrder - value: 1 + value: 7 objectReference: {fileID: 0} - target: {fileID: 160176456, guid: d502982feecd043d8bfc6a5c64cd09f9, type: 3} propertyPath: m_LocalPosition.x @@ -603,6 +604,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8654251059059140979, guid: d502982feecd043d8bfc6a5c64cd09f9, + type: 3} + propertyPath: m_LocalScale.x + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d502982feecd043d8bfc6a5c64cd09f9, type: 3} --- !u!1 &2054208274 @@ -695,7 +701,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: 150, z: 0} --- !u!114 &2816348668128435076 MonoBehaviour: @@ -819,7 +825,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4239341309712137293 GameObject: @@ -853,7 +859,7 @@ Transform: - {fileID: 781619876} - {fileID: 12226147} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &5746453777584925833 Transform: @@ -867,7 +873,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5746453777584925834 MonoBehaviour: @@ -928,6 +934,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 160176456, guid: d502982feecd043d8bfc6a5c64cd09f9, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 160176456, guid: d502982feecd043d8bfc6a5c64cd09f9, type: 3} propertyPath: m_LocalPosition.x value: -8 diff --git a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto/LightingData.asset b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto/LightingData.asset new file mode 100644 index 000000000..dcabb07fc Binary files /dev/null and b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto/LightingData.asset differ diff --git a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto/LightingData.asset.meta b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto/LightingData.asset.meta new file mode 100644 index 000000000..de9c3e6e2 --- /dev/null +++ b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae3f8dd37358a144982900f20863f2fd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/TankTheftAuto/Prefabs/TankShared.prefab b/Assets/Mirror/Examples/TankTheftAuto/Prefabs/TankShared.prefab index 4649440f1..3c22c6096 100644 --- a/Assets/Mirror/Examples/TankTheftAuto/Prefabs/TankShared.prefab +++ b/Assets/Mirror/Examples/TankTheftAuto/Prefabs/TankShared.prefab @@ -244,7 +244,7 @@ MonoBehaviour: AutoRun: 114 ToggleUI: 117 controlOptions: 2 - maxMoveSpeed: 5 + maxMoveSpeed: 8 inputSensitivity: 2 inputGravity: 2 maxTurnSpeed: 100 @@ -653,7 +653,7 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 2, y: 2, z: 2} + m_Size: {x: 1, y: 1, z: 1.0000001} m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1451775205222924547 PrefabInstance: diff --git a/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab b/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab index 824a4b5e0..3e21671ba 100644 --- a/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab +++ b/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab @@ -337,31 +337,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, - type: 3} - propertyPath: m_Height - value: 0.033200573 - objectReference: {fileID: 0} - - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, - type: 3} - propertyPath: m_Radius - value: 0.0014999999 - objectReference: {fileID: 0} - - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, - type: 3} - propertyPath: m_Center.y - value: 0.018600287 - objectReference: {fileID: 0} - - target: {fileID: 6314283028393596113, guid: dad07e68d3659e6439279d0d4110cf4c, - type: 3} - propertyPath: m_Center.z - value: -5.483116e-10 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dad07e68d3659e6439279d0d4110cf4c, type: 3} --- !u!4 &5803173220413450940 stripped diff --git a/Assets/Mirror/Examples/_Common/Controllers/TankController/TankController.cs b/Assets/Mirror/Examples/_Common/Controllers/TankController/TankController.cs index c56a30563..7c18cde3a 100644 --- a/Assets/Mirror/Examples/_Common/Controllers/TankController/TankController.cs +++ b/Assets/Mirror/Examples/_Common/Controllers/TankController/TankController.cs @@ -71,7 +71,7 @@ public enum ControlOptions : byte [Range(0, 20)] [FormerlySerializedAs("moveSpeedMultiplier")] [Tooltip("Speed in meters per second")] - public float maxMoveSpeed = 5f; + public float maxMoveSpeed = 8f; // Replacement for Sensitvity from Input Settings. [Range(0, 10f)] diff --git a/Assets/Mirror/Examples/_Common/TankModel/BasePrefab.prefab b/Assets/Mirror/Examples/_Common/TankModel/BasePrefab.prefab index aa3b4d98a..595633d2a 100644 --- a/Assets/Mirror/Examples/_Common/TankModel/BasePrefab.prefab +++ b/Assets/Mirror/Examples/_Common/TankModel/BasePrefab.prefab @@ -170,8 +170,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 2, y: 2, z: 2} - m_Center: {x: 0, y: 1.7, z: 0.2} + m_Size: {x: 4, y: 4, z: 8} + m_Center: {x: 0, y: 2, z: 0.5} --- !u!136 &6314283028393596113 CapsuleCollider: m_ObjectHideFlags: 0