Kleine Aenderungen

diff --git a/2DGame/Assets/Sprites/New Sprite Atlas.spriteatlas b/2DGame/Assets/Sprites/New Sprite Atlas.spriteatlas
deleted file mode 100644 (file)
index 5c26935..0000000
--- a/2DGame/Assets/Sprites/New Sprite Atlas.spriteatlas
+++ /dev/null
@@ -1,85 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: New Sprite Atlas
-  m_EditorData:
-    serializedVersion: 2
-    textureSettings:
-      serializedVersion: 2
-      anisoLevel: 1
-      compressionQuality: 50
-      maxTextureSize: 2048
-      textureCompression: 0
-      filterMode: 0
-      generateMipMaps: 0
-      readable: 0
-      crunchedCompression: 0
-      sRGB: 1
-    platformSettings: []
-    packingSettings:
-      serializedVersion: 2
-      padding: 8
-      blockOffset: 1
-      allowAlphaSplitting: 0
-      enableRotation: 1
-      enableTightPacking: 1
-    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}
-    totalSpriteSurfaceArea: 916992
-    bindAsDefault: 1
-    isAtlasV2: 0
-    cachedData: {fileID: 0}
-  m_MasterAtlas: {fileID: 0}
-  m_PackedSprites:
-  - {fileID: 3459726037848721842, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 4249109397384054997, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 542524278368801128, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: -2822047369393313844, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: -785273230814951674, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: -3885470835124992291, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: -7721041404911635078, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 8668672684398193189, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 2324215744211581200, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 5592445351527317663, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: -9125785566076192946, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 7446995583972777725, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 6520149871207387089, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  - {fileID: 7517060220582638147, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
-  m_PackedSpriteNamesToIndex:
-  - green_idyll_tilemap_13
-  - green_idyll_tilemap_10
-  - green_idyll_tilemap_14
-  - green_idyll_tilemap_15
-  - green_idyll_tilemap_9
-  - green_idyll_tilemap_8
-  - green_idyll_tilemap_7
-  - green_idyll_tilemap_6
-  - green_idyll_tilemap_5
-  - green_idyll_tilemap_4
-  - green_idyll_tilemap_3
-  - green_idyll_tilemap_2
-  - green_idyll_tilemap_1
-  - green_idyll_tilemap_0
-  m_RenderDataMap: {}
-  m_Tag: New Sprite Atlas
-  m_IsVariant: 0

diff --git a/2DGame/Assets/Sprites/New Sprite Atlas.spriteatlas.meta b/2DGame/Assets/Sprites/New Sprite Atlas.spriteatlas.meta
deleted file mode 100644 (file)
index 82695ee..0000000
--- a/2DGame/Assets/Sprites/New Sprite Atlas.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f8c3358649016f04a857af6d2535a42b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 4343727234628468602
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

diff --git a/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas b/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas
new file mode 100644 (file)
index 0000000..fe5ef51
--- /dev/null
+++ b/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas
@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ground_tile_atlas
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 1
+      compressionQuality: 50
+      maxTextureSize: 2048
+      textureCompression: 0
+      filterMode: 0
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings: []
+    packingSettings:
+      serializedVersion: 2
+      padding: 8
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 1
+      enableTightPacking: 1
+    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}
+    totalSpriteSurfaceArea: 916992
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 3459726037848721842, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 4249109397384054997, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 542524278368801128, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: -2822047369393313844, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: -785273230814951674, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: -3885470835124992291, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: -7721041404911635078, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 8668672684398193189, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 2324215744211581200, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 5592445351527317663, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: -9125785566076192946, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 7446995583972777725, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 6520149871207387089, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  - {fileID: 7517060220582638147, guid: 63a813fae73585d4eaec2a12e0f800ed, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - green_idyll_tilemap_13
+  - green_idyll_tilemap_10
+  - green_idyll_tilemap_14
+  - green_idyll_tilemap_15
+  - green_idyll_tilemap_9
+  - green_idyll_tilemap_8
+  - green_idyll_tilemap_7
+  - green_idyll_tilemap_6
+  - green_idyll_tilemap_5
+  - green_idyll_tilemap_4
+  - green_idyll_tilemap_3
+  - green_idyll_tilemap_2
+  - green_idyll_tilemap_1
+  - green_idyll_tilemap_0
+  m_RenderDataMap: {}
+  m_Tag: ground_tile_atlas
+  m_IsVariant: 0

diff --git a/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas.meta b/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas.meta
new file mode 100644 (file)
index 0000000..82695ee
--- /dev/null
+++ b/2DGame/Assets/Sprites/ground_tile_atlas.spriteatlas.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f8c3358649016f04a857af6d2535a42b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

diff --git a/2DGame/ProjectSettings/EditorSettings.asset b/2DGame/ProjectSettings/EditorSettings.asset
index 5a7387fa2a8d843ee8939c7d112237a7ebc4cc20..376822d5d06f2ac1642e1d55c923a022fdfd5ec3 100644 (file)
--- a/2DGame/ProjectSettings/EditorSettings.asset
+++ b/2DGame/ProjectSettings/EditorSettings.asset
@@ -3,8 +3,7 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_ExternalVersionControlSupport: Visible Meta Files
+  serializedVersion: 11
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 0
   m_DefaultBehaviorMode: 1
@@ -18,18 +17,24 @@ EditorSettings:
   m_EtcTextureBestCompressor: 4
   m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
   m_ProjectGenerationRootNamespace: 
-  m_CollabEditorSettings:
-    inProgressEnabled: 1
   m_EnableTextureStreamingInEditMode: 1
   m_EnableTextureStreamingInPlayMode: 1
   m_AsyncShaderCompilation: 1
+  m_CachingShaderPreprocessor: 1
+  m_PrefabModeAllowAutoSave: 1
   m_EnterPlayModeOptionsEnabled: 0
   m_EnterPlayModeOptions: 3
-  m_ShowLightmapResolutionOverlay: 1
+  m_GameObjectNamingDigits: 1
+  m_GameObjectNamingScheme: 0
+  m_AssetNamingUsesSpace: 1
   m_UseLegacyProbeSampleCount: 1
+  m_SerializeInlineMappingsOnOneLine: 0
+  m_DisableCookiesInLightmapper: 1
   m_AssetPipelineMode: 1
   m_CacheServerMode: 0
   m_CacheServerEndpoint: 
   m_CacheServerNamespacePrefix: default
   m_CacheServerEnableDownload: 1
   m_CacheServerEnableUpload: 1
+  m_CacheServerEnableAuth: 0
+  m_CacheServerEnableTls: 0

diff --git a/2DGame/UserSettings/EditorUserSettings.asset b/2DGame/UserSettings/EditorUserSettings.asset
index 796101adebd115d4173384e491327cf78c9512bb..34c4b7e53d59bed1905ba51255b666f28b509fb0 100644 (file)
--- a/2DGame/UserSettings/EditorUserSettings.asset
+++ b/2DGame/UserSettings/EditorUserSettings.asset
@@ -8,6 +8,9 @@ EditorUserSettings:
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c780213121615052c3f3c21661a21e7e53a07ebe32fe5eb056e722c0ce6281d
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0