Merge branch 'develop'

CSaratakij · Jul 30, 2023 · b449e17 · b449e17
2 parents d924f94 + 26d8539
commit b449e17
Show file tree

Hide file tree

Showing 7 changed files with 264 additions and 5,242 deletions.
diff --git a/Assets/SceneSelector/Editor/CustomSceneListScriptableObject.cs b/Assets/SceneSelector/Editor/CustomSceneListScriptableObject.cs
@@ -27,6 +27,11 @@ public Setting(bool enabled, SceneAsset sceneAsset)
 
         internal void ApplyToBuildSetting()
         {
+            if (settings == null)
+            {
+                return;
+            }
+
             bool isNonValidSceneFound = settings.Any(x => (x.scene == null));
 
             if (isNonValidSceneFound)
@@ -65,6 +70,11 @@ internal void ImportFromBuildSetting()
 
         internal void CleanUp()
         {
+            if (settings == null)
+            {
+                return;
+            }
+
             var validSettings = settings.Where(x => (x.scene != null))
                                     .GroupBy(x => x.scene)
                                     .Select(x => x.First());

diff --git a/Assets/SceneSelector/Editor/SceneSelector.uxml b/Assets/SceneSelector/Editor/SceneSelector.uxml
@@ -2,7 +2,7 @@
     <Style src="project://database/Assets/SceneSelector/Editor/SceneSelector.uss?fileID=7433441132597879392&amp;guid=c909b5cd0ae763242b1017ffbf9b2f3a&amp;type=3#SceneSelector" />
     <ui:GroupBox>
         <ui:Label tabindex="-1" text="Setting" display-tooltip-when-elided="true" style="-unity-font-style: bold;" />
-        <ui:EnumField label="Mode" type="SceneSelector.Editor.SceneSelector+PlayMode, SceneSelector.Editor" name="enumPlayMode" />
+        <uie:EnumField label="Mode" type="SceneSelector.Editor.SceneSelector+PlayMode, SceneSelector.Editor" name="enumPlayMode" />
         <uie:ObjectField label="Scene" allow-scene-objects="false" type="UnityEditor.SceneAsset, UnityEditor.CoreModule" name="objectFieldCustomFirstScene" style="display: none; visibility: visible;" />
         <uie:ObjectField label="Scene List" allow-scene-objects="false" type="SceneSelector.Editor.CustomSceneListScriptableObject, SceneSelector.Editor" name="objectFieldCustomSceneList" style="display: none; visibility: visible;" />
         <ui:VisualElement name="spacing" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); min-height: 4px;" />

diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log
diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log
diff --git a/Logs/AssetImportWorker1-prev.log b/Logs/AssetImportWorker1-prev.log
diff --git a/Logs/AssetImportWorker1.log b/Logs/AssetImportWorker1.log
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 989
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Project
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -40,11 +40,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 651
+    y: 654
     width: 434
-    height: 288
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+    height: 285
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -74,7 +74,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 123
+  controlID: 17
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -125,7 +125,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 159
+  controlID: 136
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -222,7 +222,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 122
+  controlID: 16
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -241,9 +241,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 434
-    height: 651
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    height: 654
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -273,7 +273,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 1041
+  controlID: 42
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -295,14 +295,14 @@ MonoBehaviour:
     height: 614
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 18}
   - {fileID: 19}
   - {fileID: 21}
   - {fileID: 16}
-  m_Selected: 3
-  m_LastSelected: 1
+  m_Selected: 2
+  m_LastSelected: 3
 --- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -348,8 +348,8 @@ MonoBehaviour:
     y: 0
     width: 425
     height: 939
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 23}
   m_Panes:
   - {fileID: 23}
@@ -377,9 +377,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 724
+    y: 727
     width: 433
-    height: 267
+    height: 264
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -390,9 +390,9 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_CurrentPlayMode: 1
+  m_CurrentPlayMode: 0
   m_CustomFirstScene: {fileID: 0}
-  m_CurrentSceneList: {fileID: 11400000, guid: c06448b142a6c5a4da8ff35d7a0e9af6, type: 2}
+  m_CurrentSceneList: {fileID: 0}
   m_VisualTreeAsset: {fileID: 9197481963319205126, guid: 45bfd11a582ccee498b040a3621b7062,
     type: 3}
 --- !u!114 &16
@@ -458,9 +458,9 @@ MonoBehaviour:
     m_IsLocked: 1
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 3a540000
-    m_LastClickedID: 21562
-    m_ExpandedIDs: 00000000305400003e54000000ca9a3bffffff7f
+    m_SelectedIDs: 7a530000
+    m_LastClickedID: 21370
+    m_ExpandedIDs: 000000001e540000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -488,7 +488,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000030540000
+    m_ExpandedIDs: 000000001e540000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -568,7 +568,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 433
-    height: 630
+    height: 633
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -582,7 +582,7 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 3a540000
+      m_SelectedIDs: 
       m_LastClickedID: 0
       m_ExpandedIDs: 0efbffff
       m_RenameOverlay:
@@ -1304,24 +1304,24 @@ MonoBehaviour:
     m_SkipHidden: 1
     m_SearchArea: 1
     m_Folders:
-    - Assets/SceneSelector/Editor
+    - Assets
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/SceneSelector/Editor
+  - Assets
   m_LastFoldersGridSize: 16
   m_LastProjectPath: C:\Users\GamePC\Desktop\GitRepository\SceneSelector
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 6a540000
-    m_LastClickedID: 21610
-    m_ExpandedIDs: 00000000305400003e54000000ca9a3bffffff7f
+    m_SelectedIDs: 1e540000
+    m_LastClickedID: 21534
+    m_ExpandedIDs: 000000001e54000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1349,7 +1349,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000030540000
+    m_ExpandedIDs: 000000001e540000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1380,18 +1380,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 06930000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: SceneSelector
-      m_OriginalName: SceneSelector
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 21566
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
@@ -1468,9 +1468,9 @@ MonoBehaviour:
     m_IsLocked: 1
   m_FolderTreeState:
     scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: 30540000
-    m_LastClickedID: 21552
-    m_ExpandedIDs: 000000003054000000ca9a3bffffff7f
+    m_SelectedIDs: 1e540000
+    m_LastClickedID: 21534
+    m_ExpandedIDs: 000000001e54000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1498,7 +1498,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000030540000
+    m_ExpandedIDs: 000000001e540000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1525,7 +1525,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0