Überarbeitete Tile Palette

diff --git a/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity
index 9944b40323d4b4450d9af67c5eaad8625a091626..012e77b8e300c2a50e2c062674ad905066ccfc4b 100644 (file)
--- a/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity
+++ b/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity
@@ -2477,7 +2477,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 242491967}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 630.3, y: 6.2, z: 0}
+  m_LocalPosition: {x: 630.3, y: 3.5, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -5465,7 +5465,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 576194712}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 635.60004, y: -1.7, z: 0}
+  m_LocalPosition: {x: 635.60004, y: -4.3999996, z: 0}
   m_LocalScale: {x: 3, y: 3, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -12350,7 +12350,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 887776279}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 492.4, y: 28.1, z: 0}
+  m_LocalPosition: {x: 492.8, y: 31.8, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -14868,7 +14868,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1146337034}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.236446, y: -0.596105, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1019550506}
@@ -14913,7 +14913,7 @@ TilemapRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: -1
+  m_SortingOrder: 1
   m_ChunkSize: {x: 32, y: 32, z: 32}
   m_ChunkCullingBounds: {x: 3.0006251, y: 3.0000002, z: 0}
   m_MaxChunkCount: 16
@@ -21861,96 +21861,6 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: -7, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 2
-      m_TileSpriteIndex: 1
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: -6, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 3
-      m_TileSpriteIndex: 0
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: -5, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 2
-      m_TileSpriteIndex: 1
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: -4, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 3
-      m_TileSpriteIndex: 0
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: -3, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 2
-      m_TileSpriteIndex: 1
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: -2, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 3
-      m_TileSpriteIndex: 0
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: -1, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 2
-      m_TileSpriteIndex: 1
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: 0, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 4
-      m_TileSpriteIndex: 4
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: 1, y: -1, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 2
-      m_TileSpriteIndex: 1
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
   - first: {x: 2, y: -1, z: 0}
     second:
       serializedVersion: 2
@@ -23204,36 +23114,36 @@ Tilemap:
   m_AnimatedTiles: {}
   m_TileAssetArray:
   - m_RefCount: 335
-    m_Data: {fileID: 11400000, guid: aee16766e5388f9429c0f32b036048ab, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 19
-    m_Data: {fileID: 11400000, guid: 1c3fcefe5a5b89843bac65414aa49cfd, type: 2}
-  - m_RefCount: 45
-    m_Data: {fileID: 11400000, guid: 31bda1beb9a4d8a44bc4cded54986781, type: 2}
-  - m_RefCount: 26
-    m_Data: {fileID: 11400000, guid: 263e91beedfed3d419501bff0ca34385, type: 2}
-  - m_RefCount: 30
-    m_Data: {fileID: 11400000, guid: 1d43ba52534b66844a4d7bfd4e1f7e44, type: 2}
+    m_Data: {fileID: 0}
+  - m_RefCount: 40
+    m_Data: {fileID: 0}
+  - m_RefCount: 23
+    m_Data: {fileID: 0}
+  - m_RefCount: 29
+    m_Data: {fileID: 0}
   - m_RefCount: 336
-    m_Data: {fileID: 11400000, guid: e8735c8a6cc6f854e98308bb13c5987b, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 7
-    m_Data: {fileID: 11400000, guid: 98a84be6a62703541955f8bb88becafb, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 7
-    m_Data: {fileID: 11400000, guid: 619d9a2dafff8414ea0019915c2239a1, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 6
-    m_Data: {fileID: 11400000, guid: f863ad0a414d5a14890e087631954ae1, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 6
-    m_Data: {fileID: 11400000, guid: 91845e146f15c654599ef74ed3b0d0dc, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 6
-    m_Data: {fileID: 11400000, guid: 493ae4ab3cd430a42a57e7bc2bd9f46a, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 2
-    m_Data: {fileID: 11400000, guid: c466357fb5ac40c4eb1d4cb640e93a20, type: 2}
+    m_Data: {fileID: 0}
   - m_RefCount: 2
-    m_Data: {fileID: 11400000, guid: 3071c8654dc7d7047bc4cdbcb27c8ce1, type: 2}
+    m_Data: {fileID: 0}
   m_TileSpriteArray:
-  - m_RefCount: 26
+  - m_RefCount: 23
     m_Data: {fileID: 2324215744211581200, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
-  - m_RefCount: 45
+  - m_RefCount: 40
     m_Data: {fileID: 7446995583972777725, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 335
@@ -23242,7 +23152,7 @@ Tilemap:
   - m_RefCount: 19
     m_Data: {fileID: 5592445351527317663, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
-  - m_RefCount: 30
+  - m_RefCount: 29
     m_Data: {fileID: -9125785566076192946, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 336
@@ -23269,7 +23179,7 @@ Tilemap:
     m_Data: {fileID: 3459726037848721842, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 827
+  - m_RefCount: 818
     m_Data:
       e00: 1
       e01: 0
@@ -23288,7 +23198,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 827
+  - m_RefCount: 818
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   - m_RefCount: 0
     m_Data: {r: 0, g: 0, b: 0, a: 0}
@@ -24090,7 +24000,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1332937275}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 651, y: 0.9, z: 0}
+  m_LocalPosition: {x: 651, y: -1.8, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -24213,7 +24123,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1349961926}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 448, y: 8.6, z: 0}
+  m_LocalPosition: {x: 446.9, y: 10.4, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -24577,7 +24487,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1413653024}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 637.4, y: 9.7, z: 0}
+  m_LocalPosition: {x: 637.4, y: 7, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -24984,7 +24894,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1445916132}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 642.5, y: -1.7, z: 0}
+  m_LocalPosition: {x: 642.5, y: -4.3999996, z: 0}
   m_LocalScale: {x: 3, y: 3, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -26784,7 +26694,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1680494560}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 645.2, y: 7.2, z: 0}
+  m_LocalPosition: {x: 645.2, y: 4.5, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -28541,7 +28451,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1908351763}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 468.3, y: 20.6, z: 0}
+  m_LocalPosition: {x: 466.8, y: 24.3, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}
@@ -29156,7 +29066,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1962902659}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 625.8, y: -1.6, z: 0}
+  m_LocalPosition: {x: 625.8, y: -4.2999997, z: 0}
   m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047}
   m_Children: []
   m_Father: {fileID: 0}

diff --git a/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas b/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas
index fe5ef5167906bbdbe6827124dcc5e383f0c3c020..1d926943910309b8a6a46cbc9b093892e28988d2 100644 (file)
--- a/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas
+++ b/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas
@@ -23,28 +23,15 @@ SpriteAtlas:
     platformSettings: []
     packingSettings:
       serializedVersion: 2
-      padding: 8
+      padding: 4
       blockOffset: 1
       allowAlphaSplitting: 0
-      enableRotation: 1
-      enableTightPacking: 1
+      enableRotation: 0
+      enableTightPacking: 0
     secondaryTextureSettings: {}
     variantMultiplier: 1
     packables:
-    - {fileID: 7517060220582638147, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 6520149871207387089, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 7446995583972777725, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: -9125785566076192946, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 5592445351527317663, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 2324215744211581200, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 8668672684398193189, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: -7721041404911635078, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: -3885470835124992291, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: -785273230814951674, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 4249109397384054997, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 3459726037848721842, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: 542524278368801128, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-    - {fileID: -2822047369393313844, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+    - {fileID: 2800000, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
     totalSpriteSurfaceArea: 916992
     bindAsDefault: 1
     isAtlasV2: 0

diff --git a/2DGame/Assets/Tilemaps/ground_tiles.prefab b/2DGame/Assets/Tilemaps/ground_tiles.prefab
index 2f81ac8efc82fe16eb0b9cd719a2ec77a2491a82..0ed223cc9c89ac959f86863911d1e46c0682ae23 100644 (file)
--- a/2DGame/Assets/Tilemaps/ground_tiles.prefab
+++ b/2DGame/Assets/Tilemaps/ground_tiles.prefab
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1656038671667489010
+--- !u!1 &708503188379662960
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5784715936253913679}
-  - component: {fileID: 554361885920218702}
+  - component: {fileID: 4045817932543247449}
+  - component: {fileID: 8506868051233884576}
   m_Layer: 31
   m_Name: ground_tiles
   m_TagString: Untagged
@@ -17,34 +17,34 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5784715936253913679
+--- !u!4 &4045817932543247449
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1656038671667489010}
+  m_GameObject: {fileID: 708503188379662960}
   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_Children:
-  - {fileID: 4573635092196737405}
+  - {fileID: 3827794783627310937}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!156049354 &554361885920218702
+--- !u!156049354 &8506868051233884576
 Grid:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1656038671667489010}
+  m_GameObject: {fileID: 708503188379662960}
   m_Enabled: 1
   m_CellSize: {x: 7.0012503, y: 7.0000005, z: 0}
   m_CellGap: {x: 0, y: 0, z: 0}
   m_CellLayout: 0
   m_CellSwizzle: 0
---- !u!1 &6657758793581749064
+--- !u!1 &5608407798895313730
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -52,9 +52,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4573635092196737405}
-  - component: {fileID: 3339025105520953605}
-  - component: {fileID: 519666516202667587}
+  - component: {fileID: 3827794783627310937}
+  - component: {fileID: 6488514895975479419}
+  - component: {fileID: 6582039655094990396}
   m_Layer: 0
   m_Name: Layer1
   m_TagString: Untagged
@@ -62,266 +62,243 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4573635092196737405
+--- !u!4 &3827794783627310937
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6657758793581749064}
+  m_GameObject: {fileID: 5608407798895313730}
   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_Children: []
-  m_Father: {fileID: 5784715936253913679}
+  m_Father: {fileID: 4045817932543247449}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1839735485 &3339025105520953605
+--- !u!1839735485 &6488514895975479419
 Tilemap:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6657758793581749064}
+  m_GameObject: {fileID: 5608407798895313730}
   m_Enabled: 1
   m_Tiles:
-  - first: {x: -1, y: -1, z: 0}
+  - first: {x: -1, y: -3, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 2
-      m_TileSpriteIndex: 3
+      m_TileIndex: 12
+      m_TileSpriteIndex: 12
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 0, y: -1, z: 0}
+  - first: {x: 0, y: -3, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 5
-      m_TileSpriteIndex: 10
+      m_TileIndex: 13
+      m_TileSpriteIndex: 13
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 8
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741827
-  - first: {x: 1, y: -1, z: 0}
+      m_AllTileFlags: 1073741825
+  - first: {x: -1, y: -2, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 1
-      m_TileSpriteIndex: 2
+      m_TileIndex: 8
+      m_TileSpriteIndex: 8
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 2, y: -1, z: 0}
+  - first: {x: 0, y: -2, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 0
-      m_TileSpriteIndex: 1
+      m_TileIndex: 9
+      m_TileSpriteIndex: 9
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 3, y: -1, z: 0}
+  - first: {x: 1, y: -2, z: 0}
     second:
       serializedVersion: 2
       m_TileIndex: 10
-      m_TileSpriteIndex: 14
+      m_TileSpriteIndex: 10
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 7
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741827
-  - first: {x: 5, y: -1, z: 0}
+      m_AllTileFlags: 1073741825
+  - first: {x: 2, y: -2, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 12
+      m_TileIndex: 11
       m_TileSpriteIndex: 11
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 6, y: -1, z: 0}
+  - first: {x: -1, y: -1, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 14
-      m_TileSpriteIndex: 13
+      m_TileIndex: 4
+      m_TileSpriteIndex: 4
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: -1, y: 0, z: 0}
+  - first: {x: 0, y: -1, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 9
-      m_TileSpriteIndex: 9
+      m_TileIndex: 5
+      m_TileSpriteIndex: 5
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 0, y: 0, z: 0}
+  - first: {x: 1, y: -1, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 8
-      m_TileSpriteIndex: 8
+      m_TileIndex: 6
+      m_TileSpriteIndex: 6
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 1, y: 0, z: 0}
+  - first: {x: 2, y: -1, z: 0}
     second:
       serializedVersion: 2
       m_TileIndex: 7
       m_TileSpriteIndex: 7
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 2, y: 0, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 6
-      m_TileSpriteIndex: 6
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741825
-  - first: {x: 3, y: 0, z: 0}
+  - first: {x: -1, y: 0, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 4
-      m_TileSpriteIndex: 5
+      m_TileIndex: 0
+      m_TileSpriteIndex: 0
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 4, y: 0, z: 0}
+  - first: {x: 0, y: 0, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 3
-      m_TileSpriteIndex: 4
+      m_TileIndex: 1
+      m_TileSpriteIndex: 1
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 5, y: 0, z: 0}
+  - first: {x: 1, y: 0, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 11
-      m_TileSpriteIndex: 0
+      m_TileIndex: 2
+      m_TileSpriteIndex: 2
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 6, y: 0, z: 0}
+  - first: {x: 2, y: 0, z: 0}
     second:
       serializedVersion: 2
-      m_TileIndex: 13
-      m_TileSpriteIndex: 12
+      m_TileIndex: 3
+      m_TileSpriteIndex: 3
       m_TileMatrixIndex: 0
-      m_TileColorIndex: 9
+      m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
-  - first: {x: 6, y: 2, z: 0}
-    second:
-      serializedVersion: 2
-      m_TileIndex: 10
-      m_TileSpriteIndex: 14
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 7
-      m_TileObjectToInstantiateIndex: 65535
-      dummyAlignment: 0
-      m_AllTileFlags: 1073741827
   m_AnimatedTiles: {}
   m_TileAssetArray:
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: aee16766e5388f9429c0f32b036048ab, type: 2}
-  - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: e8735c8a6cc6f854e98308bb13c5987b, type: 2}
+    m_Data: {fileID: 11400000, guid: 263e91beedfed3d419501bff0ca34385, type: 2}
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 91845e146f15c654599ef74ed3b0d0dc, type: 2}
+    m_Data: {fileID: 11400000, guid: 31bda1beb9a4d8a44bc4cded54986781, type: 2}
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 263e91beedfed3d419501bff0ca34385, type: 2}
+    m_Data: {fileID: 11400000, guid: aee16766e5388f9429c0f32b036048ab, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 1c3fcefe5a5b89843bac65414aa49cfd, type: 2}
-  - m_RefCount: 1
-    m_Data: {fileID: 0}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 1d43ba52534b66844a4d7bfd4e1f7e44, type: 2}
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 31bda1beb9a4d8a44bc4cded54986781, type: 2}
+    m_Data: {fileID: 11400000, guid: e8735c8a6cc6f854e98308bb13c5987b, type: 2}
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 493ae4ab3cd430a42a57e7bc2bd9f46a, type: 2}
+    m_Data: {fileID: 11400000, guid: 98a84be6a62703541955f8bb88becafb, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 619d9a2dafff8414ea0019915c2239a1, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: f863ad0a414d5a14890e087631954ae1, type: 2}
-  - m_RefCount: 2
-    m_Data: {fileID: 0}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 91845e146f15c654599ef74ed3b0d0dc, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 493ae4ab3cd430a42a57e7bc2bd9f46a, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: c466357fb5ac40c4eb1d4cb640e93a20, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 3071c8654dc7d7047bc4cdbcb27c8ce1, type: 2}
   - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 98a84be6a62703541955f8bb88becafb, type: 2}
-  - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 619d9a2dafff8414ea0019915c2239a1, type: 2}
+    m_Data: {fileID: 11400000, guid: 7cba2a7ac28ad4fd1817bc0cfec7e019, type: 2}
   m_TileSpriteArray:
   - m_RefCount: 1
-    m_Data: {fileID: 8668672684398193189, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: 2324215744211581200, guid: 63a813fae73585d4eaec2a12e0f800ed,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 7446995583972777725, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
     m_Data: {fileID: 4249109397384054997, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: -785273230814951674, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: 5592445351527317663, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: -7721041404911635078, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: -9125785566076192946, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: 2324215744211581200, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: -785273230814951674, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: 5592445351527317663, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: -2822047369393313844, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: -9125785566076192946, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: 542524278368801128, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 7517060220582638147, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: 7446995583972777725, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: -7721041404911635078, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
     m_Data: {fileID: 6520149871207387089, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: 7517060220582638147, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: 8668672684398193189, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
-  - m_RefCount: 1
-    m_Data: {fileID: 0}
   - m_RefCount: 1
     m_Data: {fileID: 3459726037848721842, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
   - m_RefCount: 1
-    m_Data: {fileID: -2822047369393313844, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    m_Data: {fileID: -3885470835124992291, guid: 63a813fae73585d4eaec2a12e0f800ed,
       type: 3}
-  - m_RefCount: 1
-    m_Data: {fileID: 542524278368801128, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - m_RefCount: 2
-    m_Data: {fileID: 0}
   m_TileMatrixArray:
-  - m_RefCount: 16
+  - m_RefCount: 14
     m_Data:
       e00: 1
       e01: 0
@@ -340,31 +317,13 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 0
-    m_Data: {r: 0, g: 0, b: 0, a: 0}
-  - m_RefCount: 2
-    m_Data: {r: 0.7537317, g: 0.448269, b: 0.5444924, a: 1}
-  - m_RefCount: 1
-    m_Data: {r: 0.9790396, g: 0.48681387, b: 0.5439161, a: 1}
-  - m_RefCount: 13
+  - m_RefCount: 14
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_TileObjectToInstantiateArray: []
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Origin: {x: -1, y: -1, z: 0}
-  m_Size: {x: 8, y: 4, z: 1}
+  m_Origin: {x: -1, y: -3, z: 0}
+  m_Size: {x: 4, y: 4, z: 1}
   m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
   m_TileOrientation: 0
   m_TileOrientationMatrix:
@@ -384,13 +343,13 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
---- !u!483693784 &519666516202667587
+--- !u!483693784 &6582039655094990396
 TilemapRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6657758793581749064}
+  m_GameObject: {fileID: 5608407798895313730}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -432,7 +391,7 @@ TilemapRenderer:
   m_Mode: 0
   m_DetectChunkCullingBounds: 0
   m_MaskInteraction: 0
---- !u!114 &726517834642573800
+--- !u!114 &672443888299875244
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

diff --git a/2DGame/Assets/Tilemaps/ground_tiles.prefab.meta b/2DGame/Assets/Tilemaps/ground_tiles.prefab.meta
index f44f48d160fd79ca135c80e8f794a8ca191cb684..7e5226885eb037f960c26ed84c11d8ad09a0d386 100644 (file)
--- a/2DGame/Assets/Tilemaps/ground_tiles.prefab.meta
+++ b/2DGame/Assets/Tilemaps/ground_tiles.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c48fb7a0c285afa498f910218cd106eb
+guid: dd4c001396d0b4a278f02a9caef395d2
 PrefabImporter:
   externalObjects: {}
   userData: 

diff --git a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_0.asset b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_0.asset
index 2cb617b2ab708f27aabc395e01429b41d715b1e8..f0d3e3fae0697087b444bfd3ffd564c1e6fff151 100644 (file)
--- a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_0.asset
+++ b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_0.asset
@@ -34,4 +34,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 0
+  m_ColliderType: 1

diff --git a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_1.asset b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_1.asset
index d495bb418245d6a83da9ee2cc498bc0f0d89dd73..b0beffb4ffcf3a8874d4e91e46db103340cefd33 100644 (file)
--- a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_1.asset
+++ b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_1.asset
@@ -34,4 +34,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 0
+  m_ColliderType: 1

diff --git a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_7.asset b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_7.asset
index 5aaed510eba3c2e32b5d790a1e518c20650bad49..f031ecd3ec5b8398cf8f85f8a7779959d9abde4f 100644 (file)
--- a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_7.asset
+++ b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_7.asset
@@ -34,4 +34,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 0
+  m_ColliderType: 1

diff --git a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_8.asset b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_8.asset
new file mode 100644 (file)
index 0000000..e628efa
--- /dev/null
+++ b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_8.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: green_idyll_tilemap_8
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -3885470835124992291, guid: 63a813fae73585d4eaec2a12e0f800ed,
+    type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    e00: 1
+    e01: 0
+    e02: 0
+    e03: 0
+    e10: 0
+    e11: 1
+    e12: 0
+    e13: 0
+    e20: 0
+    e21: 0
+    e22: 1
+    e23: 0
+    e30: 0
+    e31: 0
+    e32: 0
+    e33: 1
+  m_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

diff --git a/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_8.asset.meta b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_8.asset.meta
new file mode 100644 (file)
index 0000000..aaee80c
--- /dev/null
+++ b/2DGame/Assets/Tiles/Ground Tilles/green_idyll_tilemap_8.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7cba2a7ac28ad4fd1817bc0cfec7e019
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: