Skip to content

Commit 885c115

Browse files
- changed menu item label to 'Here...'
- fixed incorrect code placed in the Unity 5.3 condition - 1.0.0.0 release?
1 parent 61486e4 commit 885c115

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

  • Unity Projects/Master/Assets/Plugins/CodeStage/Package2Folder/Editor

Unity Projects/Master/Assets/Plugins/CodeStage/Package2Folder/Editor/Package2Folder.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class Package2Folder
2121
#region reflection stuff
2222

2323
#if !UNITY_5_3_PLUS
24-
delegate AssetsItem[] ImportPackageStep1Delegate(string packagePath, out string packageIconPath);
24+
private delegate AssetsItem[] ImportPackageStep1Delegate(string packagePath, out string packageIconPath);
2525

2626
private static Type assetServerType;
2727
private static Type AssetServerType
@@ -68,7 +68,7 @@ private static MethodInfo ImportPackageStep2MethodInfo
6868
}
6969
}
7070
#else
71-
delegate object[] ExtractAndPrepareAssetListDelegate(string packagePath, out string packageIconPath, out bool allowReInstall);
71+
private delegate object[] ExtractAndPrepareAssetListDelegate(string packagePath, out string packageIconPath, out bool allowReInstall);
7272

7373
private static Type packageUtilityType;
7474
private static Type PackageUtilityType
@@ -114,33 +114,33 @@ private static FieldInfo DestinationAssetPathFieldInfo
114114
}
115115
}
116116

117-
private static MethodInfo showImportPackageMethodInfo;
118-
private static MethodInfo ShowImportPackageMethodInfo
117+
private static MethodInfo importPackageAssetsMethodInfo;
118+
private static MethodInfo ImportPackageAssetsMethodInfo
119119
{
120120
get
121121
{
122-
if (showImportPackageMethodInfo == null)
122+
if (importPackageAssetsMethodInfo == null)
123123
{
124-
Type packageImport = typeof(MenuItem).Assembly.GetType("UnityEditor.PackageImport");
125-
showImportPackageMethodInfo = packageImport.GetMethod("ShowImportPackage");
124+
importPackageAssetsMethodInfo = PackageUtilityType.GetMethod("ImportPackageAssets");
126125
}
127126

128-
return showImportPackageMethodInfo;
127+
return importPackageAssetsMethodInfo;
129128
}
130129
}
131130
#endif
132131

133-
private static MethodInfo importPackageAssetsMethodInfo;
134-
private static MethodInfo ImportPackageAssetsMethodInfo
132+
private static MethodInfo showImportPackageMethodInfo;
133+
private static MethodInfo ShowImportPackageMethodInfo
135134
{
136135
get
137136
{
138-
if (importPackageAssetsMethodInfo == null)
137+
if (showImportPackageMethodInfo == null)
139138
{
140-
importPackageAssetsMethodInfo = PackageUtilityType.GetMethod("ImportPackageAssets");
139+
Type packageImport = typeof(MenuItem).Assembly.GetType("UnityEditor.PackageImport");
140+
showImportPackageMethodInfo = packageImport.GetMethod("ShowImportPackage");
141141
}
142142

143-
return importPackageAssetsMethodInfo;
143+
return showImportPackageMethodInfo;
144144
}
145145
}
146146

@@ -150,20 +150,20 @@ private static MethodInfo ImportPackageAssetsMethodInfo
150150
// Unity Editor menus integration
151151
///////////////////////////////////////////////////////////////
152152

153-
[MenuItem("Assets/Import Package/Custom to this folder...", true, 10)]
154-
private static bool IsImportToFolderPossible()
153+
[MenuItem("Assets/Import Package/Here...", true, 10)]
154+
private static bool IsImportToFolderCheck()
155155
{
156156
string selectedFolderPath = GetSelectedFolderPath();
157157
return !string.IsNullOrEmpty(selectedFolderPath);
158158
}
159159

160-
[MenuItem("Assets/Import Package/Custom to this folder...", false, 10)]
161-
private static void ImportToFolderCallback()
160+
[MenuItem("Assets/Import Package/Here...", false, 10)]
161+
private static void Package2FolderCommand()
162162
{
163163
string packagePath = EditorUtility.OpenFilePanel("Import package ...", "", "unitypackage");
164164
if (string.IsNullOrEmpty(packagePath)) return;
165165
if (!File.Exists(packagePath)) return;
166-
166+
167167
string selectedFolderPath = GetSelectedFolderPath();
168168
ImportPackageToFolder(packagePath, selectedFolderPath, true);
169169
}

0 commit comments

Comments
 (0)