Skip to content

Commit 6075bb2

Browse files
author
Dmitriy Yukhanov
committed
Merge branch 'develop'
2 parents c64ca2b + c435d8a commit 6075bb2

152 files changed

Lines changed: 8910 additions & 411 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
*.userprefs
88
*.user
99
*.tmp
10+
*.log
11+
1012
.DS_Store
1113
.DS_Store?
1214
.DS_Store.meta
@@ -18,7 +20,9 @@ Thumbs.db.meta
1820
**/Library/
1921
**/obj/
2022
**/Temp/
21-
**/AssetStoreTools*
22-
*/Package2Folder 20*
23-
**/.idea/
23+
**/Builds/
24+
**/.idea/*
25+
**/JetBrains*
2426
JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll*
27+
UserSettings/
28+
com.unity.asset-store-tools

Unity Projects/Package2Folder 2020/Assets/Plugins.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Unity Projects/Package2Folder 2020/Assets/Plugins/CodeStage.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../Package2Folder Master/Assets/Plugins/CodeStage/Package2Folder

Unity Projects/Package2Folder 2020/Assets/Plugins/CodeStage/Package2Folder.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Unity Projects/Package2Folder 2020/Assets/Tests.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using CodeStage.PackageToFolder;
2+
using UnityEditor;
3+
4+
public class CheckAPI
5+
{
6+
[MenuItem("Tools/Test")]
7+
public static void Test()
8+
{
9+
Package2Folder.ImportPackageToFolder(@"D:\1.unitypackage", @"Assets/Wow", false);
10+
}
11+
}

Unity Projects/Package2Folder 2020/Assets/Tests/CheckAPI.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "Tests",
3+
"references": [
4+
"CodeStage.Package2Folder"
5+
],
6+
"includePlatforms": [
7+
"Editor"
8+
],
9+
"excludePlatforms": []
10+
}

Unity Projects/Package2Folder 2020/Assets/Tests/Tests.asmdef.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)