Yash
This commit is contained in:
@@ -38,13 +38,18 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 32
|
||||
width: 1920
|
||||
height: 980
|
||||
x: 124
|
||||
y: 130
|
||||
width: 1644
|
||||
height: 899
|
||||
m_ShowMode: 4
|
||||
<<<<<<< HEAD
|
||||
m_Title: Scene
|
||||
m_RootView: {fileID: 9}
|
||||
=======
|
||||
m_Title: Project
|
||||
m_RootView: {fileID: 6}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 0
|
||||
@@ -100,6 +105,32 @@ MonoBehaviour:
|
||||
controlID: 193
|
||||
draggingID: 0
|
||||
--- !u!114 &5
|
||||
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: InspectorWindow
|
||||
m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1217
|
||||
y: 0
|
||||
width: 427
|
||||
height: 642
|
||||
m_MinSize: {x: 276, y: 76}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_ActualView: {fileID: 13}
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -112,19 +143,24 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
<<<<<<< HEAD
|
||||
- {fileID: 12}
|
||||
- {fileID: 6}
|
||||
=======
|
||||
- {fileID: 9}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 36
|
||||
width: 1920
|
||||
height: 924
|
||||
width: 1644
|
||||
height: 843
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 37
|
||||
draggingID: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -152,6 +188,9 @@ MonoBehaviour:
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &7
|
||||
=======
|
||||
--- !u!114 &4
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -168,6 +207,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 363
|
||||
height: 545
|
||||
m_MinSize: {x: 201, y: 226}
|
||||
@@ -175,6 +215,15 @@ MonoBehaviour:
|
||||
m_ActualView: {fileID: 18}
|
||||
m_Panes:
|
||||
- {fileID: 18}
|
||||
=======
|
||||
width: 368
|
||||
height: 642
|
||||
m_MinSize: {x: 201, y: 226}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &8
|
||||
@@ -193,6 +242,7 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< HEAD
|
||||
y: 545
|
||||
width: 1466
|
||||
height: 379
|
||||
@@ -205,6 +255,20 @@ MonoBehaviour:
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &9
|
||||
=======
|
||||
y: 642
|
||||
width: 1644
|
||||
height: 201
|
||||
m_MinSize: {x: 230, y: 276}
|
||||
m_MaxSize: {x: 10000, y: 10026}
|
||||
m_ActualView: {fileID: 12}
|
||||
m_Panes:
|
||||
- {fileID: 12}
|
||||
- {fileID: 17}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &6
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -217,15 +281,21 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
<<<<<<< HEAD
|
||||
- {fileID: 10}
|
||||
- {fileID: 5}
|
||||
- {fileID: 11}
|
||||
=======
|
||||
- {fileID: 7}
|
||||
- {fileID: 3}
|
||||
- {fileID: 8}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1920
|
||||
height: 980
|
||||
width: 1644
|
||||
height: 899
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_UseTopView: 1
|
||||
@@ -249,7 +319,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1920
|
||||
width: 1644
|
||||
height: 36
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
@@ -270,8 +340,8 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 960
|
||||
width: 1920
|
||||
y: 879
|
||||
width: 1644
|
||||
height: 20
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
@@ -294,10 +364,10 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1466
|
||||
height: 924
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
width: 1644
|
||||
height: 843
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 38
|
||||
draggingID: 0
|
||||
@@ -314,16 +384,29 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
<<<<<<< HEAD
|
||||
- {fileID: 7}
|
||||
- {fileID: 14}
|
||||
=======
|
||||
- {fileID: 4}
|
||||
- {fileID: 11}
|
||||
- {fileID: 2}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 1466
|
||||
height: 545
|
||||
m_MinSize: {x: 200, y: 50}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
=======
|
||||
width: 1644
|
||||
height: 642
|
||||
m_MinSize: {x: 300, y: 50}
|
||||
m_MaxSize: {x: 24288, y: 8096}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
vertical: 0
|
||||
controlID: 39
|
||||
draggingID: 0
|
||||
@@ -342,8 +425,9 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 363
|
||||
x: 368
|
||||
y: 0
|
||||
<<<<<<< HEAD
|
||||
width: 1103
|
||||
height: 545
|
||||
m_MinSize: {x: 202, y: 226}
|
||||
@@ -352,6 +436,16 @@ MonoBehaviour:
|
||||
m_Panes:
|
||||
- {fileID: 19}
|
||||
- {fileID: 20}
|
||||
=======
|
||||
width: 849
|
||||
height: 642
|
||||
m_MinSize: {x: 202, y: 226}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 15}
|
||||
m_Panes:
|
||||
- {fileID: 15}
|
||||
- {fileID: 16}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
--- !u!114 &15
|
||||
@@ -362,6 +456,7 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
<<<<<<< HEAD
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
@@ -426,6 +521,8 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
=======
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
@@ -439,10 +536,17 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Project\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 0
|
||||
y: 569
|
||||
width: 1465
|
||||
height: 353
|
||||
=======
|
||||
x: 124
|
||||
y: 827
|
||||
width: 1644
|
||||
height: 175
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@@ -465,7 +569,7 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets
|
||||
- Assets/Scenes
|
||||
m_Globs: []
|
||||
m_ProductIds:
|
||||
m_AnyWithAssetOrigin: 0
|
||||
@@ -473,18 +577,30 @@ MonoBehaviour:
|
||||
m_ImportLogFlags: 0
|
||||
m_FilterByTypeIntersection: 0
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 64
|
||||
m_StartGridSize: 32
|
||||
m_LastFolders:
|
||||
<<<<<<< HEAD
|
||||
- Assets
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: /home/thysona/SCLPlus
|
||||
=======
|
||||
- Assets/Scenes
|
||||
m_LastFoldersGridSize: 32
|
||||
m_LastProjectPath: /home/anemunt/Git-base/SCLPlus
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_SelectedIDs: 10e70000
|
||||
m_LastClickedID: 59152
|
||||
m_ExpandedIDs: 000000008eac0000
|
||||
=======
|
||||
m_SelectedIDs: b2ac0000
|
||||
m_LastClickedID: 44210
|
||||
m_ExpandedIDs: 000000007eab000000ca9a3b
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -513,7 +629,11 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
<<<<<<< HEAD
|
||||
m_ExpandedIDs: 000000008eac0000
|
||||
=======
|
||||
m_ExpandedIDs: 000000007eab0000
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -568,10 +688,14 @@ MonoBehaviour:
|
||||
m_ResourceFile:
|
||||
m_NewAssetIndexInList: -1
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_GridSize: 64
|
||||
m_GridSize: 32
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 207
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &17
|
||||
=======
|
||||
--- !u!114 &13
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -592,10 +716,17 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Inspector\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 1467
|
||||
y: 24
|
||||
width: 453
|
||||
height: 898
|
||||
=======
|
||||
x: 1341
|
||||
y: 185
|
||||
width: 426
|
||||
height: 616
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@@ -620,7 +751,11 @@ MonoBehaviour:
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_PreviewWindow: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &18
|
||||
=======
|
||||
--- !u!114 &14
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -641,10 +776,17 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Hierarchy\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 0
|
||||
y: 24
|
||||
width: 362
|
||||
height: 519
|
||||
=======
|
||||
x: 124
|
||||
y: 185
|
||||
width: 367
|
||||
height: 616
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@@ -659,9 +801,15 @@ MonoBehaviour:
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: d653ffff8454ffff8e54ffff3c59ffff
|
||||
=======
|
||||
m_SelectedIDs: c0ac0000
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 74c4ffff40c5ffff10fbffff
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -686,7 +834,11 @@ MonoBehaviour:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &19
|
||||
=======
|
||||
--- !u!114 &15
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -707,10 +859,17 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Scene\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< HEAD
|
||||
x: 364
|
||||
y: 24
|
||||
width: 1101
|
||||
height: 519
|
||||
=======
|
||||
x: 492
|
||||
y: 185
|
||||
width: 847
|
||||
height: 616
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@@ -1083,9 +1242,15 @@ MonoBehaviour:
|
||||
m_AudioPlay: 0
|
||||
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
||||
m_Position:
|
||||
<<<<<<< HEAD
|
||||
m_Target: {x: -11.712889, y: -2.188706, z: -3.138106}
|
||||
speed: 2
|
||||
m_Value: {x: -11.712889, y: -2.188706, z: -3.138106}
|
||||
=======
|
||||
m_Target: {x: -3.1625144, y: 5.739222, z: -8.97646}
|
||||
speed: 2
|
||||
m_Value: {x: -3.1625142, y: 5.739222, z: -8.97646}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -1118,7 +1283,7 @@ MonoBehaviour:
|
||||
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}
|
||||
m_Size: {x: 0.01, y: 0.01}
|
||||
zGrid:
|
||||
m_Fade:
|
||||
m_Target: 0
|
||||
@@ -1131,9 +1296,15 @@ MonoBehaviour:
|
||||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
<<<<<<< HEAD
|
||||
m_Target: {x: -0.10891323, y: 0.681718, z: -0.10370966, w: -0.7160146}
|
||||
speed: 2
|
||||
m_Value: {x: -0.10891323, y: 0.68171805, z: -0.10370967, w: -0.7160146}
|
||||
=======
|
||||
m_Target: {x: -0.24699703, y: -0.17415476, z: 0.04517572, w: -0.95216995}
|
||||
speed: 2
|
||||
m_Value: {x: -0.24842429, y: -0.1740863, z: 0.045436773, w: -0.95179564}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_Size:
|
||||
m_Target: 10
|
||||
speed: 2
|
||||
@@ -1158,7 +1329,11 @@ MonoBehaviour:
|
||||
m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_LastSceneViewOrtho: 0
|
||||
m_Viewpoint:
|
||||
<<<<<<< HEAD
|
||||
m_SceneView: {fileID: 19}
|
||||
=======
|
||||
m_SceneView: {fileID: 15}
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
m_CameraOverscanSettings:
|
||||
m_Opacity: 50
|
||||
m_Scale: 1
|
||||
@@ -1171,7 +1346,11 @@ MonoBehaviour:
|
||||
name: Contributors / Receivers
|
||||
section: Lighting
|
||||
m_ViewIsLockedToObject: 0
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &20
|
||||
=======
|
||||
--- !u!114 &16
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -1272,7 +1451,11 @@ MonoBehaviour:
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
m_showToolbar: 1
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &21
|
||||
=======
|
||||
--- !u!114 &17
|
||||
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
||||
Reference in New Issue
Block a user