From 200397a5eb211e260b13a80d2b83a3452af11043 Mon Sep 17 00:00:00 2001 From: Maciekxdabu <40292375+Maciekxdabu@users.noreply.github.com> Date: Mon, 23 May 2022 17:46:14 +0200 Subject: [PATCH] merloj: tilemap fixes in Main scene --- theProject/Assets/Scenes/Main.unity | 145 +++++----------------------- 1 file changed, 25 insertions(+), 120 deletions(-) diff --git a/theProject/Assets/Scenes/Main.unity b/theProject/Assets/Scenes/Main.unity index 012bb1e5..29f17bea 100644 --- a/theProject/Assets/Scenes/Main.unity +++ b/theProject/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.17920087, g: 0.22438505, b: 0.3061323, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -156,17 +156,19 @@ MonoBehaviour: WORLD_SPACE_OFFSET: {x: 0.5, y: 0.5, z: 0.5} allyBaseCoord: {x: 0, y: 0} soldierStartingPositions: - - {x: 1, y: 0} - - {x: 1, y: 2} + - {x: 1, y: 1} + - {x: 2, y: 2} enemyBaseCoord: {x: 9, y: 9} enemyStartingPositions: - - {x: 2, y: 0} - - {x: 9, y: 5} + - {x: 8, y: 8} + - {x: 7, y: 7} tilemap: {fileID: 1853262998} soldierPrefab: {fileID: 403095692180922766, guid: a87b1aa46b0ed3e0fba621e11dd4f1e2, type: 3} basePrefab: {fileID: 403095692180922766, guid: cff761b70fcb1dc55bfd414849823b2e, type: 3} + tilesToDraw: + - {fileID: 11400000, guid: f4810e428eeabd34aaf98dcfc2940217, type: 2} --- !u!4 &282616949 Transform: m_ObjectHideFlags: 0 @@ -259,14 +261,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 453924353} - m_LocalRotation: {x: 0.22221683, y: -0, z: -0, w: 0.9749973} - m_LocalPosition: {x: 5.37, y: 5.93, z: -5.08} + m_LocalRotation: {x: 0.9203544, y: -0, z: -0, w: 0.39108536} + m_LocalPosition: {x: 5.02, y: 12.41, z: 6.33} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 25.679, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 133.956, y: 0, z: 0} --- !u!114 &453924357 MonoBehaviour: m_ObjectHideFlags: 0 @@ -373,7 +375,7 @@ Grid: m_CellSize: {x: 1, y: 1, z: 0} m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 - m_CellSwizzle: 1 + m_CellSwizzle: 0 --- !u!4 &1067482841 Transform: m_ObjectHideFlags: 0 @@ -390,104 +392,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1129778410 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1129778411} - - component: {fileID: 1129778414} - - component: {fileID: 1129778413} - - component: {fileID: 1129778412} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1129778411 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1129778410} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.99, y: -0.3, z: 5.01} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1853262996} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1129778412 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1129778410} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1129778413 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1129778410} - m_Enabled: 1 - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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 &1129778414 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1129778410} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1242078932 GameObject: m_ObjectHideFlags: 0 @@ -773,14 +677,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1460622992} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalRotation: {x: 0.89088345, y: -0, z: -0, w: 0.45423207} + m_LocalPosition: {x: 0, y: 3, z: 7.37} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: 125.968994, y: 0, z: 0} --- !u!114 &1460622995 MonoBehaviour: m_ObjectHideFlags: 0 @@ -939,8 +843,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1129778411} + m_Children: [] m_Father: {fileID: 1067482841} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2037,7 +1940,7 @@ Tilemap: m_Origin: {x: 0, y: 0, z: 0} m_Size: {x: 10, y: 10, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} - m_TileOrientation: 1 + m_TileOrientation: 0 m_TileOrientationMatrix: e00: 1 e01: 0 @@ -2055,17 +1958,19 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!64 &1853262999 -MeshCollider: +--- !u!19719996 &1853262999 +TilemapCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853262995} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001