mirror of
https://github.com/DerTyp7/example-top-down-unity.git
synced 2025-10-29 12:32:09 +01:00
a
This commit is contained in:
j.mei7
@@ -12,7 +12,11 @@ TrueTypeFontImporter:
|
||||
- Pixeled
|
||||
fallbackFontReferences: []
|
||||
customCharacters:
|
||||
<<<<<<< Updated upstream
|
||||
fontRenderingMode: 3
|
||||
=======
|
||||
fontRenderingMode: 0
|
||||
>>>>>>> Stashed changes
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
|
||||
@@ -19,7 +19,11 @@ MonoBehaviour:
|
||||
width: 1920
|
||||
height: 1037
|
||||
m_ShowMode: 4
|
||||
<<<<<<< Updated upstream
|
||||
m_Title: Hierarchy
|
||||
=======
|
||||
m_Title: Project
|
||||
>>>>>>> Stashed changes
|
||||
m_RootView: {fileID: 2}
|
||||
m_MinSize: {x: 875, y: 350}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
@@ -119,7 +123,11 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
<<<<<<< Updated upstream
|
||||
controlID: 20426
|
||||
=======
|
||||
controlID: 14794
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -140,11 +148,19 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1477
|
||||
<<<<<<< Updated upstream
|
||||
height: 987
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 20427
|
||||
=======
|
||||
height: 939
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 14744
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -165,11 +181,19 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1477
|
||||
<<<<<<< Updated upstream
|
||||
height: 646
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 20428
|
||||
=======
|
||||
height: 615
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 14823
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -188,7 +212,11 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 305
|
||||
<<<<<<< Updated upstream
|
||||
height: 646
|
||||
=======
|
||||
height: 615
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 13}
|
||||
@@ -214,7 +242,11 @@ MonoBehaviour:
|
||||
x: 305
|
||||
y: 0
|
||||
width: 1172
|
||||
<<<<<<< Updated upstream
|
||||
height: 646
|
||||
=======
|
||||
height: 615
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 102, y: 121}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 12}
|
||||
@@ -239,9 +271,15 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< Updated upstream
|
||||
y: 646
|
||||
width: 1477
|
||||
height: 341
|
||||
=======
|
||||
y: 615
|
||||
width: 1477
|
||||
height: 324
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 15}
|
||||
@@ -268,9 +306,15 @@ MonoBehaviour:
|
||||
x: 1477
|
||||
y: 0
|
||||
width: 443
|
||||
<<<<<<< Updated upstream
|
||||
height: 987
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
=======
|
||||
height: 939
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
>>>>>>> Stashed changes
|
||||
m_ActualView: {fileID: 17}
|
||||
m_Panes:
|
||||
- {fileID: 17}
|
||||
@@ -296,7 +340,11 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: -1615
|
||||
=======
|
||||
x: 305
|
||||
>>>>>>> Stashed changes
|
||||
y: 73
|
||||
width: 1170
|
||||
height: 625
|
||||
@@ -310,7 +358,11 @@ MonoBehaviour:
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
<<<<<<< Updated upstream
|
||||
m_TargetSize: {x: 1074, y: 604}
|
||||
=======
|
||||
m_TargetSize: {x: 1019, y: 573}
|
||||
>>>>>>> Stashed changes
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@@ -325,10 +377,17 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_HBaseRangeMin: -537
|
||||
m_HBaseRangeMax: 537
|
||||
m_VBaseRangeMin: -302
|
||||
m_VBaseRangeMax: 302
|
||||
=======
|
||||
m_HBaseRangeMin: -509.5
|
||||
m_HBaseRangeMax: 509.5
|
||||
m_VBaseRangeMin: -286.5
|
||||
m_VBaseRangeMax: 286.5
|
||||
>>>>>>> Stashed changes
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
@@ -391,7 +450,11 @@ MonoBehaviour:
|
||||
x: -1920
|
||||
y: 73
|
||||
width: 304
|
||||
<<<<<<< Updated upstream
|
||||
height: 625
|
||||
=======
|
||||
height: 594
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -399,23 +462,29 @@ MonoBehaviour:
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
<<<<<<< Updated upstream
|
||||
m_SelectedIDs: b6f6ffff
|
||||
m_LastClickedID: -2378
|
||||
m_ExpandedIDs: 0273ffff7673ffffea73ffff6a74ffffea79ffff02a4ffff20fbfffffa6a0000
|
||||
=======
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: e27effff8e80ffff0a81ffffa283ffff2efbffff806b0000946b0000406c000042a4000054a4000026a500006cbb0000
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_Name: Calendar
|
||||
m_OriginalName: Calendar
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_UserData: 48208
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_OriginalEventType: 0
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 8}
|
||||
m_SearchString:
|
||||
@@ -445,7 +514,11 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: -1615
|
||||
=======
|
||||
x: 305
|
||||
>>>>>>> Stashed changes
|
||||
y: 73
|
||||
width: 1170
|
||||
height: 625
|
||||
@@ -672,9 +745,15 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
<<<<<<< Updated upstream
|
||||
m_Target: {x: 489.49075, y: 238.88454, z: 9.491288}
|
||||
speed: 2
|
||||
m_Value: {x: 489.49075, y: 238.88454, z: 9.491288}
|
||||
=======
|
||||
m_Target: {x: 928.354, y: 501.03793, z: 5.644824}
|
||||
speed: 2
|
||||
m_Value: {x: 928.354, y: 501.03793, z: 5.644824}
|
||||
>>>>>>> Stashed changes
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -725,9 +804,15 @@ MonoBehaviour:
|
||||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
<<<<<<< Updated upstream
|
||||
m_Target: 313.78177
|
||||
speed: 2
|
||||
m_Value: 313.78177
|
||||
=======
|
||||
m_Target: 161.02727
|
||||
speed: 2
|
||||
m_Value: 161.02727
|
||||
>>>>>>> Stashed changes
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -772,10 +857,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: -1920
|
||||
y: 719
|
||||
width: 1476
|
||||
height: 320
|
||||
=======
|
||||
x: 0
|
||||
y: 688
|
||||
width: 1476
|
||||
height: 303
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -793,22 +885,36 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
<<<<<<< Updated upstream
|
||||
- Assets/Scripts/CharSprites
|
||||
=======
|
||||
- Assets/Scripts
|
||||
>>>>>>> Stashed changes
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 74
|
||||
m_LastFolders:
|
||||
<<<<<<< Updated upstream
|
||||
- Assets/Scripts/CharSprites
|
||||
=======
|
||||
- Assets/Scripts
|
||||
>>>>>>> Stashed changes
|
||||
m_LastFoldersGridSize: 74
|
||||
m_LastProjectPath: M:\UnityProjects\2d-top-down
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 79}
|
||||
<<<<<<< Updated upstream
|
||||
m_SelectedIDs: 8ae00000
|
||||
m_LastClickedID: 57482
|
||||
m_ExpandedIDs: 00000000826f0000846f0000946f0000966f0000d26f000000ca9a3bffffff7f
|
||||
=======
|
||||
m_SelectedIDs: 1e710000
|
||||
m_LastClickedID: 28958
|
||||
m_ExpandedIDs: 00000000fc700000fe70000000710000027100001e7100002e710000ca73000000ca9a3bffffff7f
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -836,7 +942,11 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_ExpandedIDs: 00000000826f0000846f000000ca9a3bffffff7f
|
||||
=======
|
||||
m_ExpandedIDs: 00000000fc700000fe700000007100000271000000ca9a3bffffff7f
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -864,7 +974,11 @@ MonoBehaviour:
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
<<<<<<< Updated upstream
|
||||
m_ExpandedInstanceIDs: c62300006a8e0000f25e00008861000000000000586d00007ea70000
|
||||
=======
|
||||
m_ExpandedInstanceIDs: c62300006a8e0000f25e00008861000000000000586d00007ea700006cedffff
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -940,10 +1054,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: -443
|
||||
y: 73
|
||||
width: 442
|
||||
height: 966
|
||||
=======
|
||||
x: 1477
|
||||
y: 73
|
||||
width: 442
|
||||
height: 918
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -951,7 +1072,7 @@ MonoBehaviour:
|
||||
m_ObjectsLockedBeforeSerialization: []
|
||||
m_InstanceIDsLockedBeforeSerialization:
|
||||
m_PreviewResizer:
|
||||
m_CachedPref: 160
|
||||
m_CachedPref: -160
|
||||
m_ControlHash: -371814159
|
||||
m_PrefName: Preview_InspectorPreview
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
|
||||
Reference in New Issue
Block a user