Merge remote-tracking branch 'origin/Over' into Syntriax
This commit is contained in:
commit
ab6dd176e3
|
|
@ -2653,7 +2653,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 13
|
||||
value: 23
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
|
|
@ -2761,6 +2761,14 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 698768805, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2083070161, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7008207192594766305, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Player
|
||||
|
|
|
|||
|
|
@ -183,13 +183,13 @@ CompositeCollider2D:
|
|||
Y: 9999959
|
||||
- X: 10000100
|
||||
Y: 19999900
|
||||
- X: 50000041
|
||||
- X: 9999959
|
||||
Y: 19999900
|
||||
- X: 50000100
|
||||
- X: 9999900
|
||||
Y: 19999959
|
||||
- X: 50000100
|
||||
- X: 9999900
|
||||
Y: 30000041
|
||||
- X: 50000041
|
||||
- X: 9999959
|
||||
Y: 30000100
|
||||
- X: 10000100
|
||||
Y: 30000100
|
||||
|
|
@ -241,10 +241,16 @@ CompositeCollider2D:
|
|||
Y: 30000041
|
||||
- X: 210000041
|
||||
Y: 30000100
|
||||
- X: 89999959
|
||||
- X: 49999959
|
||||
Y: 30000100
|
||||
- X: 89999900
|
||||
- X: 49999900
|
||||
Y: 30000041
|
||||
- X: 49999900
|
||||
Y: 19999959
|
||||
- X: 49999959
|
||||
Y: 19999900
|
||||
- X: 89999900
|
||||
Y: 19999900
|
||||
- X: 89999900
|
||||
Y: -9999900
|
||||
- X: -70000041
|
||||
|
|
@ -260,10 +266,6 @@ CompositeCollider2D:
|
|||
m_CompositePaths:
|
||||
m_Paths:
|
||||
- - {x: 0.9999748, y: 0.99999}
|
||||
- {x: 1.0000395, y: 1.99999}
|
||||
- {x: 5.00001, y: 2.0000253}
|
||||
- {x: 4.9999747, y: 3.00001}
|
||||
- {x: 1.00001, y: 3.0000393}
|
||||
- {x: 0.9999748, y: 8.00001}
|
||||
- {x: -7.0000095, y: 7.9999747}
|
||||
- {x: -6.9999743, y: 0.99999}
|
||||
|
|
@ -277,7 +279,9 @@ CompositeCollider2D:
|
|||
- {x: 17.00004, y: 1.99999}
|
||||
- {x: 21.00001, y: 2.0000253}
|
||||
- {x: 20.999975, y: 3.00001}
|
||||
- {x: 8.99999, y: 2.9999747}
|
||||
- {x: 4.99999, y: 2.9999747}
|
||||
- {x: 5.0000253, y: 1.99999}
|
||||
- {x: 8.99999, y: 1.9999607}
|
||||
- {x: 8.999961, y: -0.99999}
|
||||
- {x: -7.0000095, y: -1.0000252}
|
||||
- {x: -6.9999743, y: -6.00001}
|
||||
|
|
@ -2858,7 +2862,7 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 1, y: 2, z: 0}
|
||||
- first: {x: 5, y: 2, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 7
|
||||
|
|
@ -2868,7 +2872,7 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 2, y: 2, z: 0}
|
||||
- first: {x: 6, y: 2, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 6
|
||||
|
|
@ -2878,7 +2882,7 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 3, y: 2, z: 0}
|
||||
- first: {x: 7, y: 2, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 5
|
||||
|
|
@ -2888,7 +2892,7 @@ Tilemap:
|
|||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 4, y: 2, z: 0}
|
||||
- first: {x: 8, y: 2, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 4
|
||||
|
|
@ -3996,7 +4000,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5846939066456683150, guid: 31e12405ec9ab4145bfae33b308ffae1, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
|
|
|
|||
|
|
@ -5,25 +5,49 @@ namespace Platforms
|
|||
{
|
||||
public class MovingPlatform : MonoBehaviour, IMovement
|
||||
{
|
||||
public float xOffeset;
|
||||
public float yOffset;
|
||||
|
||||
private Rigidbody2D _platformRigidbody;
|
||||
|
||||
private Vector3 _velocity = Vector3.zero;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_platformRigidbody = GetComponent<Rigidbody2D>();
|
||||
}
|
||||
|
||||
private void FixedUpdate()
|
||||
{
|
||||
if (!IsPaused)
|
||||
Move(BaseSpeed);
|
||||
}
|
||||
|
||||
// PAUSING METHODS
|
||||
|
||||
public bool IsPaused { get; }
|
||||
public bool IsPaused { get; private set; }
|
||||
public void Pause()
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
IsPaused = true;
|
||||
_platformRigidbody.simulated = !IsPaused;
|
||||
}
|
||||
|
||||
public void Resume()
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
IsPaused = false;
|
||||
_platformRigidbody.simulated = !IsPaused;
|
||||
}
|
||||
|
||||
// MOVEMENT METHODS
|
||||
|
||||
public float BaseSpeed { get; set; }
|
||||
|
||||
public void Move(float value)
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
var position = transform.position;
|
||||
var targetPosition = new Vector3(position.x + xOffeset, position.y + yOffset, 0.0f);
|
||||
position = Vector3.SmoothDamp(position, targetPosition, ref _velocity, 1.0f, 1.0f);
|
||||
transform.position = position;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6,13 +6,16 @@ EditorUserSettings:
|
|||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedSceneGuid-0:
|
||||
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
|
||||
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-1:
|
||||
value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561
|
||||
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-2:
|
||||
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
|
||||
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-3:
|
||||
value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-3:
|
||||
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 3}
|
||||
- {fileID: 8}
|
||||
- {fileID: 14}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
|
|
@ -25,7 +24,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 11403
|
||||
controlID: 3214
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -46,10 +45,10 @@ MonoBehaviour:
|
|||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1
|
||||
y: 19
|
||||
width: 730.6667
|
||||
height: 387
|
||||
x: 271.33334
|
||||
y: 378
|
||||
width: 666
|
||||
height: 252.99997
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
|
|
@ -66,7 +65,7 @@ MonoBehaviour:
|
|||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 1
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 1
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
|
|
@ -87,7 +86,7 @@ MonoBehaviour:
|
|||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
|
|
@ -96,26 +95,26 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 730.6667
|
||||
height: 366
|
||||
m_Scale: {x: 0.5083333, y: 0.5083333}
|
||||
m_Translation: {x: 365.33334, y: 183}
|
||||
width: 666
|
||||
height: 231.99997
|
||||
m_Scale: {x: 0.32222217, y: 0.32222217}
|
||||
m_Translation: {x: 333, y: 115.999985}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -718.68854
|
||||
x: -1033.4485
|
||||
y: -360
|
||||
width: 1437.3771
|
||||
width: 2066.897
|
||||
height: 720
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.5083333
|
||||
m_LastWindowPixelSize: {x: 1096, y: 580.5}
|
||||
m_defaultScale: 0.32222217
|
||||
m_LastWindowPixelSize: {x: 999, y: 379.49994}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 00000000000100000100
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &3
|
||||
|
|
@ -126,24 +125,49 @@ MonoBehaviour:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 4}
|
||||
- {fileID: 6}
|
||||
- {fileID: 9}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 253.33333
|
||||
width: 939.3333
|
||||
height: 579.3333
|
||||
m_MinSize: {x: 100, y: 200}
|
||||
m_MaxSize: {x: 8096, y: 16192}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 11377
|
||||
controlID: 3191
|
||||
--- !u!114 &4
|
||||
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: 1
|
||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 5}
|
||||
- {fileID: 7}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 939.3333
|
||||
height: 305.33334
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 3145
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -160,16 +184,16 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 253.33333
|
||||
height: 302.66666
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 5}
|
||||
width: 272
|
||||
height: 305.33334
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 6}
|
||||
m_Panes:
|
||||
- {fileID: 5}
|
||||
- {fileID: 6}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &5
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -191,8 +215,8 @@ MonoBehaviour:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 72.66667
|
||||
width: 252.33333
|
||||
height: 281.66666
|
||||
width: 271
|
||||
height: 284.33334
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
|
|
@ -202,7 +226,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: c07affff707bffffac7bffff567dffffea7dffff58aeffff00bcffff6cbfffff
|
||||
m_ExpandedIDs: 9ac8ffffa2c9ffff08fbffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
|
@ -218,205 +242,15 @@ MonoBehaviour:
|
|||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 4}
|
||||
m_ClientGUIView: {fileID: 5}
|
||||
m_SearchString:
|
||||
m_ExpandedScenes: []
|
||||
m_CurrenRootInstanceID: 0
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
m_WindowGUID: 46b7a0fefa812c44ca6fda42b4d7b176
|
||||
--- !u!114 &6
|
||||
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: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ProjectBrowser
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 302.66666
|
||||
width: 253.33333
|
||||
height: 276.66666
|
||||
m_MinSize: {x: 230, y: 250}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_ActualView: {fileID: 7}
|
||||
m_Panes:
|
||||
- {fileID: 7}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
m_WindowGUID: 7c45d63fa7bf1f3498fa34a8800cf867
|
||||
--- !u!114 &7
|
||||
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: 1
|
||||
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 230, y: 250}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_TitleContent:
|
||||
m_Text: Project
|
||||
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 375.33334
|
||||
width: 252.33333
|
||||
height: 255.66666
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SearchFilter:
|
||||
m_NameFilter:
|
||||
m_ClassNames: []
|
||||
m_AssetLabels: []
|
||||
m_AssetBundleNames: []
|
||||
m_VersionControlStates: []
|
||||
m_SoftLockControlStates: []
|
||||
m_ReferencingInstanceIDs:
|
||||
m_SceneHandles:
|
||||
m_ShowAllHits: 0
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets/Scenes
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_ViewMode: 0
|
||||
m_StartGridSize: 64
|
||||
m_LastFolders: []
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: D:\Unity\BGJ-2022.1
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: dc3c0000
|
||||
m_LastClickedID: 15580
|
||||
m_ExpandedIDs: ffffffff00000000409b0000789b00007a9b0000f69c0000029d0000109d0000169d000020b60000aeb60000deb80000e2b80000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_SearchString:
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
m_Path:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_AssetTreeState:
|
||||
scrollPos: {x: 0, y: 148.00055}
|
||||
m_SelectedIDs: ba7affff
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: ffffffff00000000409b0000789b00007a9b0000f69c0000029d0000109d0000169d000020b60000aeb60000deb80000e2b80000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 6}
|
||||
m_SearchString:
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
m_Path:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs: ba7affff
|
||||
m_LastClickedInstanceID: -34118
|
||||
m_HadKeyboardFocusLastEvent: 0
|
||||
m_ExpandedInstanceIDs: c6230000d03c0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
m_Path:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_NewAssetIndexInList: -1
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 170
|
||||
--- !u!114 &8
|
||||
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: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 9}
|
||||
- {fileID: 12}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 253.33333
|
||||
y: 0
|
||||
width: 732.6667
|
||||
height: 579.3333
|
||||
m_MinSize: {x: 100, y: 200}
|
||||
m_MaxSize: {x: 8096, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 11404
|
||||
--- !u!114 &9
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -426,25 +260,23 @@ MonoBehaviour:
|
|||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: GameView
|
||||
m_Name: SceneView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
x: 272
|
||||
y: 0
|
||||
width: 732.6667
|
||||
height: 408
|
||||
width: 667.3333
|
||||
height: 305.33334
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_ActualView: {fileID: 8}
|
||||
m_Panes:
|
||||
- {fileID: 10}
|
||||
- {fileID: 2}
|
||||
- {fileID: 11}
|
||||
m_Selected: 1
|
||||
- {fileID: 8}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &10
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -464,10 +296,10 @@ MonoBehaviour:
|
|||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 253.33334
|
||||
x: 272
|
||||
y: 72.66667
|
||||
width: 730.6667
|
||||
height: 387
|
||||
width: 665.3333
|
||||
height: 284.33334
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
|
|
@ -531,7 +363,7 @@ MonoBehaviour:
|
|||
containerId: overlay-toolbar__top
|
||||
floating: 0
|
||||
collapsed: 0
|
||||
displayed: 1
|
||||
displayed: 0
|
||||
snapOffset: {x: 0, y: 0}
|
||||
snapOffsetDelta: {x: 0, y: 0}
|
||||
snapCorner: 0
|
||||
|
|
@ -681,7 +513,7 @@ MonoBehaviour:
|
|||
id: Scene View/Particles
|
||||
index: 10
|
||||
layout: 4
|
||||
m_WindowGUID: d69a67902db7f994ca099bec79d22ce1
|
||||
m_WindowGUID: b1f4bf5ea36dd7a46aa212bc565c8810
|
||||
m_Gizmos: 1
|
||||
m_OverrideSceneCullingMask: 6917529027641081856
|
||||
m_SceneIsLit: 1
|
||||
|
|
@ -691,9 +523,9 @@ MonoBehaviour:
|
|||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: 9.920364, y: 1.2336687, z: -0.14071208}
|
||||
m_Target: {x: 13.152034, y: -1.8384262, z: -0.16624245}
|
||||
speed: 2
|
||||
m_Value: {x: 9.920364, y: 1.2336687, z: -0.14071208}
|
||||
m_Value: {x: 13.152034, y: -1.8384262, z: -0.16624245}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
|
|
@ -727,12 +559,12 @@ MonoBehaviour:
|
|||
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: 1, y: 1}
|
||||
m_Size: {x: 0, y: 0}
|
||||
zGrid:
|
||||
m_Fade:
|
||||
m_Target: 0
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
m_Value: 0
|
||||
m_Value: 1
|
||||
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: 1, y: 1}
|
||||
|
|
@ -744,9 +576,9 @@ MonoBehaviour:
|
|||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
m_Target: 9.746794
|
||||
m_Target: 9.297516
|
||||
speed: 2
|
||||
m_Value: 9.746794
|
||||
m_Value: 9.297516
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
|
|
@ -754,7 +586,7 @@ MonoBehaviour:
|
|||
m_CameraSettings:
|
||||
m_Speed: 1
|
||||
m_SpeedNormalized: 0.5
|
||||
m_SpeedMin: 0.01
|
||||
m_SpeedMin: 0.001
|
||||
m_SpeedMax: 2
|
||||
m_EasingEnabled: 1
|
||||
m_EasingDuration: 0.4
|
||||
|
|
@ -771,6 +603,58 @@ MonoBehaviour:
|
|||
m_SceneVisActive: 1
|
||||
m_LastLockedObject: {fileID: 0}
|
||||
m_ViewIsLockedToObject: 0
|
||||
--- !u!114 &9
|
||||
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: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 10}
|
||||
- {fileID: 13}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 305.33334
|
||||
width: 939.3333
|
||||
height: 273.99997
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 3192
|
||||
--- !u!114 &10
|
||||
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: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 271.33334
|
||||
height: 273.99997
|
||||
m_MinSize: {x: 230, y: 250}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_ActualView: {fileID: 11}
|
||||
m_Panes:
|
||||
- {fileID: 11}
|
||||
- {fileID: 12}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -779,60 +663,138 @@ MonoBehaviour:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3}
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 240, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_MinSize: {x: 230, y: 250}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_TitleContent:
|
||||
m_Text: Tile Palette
|
||||
m_Image: {fileID: 0}
|
||||
m_Text: Project
|
||||
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 253.33334
|
||||
y: 72.66667
|
||||
width: 730.6667
|
||||
height: 387
|
||||
x: 0
|
||||
y: 378
|
||||
width: 270.33334
|
||||
height: 252.99997
|
||||
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: 4017893543754070076, guid: 8877a796019eec64dbfa40866abf571c, type: 3}
|
||||
m_DrawGridGizmo: 1
|
||||
m_DrawGizmos: 0
|
||||
m_SearchFilter:
|
||||
m_NameFilter:
|
||||
m_ClassNames: []
|
||||
m_AssetLabels: []
|
||||
m_AssetBundleNames: []
|
||||
m_VersionControlStates: []
|
||||
m_SoftLockControlStates: []
|
||||
m_ReferencingInstanceIDs:
|
||||
m_SceneHandles:
|
||||
m_ShowAllHits: 0
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets/Scripts/Platforms
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_ViewMode: 0
|
||||
m_StartGridSize: 64
|
||||
m_LastFolders: []
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: D:\Unity\BGJ-2022.1
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 23.666626}
|
||||
m_SelectedIDs: 048e0000
|
||||
m_LastClickedID: 36356
|
||||
m_ExpandedIDs: ffffffff00000000de630000e2630000ea630000ec630000f2630000f0640000ea650000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_SearchString:
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
m_Path:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_AssetTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: ffffffff00000000de630000e2630000ea630000ec630000f2630000f0640000ea650000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_SearchString:
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
m_Path:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 0
|
||||
m_ExpandedInstanceIDs: c6230000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 0}
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
m_Path:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_NewAssetIndexInList: -1
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 115
|
||||
--- !u!114 &12
|
||||
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: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ConsoleWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 408
|
||||
width: 732.6667
|
||||
height: 171.33331
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &13
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -852,14 +814,40 @@ MonoBehaviour:
|
|||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 253.33334
|
||||
y: 480.6667
|
||||
width: 730.6667
|
||||
height: 150.33331
|
||||
x: 8
|
||||
y: 718
|
||||
width: 1366
|
||||
height: 308
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
--- !u!114 &13
|
||||
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: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: GameView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 271.33334
|
||||
y: 0
|
||||
width: 668
|
||||
height: 273.99997
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_Panes:
|
||||
- {fileID: 2}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &14
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -875,9 +863,9 @@ MonoBehaviour:
|
|||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 986
|
||||
x: 939.3333
|
||||
y: 0
|
||||
width: 294
|
||||
width: 340.6667
|
||||
height: 579.3333
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
|
|
@ -906,9 +894,9 @@ MonoBehaviour:
|
|||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 986
|
||||
x: 939.3334
|
||||
y: 72.66667
|
||||
width: 293
|
||||
width: 339.6667
|
||||
height: 558.3333
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
|
|
@ -920,7 +908,7 @@ MonoBehaviour:
|
|||
m_CachedPref: 160
|
||||
m_ControlHash: -371814159
|
||||
m_PrefName: Preview_InspectorPreview
|
||||
m_LastInspectedObjectInstanceID: -34118
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
m_LastVerticalScrollValue: 0
|
||||
m_GlobalObjectId:
|
||||
m_InspectorMode: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue