Improved sprites and tilemap

2022-02-26 11:33:42 +01:00
parent e707cf3f4d
commit 574b00ca60
31 changed files with 815 additions and 2302 deletions
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,10 +12,10 @@ EditorUserSettings:
      value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561
      flags: 0
    RecentlyUsedSceneGuid-2:
-      value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
+      value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
      flags: 0
    RecentlyUsedSceneGuid-3:
-      value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
+      value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_Children:
  - {fileID: 3}
  - {fileID: 8}
-  - {fileID: 13}
+  - {fileID: 14}
  m_Position:
    serializedVersion: 2
    x: 0
@@ -25,7 +25,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 2344
+  controlID: 4503
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -98,18 +98,18 @@ MonoBehaviour:
      y: 21
      width: 871.60004
      height: 472.40002
-    m_Scale: {x: 0.5467593, y: 0.5467593}
-    m_Translation: {x: 435.80002, y: 236.19998}
+    m_Scale: {x: 0.5580282, y: 0.5580282}
+    m_Translation: {x: 435.80002, y: 235.75479}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -797.06006
-      y: -431.99994
-      width: 1594.1201
-      height: 863.99994
+      x: -780.9641
+      y: -422.47827
+      width: 1561.9282
+      height: 846.5522
    m_MinimalGUI: 1
  m_defaultScale: 0.5467593
  m_LastWindowPixelSize: {x: 1089.5, y: 616.75}
@@ -142,7 +142,7 @@ MonoBehaviour:
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 2310
+  controlID: 4431
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -202,7 +202,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: d8c6ffffc0a00000
+      m_ExpandedIDs: 92a8ffff6eaaffffcab7fffff2b7ffff98f3ffff9af3ffff0cfbffff66a60000
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -293,7 +293,7 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Resources/Playable
+    - Assets/Scenes
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 0
@@ -307,7 +307,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: dc3c0000
    m_LastClickedID: 15580
-    m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e64000030640000326400003464000036640000386400003c640000
+    m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003264000034640000366400003c640000626500008c650000227a0000a8a40000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -332,24 +332,24 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 146.99982}
-    m_SelectedIDs: c0a00000
-    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003264000034640000366400003c64000062650000227a0000
+    scrollPos: {x: 0, y: 132.9956}
+    m_SelectedIDs: 6a650000
+    m_LastClickedID: 25962
+    m_ExpandedIDs: ffffffff00000000bc63000020640000226400002464000026640000286400002a6400002c6400002e640000306400003264000034640000366400003c640000626500008c650000227a0000a8a40000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: SyntriaxDevScene
+      m_OriginalName: SyntriaxDevScene
      m_EditFieldRect:
        serializedVersion: 2
        x: 0
        y: 0
        width: 0
        height: 0
-      m_UserData: 0
+      m_UserData: 25962
      m_IsWaitingForDelay: 0
      m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
      m_IsRenamingFilename: 1
      m_ClientGUIView: {fileID: 6}
    m_SearchString: 
@@ -360,8 +360,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: c0a00000
-    m_LastClickedInstanceID: 41152
+    m_SelectedInstanceIDs: 6a650000
+    m_LastClickedInstanceID: 25962
    m_HadKeyboardFocusLastEvent: 0
    m_ExpandedInstanceIDs: c6230000d03c0000
    m_RenameOverlay:
@@ -405,7 +405,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Children:
  - {fileID: 9}
-  - {fileID: 11}
+  - {fileID: 12}
  m_Position:
    serializedVersion: 2
    x: 303.2
@@ -415,7 +415,7 @@ MonoBehaviour:
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 2345
+  controlID: 4504
 --- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -435,12 +435,13 @@ MonoBehaviour:
    y: 0
    width: 873.60004
    height: 514.4
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 2}
  m_Panes:
  - {fileID: 10}
  - {fileID: 2}
+  - {fileID: 11}
  m_Selected: 1
  m_LastSelected: 0
 --- !u!114 &10
@@ -574,7 +575,7 @@ MonoBehaviour:
      containerId: overlay-container--right
      floating: 0
      collapsed: 0
-      displayed: 1
+      displayed: 0
      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
@@ -682,17 +683,17 @@ MonoBehaviour:
      layout: 4
  m_WindowGUID: d69a67902db7f994ca099bec79d22ce1
  m_Gizmos: 1
-  m_OverrideSceneCullingMask: 0
-  m_SceneIsLit: 0
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
  m_SceneLighting: 1
  m_2DMode: 1
  m_isRotationLocked: 0
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: -4.55, y: 0.40999997, z: 0}
+    m_Target: {x: 82.42984, y: 9.690039, z: 0.49226072}
    speed: 2
-    m_Value: {x: -4.55, y: 0.40999997, z: 0}
+    m_Value: {x: 82.42984, y: 9.690039, z: 0.49226072}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -704,7 +705,7 @@ MonoBehaviour:
  m_SceneViewState:
    m_AlwaysRefresh: 0
    showFog: 1
-    showSkybox: 0
+    showSkybox: 1
    showFlares: 1
    showImageEffects: 1
    showParticleSystems: 1
@@ -729,9 +730,9 @@ MonoBehaviour:
      m_Size: {x: 1, y: 1}
    zGrid:
      m_Fade:
-        m_Target: 1
+        m_Target: 0
        speed: 2
-        m_Value: 1
+        m_Value: 0
      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
      m_Pivot: {x: 0, y: 0, z: 0}
      m_Size: {x: 2, y: 2}
@@ -743,9 +744,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 0.90691787
+    m_Target: 96.87461
    speed: 2
-    m_Value: 0.90691787
+    m_Value: 96.87461
  m_Ortho:
    m_Target: 1
    speed: 2
@@ -771,6 +772,41 @@ MonoBehaviour:
  m_LastLockedObject: {fileID: 0}
  m_ViewIsLockedToObject: 0
 --- !u!114 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 240, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Tile Palette
+    m_Image: {fileID: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 303.2
+    y: 73.6
+    width: 871.60004
+    height: 493.40002
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+  m_PreviewResizer:
+    m_CachedPref: -50
+    m_ControlHash: 1964396721
+    m_PrefName: Preview_TilemapBrushInspector
+  m_Palette: {fileID: 5923046506128307364, guid: f8f8c3704b3a1c6428fcd22de4a1d9e5, type: 3}
+  m_DrawGridGizmo: 1
+  m_DrawGizmos: 0
+--- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -789,14 +825,14 @@ MonoBehaviour:
    y: 514.4
    width: 873.60004
    height: 216.39996
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 12}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 13}
  m_Panes:
-  - {fileID: 12}
+  - {fileID: 13}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -824,7 +860,7 @@ MonoBehaviour:
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
    m_SaveData: []
--- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -843,14 +879,14 @@ MonoBehaviour:
    y: 0
    width: 359.19995
    height: 730.8
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
  m_Panes:
-  - {fileID: 14}
+  - {fileID: 15}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -884,8 +920,8 @@ MonoBehaviour:
    m_CachedPref: 160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: 41152
-  m_LastVerticalScrollValue: 49.050007
+  m_LastInspectedObjectInstanceID: 25962
+  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0
  m_LockTracker: