From 8d37cc3174139de72512d3a7e61d55074cf5e51c Mon Sep 17 00:00:00 2001 From: MrGadget <9826063+MrGadget1024@users.noreply.github.com> Date: Thu, 10 Oct 2024 03:57:07 -0400 Subject: [PATCH] fix(Examples): Moved dirt and wall textures & materials to _Common --- .../Examples/Room/Materials/Textures.meta | 8 - .../Examples/Tanks/Scenes/MirrorTanks.unity | 149 +++--------------- .../Examples/{Tanks => _Common}/Textures.meta | 0 ...lic Domain) Dirt Hand Painted Texture.meta | 0 .../Dirt Hand Painted Texture - License.txt | 0 ...rt Hand Painted Texture - License.txt.meta | 0 .../Dirt.mat | 0 .../Dirt.mat.meta | 0 .../dirt.png | Bin .../dirt.png.meta | 0 .../Materials => _Common}/Textures/Wall01.tga | Bin .../Textures/Wall01.tga.meta | 0 .../Textures/Wall01_n.tga | Bin .../Textures/Wall01_n.tga.meta | 0 14 files changed, 25 insertions(+), 132 deletions(-) delete mode 100644 Assets/Mirror/Examples/Room/Materials/Textures.meta rename Assets/Mirror/Examples/{Tanks => _Common}/Textures.meta (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture.meta (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png (100%) rename Assets/Mirror/Examples/{Tanks => _Common}/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta (100%) rename Assets/Mirror/Examples/{Room/Materials => _Common}/Textures/Wall01.tga (100%) rename Assets/Mirror/Examples/{Room/Materials => _Common}/Textures/Wall01.tga.meta (100%) rename Assets/Mirror/Examples/{Room/Materials => _Common}/Textures/Wall01_n.tga (100%) rename Assets/Mirror/Examples/{Room/Materials => _Common}/Textures/Wall01_n.tga.meta (100%) diff --git a/Assets/Mirror/Examples/Room/Materials/Textures.meta b/Assets/Mirror/Examples/Room/Materials/Textures.meta deleted file mode 100644 index 0ab790252..000000000 --- a/Assets/Mirror/Examples/Room/Materials/Textures.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 047a5014adf04914f9ffded62a715e39 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity b/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity index 92957c3e3..138cdcf72 100644 --- a/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity +++ b/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 10 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -43,7 +43,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,6 +67,9 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 0 @@ -94,13 +98,13 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 1064449595} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 3 + serializedVersion: 2 agentTypeID: 0 agentRadius: 2 agentHeight: 3.5 @@ -113,9 +117,7 @@ NavMeshSettings: cellSize: 0.6666667 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 + accuratePlacement: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: c772aa575956c59478e2d55eb019e17a, type: 2} @@ -151,17 +153,9 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -195,13 +189,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 88936773} - serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 20, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!114 &88936778 MonoBehaviour: @@ -244,13 +237,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 251893064} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.92387956, z: 0, w: 0.38268343} m_LocalPosition: {x: 14, y: 0, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -135, z: 0} --- !u!114 &251893066 MonoBehaviour: @@ -288,13 +280,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 535739935} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 14, y: 0, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!114 &535739937 MonoBehaviour: @@ -308,66 +299,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 41f84591ce72545258ea98cb7518d8b9, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!850595691 &1064449595 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Settings.lighting - serializedVersion: 8 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 1 - m_LightmapMaxSize: 1024 - m_LightmapSizeFixed: 0 - m_UseMipmapLimits: 1 - m_BakeResolution: 40 - m_Padding: 2 - m_LightmapCompression: 3 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 512 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 0 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &1107091652 GameObject: m_ObjectHideFlags: 0 @@ -378,8 +309,8 @@ GameObject: m_Component: - component: {fileID: 1107091656} - component: {fileID: 1107091655} - - component: {fileID: 1107091654} - component: {fileID: 1107091653} + - component: {fileID: 1107091654} m_Layer: 0 m_Name: Ground m_TagString: Untagged @@ -398,14 +329,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -430,7 +357,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1107091654 MeshCollider: m_ObjectHideFlags: 0 @@ -439,17 +365,9 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1107091652} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -468,13 +386,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1107091652} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 1, z: 4} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1282001517 GameObject: @@ -503,13 +420,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1282001517} - serializedVersion: 2 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: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1282001519 MonoBehaviour: @@ -542,17 +458,17 @@ MonoBehaviour: headlessStartMode: 1 editorAutoStart: 0 sendRate: 30 - autoStartServerBuild: 0 - autoConnectClientBuild: 0 offlineScene: onlineScene: + offlineSceneLoadDelay: 0 transport: {fileID: 1282001521} networkAddress: localhost maxConnections: 100 disconnectInactiveConnections: 0 disconnectInactiveTimeout: 60 authenticator: {fileID: 0} - playerPrefab: {fileID: 1916082411674582, guid: 6f43bf5488a7443d19ab2a83c6b91f35, type: 3} + playerPrefab: {fileID: 1916082411674582, guid: 6f43bf5488a7443d19ab2a83c6b91f35, + type: 3} autoCreatePlayer: 1 playerSpawnMethod: 1 spawnPrefabs: @@ -641,13 +557,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1458789072} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.92387956, z: 0, w: 0.38268343} m_LocalPosition: {x: -14, y: 0, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 135, z: 0} --- !u!114 &1458789074 MonoBehaviour: @@ -685,13 +600,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1501912662} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: -14, y: 0, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} --- !u!114 &1501912664 MonoBehaviour: @@ -730,8 +644,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2054208274} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 @@ -780,7 +695,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2054208276 @@ -790,23 +704,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2054208274} - serializedVersion: 2 m_LocalRotation: {x: 0.10938167, y: 0.8754261, z: -0.40821788, w: 0.23456976} m_LocalPosition: {x: 0, y: 10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: 150, z: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 2054208276} - - {fileID: 1107091656} - - {fileID: 88936777} - - {fileID: 1282001518} - - {fileID: 251893065} - - {fileID: 535739936} - - {fileID: 1458789073} - - {fileID: 1501912663} diff --git a/Assets/Mirror/Examples/Tanks/Textures.meta b/Assets/Mirror/Examples/_Common/Textures.meta similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures.meta rename to Assets/Mirror/Examples/_Common/Textures.meta diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture.meta b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture.meta similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture.meta rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture.meta diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png diff --git a/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta b/Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta similarity index 100% rename from Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta rename to Assets/Mirror/Examples/_Common/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta diff --git a/Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga b/Assets/Mirror/Examples/_Common/Textures/Wall01.tga similarity index 100% rename from Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga rename to Assets/Mirror/Examples/_Common/Textures/Wall01.tga diff --git a/Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga.meta b/Assets/Mirror/Examples/_Common/Textures/Wall01.tga.meta similarity index 100% rename from Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga.meta rename to Assets/Mirror/Examples/_Common/Textures/Wall01.tga.meta diff --git a/Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga b/Assets/Mirror/Examples/_Common/Textures/Wall01_n.tga similarity index 100% rename from Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga rename to Assets/Mirror/Examples/_Common/Textures/Wall01_n.tga diff --git a/Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga.meta b/Assets/Mirror/Examples/_Common/Textures/Wall01_n.tga.meta similarity index 100% rename from Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga.meta rename to Assets/Mirror/Examples/_Common/Textures/Wall01_n.tga.meta