File tree Expand file tree Collapse file tree 3 files changed +13
-3
lines changed
UnityEngine.AssetBundles/Editor/AssetBundleBrowser Expand file tree Collapse file tree 3 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ internal class AssetBundleTree : TreeView
12
12
{
13
13
AssetBundleManageTab m_Controller ;
14
14
private bool m_ContextOnItem = false ;
15
+ List < UnityEngine . Object > m_EmptyObjectList = new List < Object > ( ) ;
15
16
16
17
public AssetBundleTree ( TreeViewState state , AssetBundleManageTab ctrl ) : base ( state )
17
18
{
@@ -489,7 +490,7 @@ protected override void SetupDragAndDrop(SetupDragAndDropArgs args)
489
490
selectedBundles . Add ( item . bundle ) ;
490
491
}
491
492
DragAndDrop . paths = null ;
492
- DragAndDrop . objectReferences = new UnityEngine . Object [ ] { } ;
493
+ DragAndDrop . objectReferences = m_EmptyObjectList . ToArray ( ) ;
493
494
DragAndDrop . SetGenericData ( "AssetBundleModel.BundleInfo" , selectedBundles ) ;
494
495
DragAndDrop . visualMode = DragAndDropVisualMode . Copy ; //Move;
495
496
DragAndDrop . StartDrag ( "AssetBundleTree" ) ;
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ internal class AssetListTree : TreeView
12
12
{
13
13
List < AssetBundleModel . BundleInfo > m_SourceBundles = new List < AssetBundleModel . BundleInfo > ( ) ;
14
14
AssetBundleManageTab m_Controller ;
15
+ List < UnityEngine . Object > m_EmptyObjectList = new List < Object > ( ) ;
15
16
16
17
public static MultiColumnHeaderState CreateDefaultMultiColumnHeaderState ( )
17
18
{
@@ -201,7 +202,11 @@ protected override void SelectionChanged(IList<int> selectedIds)
201
202
}
202
203
m_Controller . SetSelectedItems ( selectedAssets ) ;
203
204
}
204
-
205
+ protected override bool CanBeParent ( TreeViewItem item )
206
+ {
207
+ return false ;
208
+ }
209
+
205
210
protected override bool CanStartDrag ( CanStartDragArgs args )
206
211
{
207
212
args . draggedItemIDs = GetSelection ( ) ;
@@ -211,10 +216,10 @@ protected override bool CanStartDrag(CanStartDragArgs args)
211
216
protected override void SetupDragAndDrop ( SetupDragAndDropArgs args )
212
217
{
213
218
DragAndDrop . PrepareStartDrag ( ) ;
219
+ DragAndDrop . objectReferences = m_EmptyObjectList . ToArray ( ) ;
214
220
List < AssetBundleModel . AssetTreeItem > items =
215
221
new List < AssetBundleModel . AssetTreeItem > ( args . draggedItemIDs . Select ( id => FindItem ( id , rootItem ) as AssetBundleModel . AssetTreeItem ) ) ;
216
222
DragAndDrop . paths = items . Select ( a => a . asset . fullAssetName ) . ToArray ( ) ;
217
- DragAndDrop . objectReferences = new UnityEngine . Object [ ] { } ;
218
223
DragAndDrop . SetGenericData ( "AssetListTreeSource" , this ) ;
219
224
DragAndDrop . StartDrag ( "AssetListTree" ) ;
220
225
}
Original file line number Diff line number Diff line change @@ -44,7 +44,10 @@ public void Update()
44
44
dirty |= bundle . dirty ;
45
45
}
46
46
if ( dirty )
47
+ {
47
48
Reload ( ) ;
49
+ ExpandAll ( ) ;
50
+ }
48
51
}
49
52
protected override TreeViewItem BuildRoot ( )
50
53
{
@@ -149,6 +152,7 @@ internal void SetItems(IEnumerable<AssetBundleModel.BundleInfo> items)
149
152
}
150
153
SetSelection ( new List < int > ( ) ) ;
151
154
Reload ( ) ;
155
+ ExpandAll ( ) ;
152
156
}
153
157
internal void CollectBundles ( AssetBundleModel . BundleInfo bundle )
154
158
{
You can’t perform that action at this time.
0 commit comments