Skip to content

Commit 1af2b35

Browse files
committed
remove SteamingAssets folder
1 parent 24184d0 commit 1af2b35

Some content is hidden

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

54 files changed

+19
-462
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ sysinfo.txt
3636
/.vscode/
3737
/Packages/packages-lock.json
3838
TextMesh Pro/
39-
TextMesh Pro.meta
39+
TextMesh Pro.meta
40+
Assets/StreamingAssets/
41+
Assets/StreamingAssets.meta

Assets/Examples/BundleUsage/BundleUsageMain.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
using UnityEngine;
33
using FairyGUI;
44
using System.Net;
5-
6-
#if UNITY_5_4_OR_NEWER
75
using UnityEngine.Networking;
8-
#endif
96

107
/// <summary>
118
/// Demonstrated how to load UI package from assetbundle. The bundle can be build from the Window Menu->Build FairyGUI example bundles.
@@ -30,6 +27,7 @@ IEnumerator LoadUIPackage()
3027
url = "file:///" + url;
3128

3229
#if UNITY_2017_2_OR_NEWER
30+
3331
#if UNITY_2018_1_OR_NEWER
3432
UnityWebRequest www = UnityWebRequestAssetBundle.GetAssetBundle(url);
3533
#else
@@ -61,14 +59,16 @@ IEnumerator LoadUIPackage()
6159

6260
_mainView = UIPackage.CreateObject("BundleUsage", "Main").asCom;
6361
_mainView.fairyBatching = true;
64-
_mainView.SetSize(GRoot.inst.width, GRoot.inst.height);
62+
_mainView.MakeFullScreen();
6563
_mainView.AddRelation(GRoot.inst, RelationType.Size);
6664

6765
GRoot.inst.AddChild(_mainView);
6866
_mainView.GetTransition("t0").Play();
6967
}
7068
else
71-
Debug.LogError(www.error);
69+
{
70+
Debug.LogWarning("Run Window->Build FairyGUI example Bundles first.");
71+
}
7272
}
7373

7474
void OnKeyDown(EventContext context)

Assets/Examples/Editor/BuildAssetBundles.cs

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,23 @@
55
public class BuildAssetBundles
66
{
77
[MenuItem("Window/Build FairyGUI Example Bundles")]
8-
public static void Builde()
8+
public static void Build()
99
{
10-
#if (UNITY_5 || UNITY_5_3_OR_NEWER)
11-
for (int i = 0; i < 10; i++)
12-
{
13-
AssetImporter.GetAtPath("Assets/FairyGUI/Examples/Resources/Icons/i" + i + ".png").assetBundleName = "fairygui-examples/i" + i + ".ab";
14-
}
15-
16-
AssetImporter.GetAtPath("Assets/FairyGUI/Examples/Resources/UI/BundleUsage_fui.bytes").assetBundleName = "fairygui-examples/bundleusage.ab";
17-
AssetImporter.GetAtPath("Assets/FairyGUI/Examples/Resources/UI/BundleUsage_atlas0.png").assetBundleName = "fairygui-examples/bundleusage.ab";
10+
string basePath = "Assets/FairyGUI/Examples/Resources/";
11+
if (AssetImporter.GetAtPath(basePath + "Icons/i0.png") == null)
12+
basePath = "Assets/Examples/Resources/";
1813

19-
BuildPipeline.BuildAssetBundles(Application.streamingAssetsPath, BuildAssetBundleOptions.None, BuildTarget.Android);
20-
#else
2114
for (int i = 0; i < 10; i++)
2215
{
23-
Object obj = AssetDatabase.LoadAssetAtPath("Assets/FairyGUI/Examples/Resources/Icons/i"+i+".png", typeof(Object));
24-
BuildPipeline.BuildAssetBundle(obj, null, Path.Combine(Application.streamingAssetsPath, "fairygui-examples/i" + i + ".ab"),
25-
BuildAssetBundleOptions.CollectDependencies, BuildTarget.Android);
16+
AssetImporter.GetAtPath(basePath + "Icons/i" + i + ".png").assetBundleName = "fairygui-examples/i" + i + ".ab";
2617
}
2718

28-
Object mainAsset = AssetDatabase.LoadAssetAtPath("Assets/FairyGUI/Examples/Resources/UI/BundleUsage_fui.bytes", typeof(Object));
29-
Object[] assets = new Object[] {
30-
AssetDatabase.LoadAssetAtPath("Assets/FairyGUI/Examples/Resources/UI/BundleUsage_atlas0.png", typeof(Object))
31-
};
19+
AssetImporter.GetAtPath(basePath + "UI/BundleUsage_fui.bytes").assetBundleName = "fairygui-examples/bundleusage.ab";
20+
AssetImporter.GetAtPath(basePath + "UI/BundleUsage_atlas0.png").assetBundleName = "fairygui-examples/bundleusage.ab";
21+
22+
if (!Directory.Exists(Application.streamingAssetsPath))
23+
Directory.CreateDirectory(Application.streamingAssetsPath);
3224

33-
BuildPipeline.BuildAssetBundle(mainAsset, assets, Path.Combine(Application.streamingAssetsPath, "fairygui-examples/bundleusage.ab"),
34-
BuildAssetBundleOptions.CollectDependencies, BuildTarget.Android);
35-
AssetDatabase.Refresh();
36-
#endif
25+
BuildPipeline.BuildAssetBundles(Application.streamingAssetsPath, BuildAssetBundleOptions.None, BuildTarget.Android);
3726
}
3827
}

Assets/Extensions.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.
-1.16 KB
Binary file not shown.

Assets/StreamingAssets/StreamingAssets.manifest

Lines changed: 0 additions & 37 deletions
This file was deleted.

Assets/StreamingAssets/StreamingAssets.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/StreamingAssets.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.
Binary file not shown.

Assets/StreamingAssets/fairygui-examples/bundleusage.ab.manifest

Lines changed: 0 additions & 19 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/bundleusage.ab.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/bundleusage.ab.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-18 KB
Binary file not shown.

Assets/StreamingAssets/fairygui-examples/i0.ab.manifest

Lines changed: 0 additions & 16 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i0.ab.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i0.ab.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-17.9 KB
Binary file not shown.

Assets/StreamingAssets/fairygui-examples/i1.ab.manifest

Lines changed: 0 additions & 16 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i1.ab.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i1.ab.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-21.1 KB
Binary file not shown.

Assets/StreamingAssets/fairygui-examples/i2.ab.manifest

Lines changed: 0 additions & 16 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i2.ab.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i2.ab.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-22.2 KB
Binary file not shown.

Assets/StreamingAssets/fairygui-examples/i3.ab.manifest

Lines changed: 0 additions & 16 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i3.ab.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i3.ab.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-15 KB
Binary file not shown.

Assets/StreamingAssets/fairygui-examples/i4.ab.manifest

Lines changed: 0 additions & 16 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i4.ab.manifest.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/StreamingAssets/fairygui-examples/i4.ab.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
-7.98 KB
Binary file not shown.

0 commit comments

Comments
 (0)