Skip to content

Commit 3a90ab4

Browse files
author
amumu
committed
整理打包规则
1 parent 05c7cbe commit 3a90ab4

3 files changed

Lines changed: 18 additions & 22 deletions

File tree

‎Assembly-CSharp-Editor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 1.shader" />
140140
<None Include="Assets\md5Find.txt" />
141141
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 2.shader" />
142-
<None Include="Assets\StreamingAssets\Android\version.txt" />
143142
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 2.shader" />
144143
<None Include="Assets\NGUI\Examples\Models\Orc\Orc Skin.shader" />
145144
<None Include="Assets\NGUI\Examples\Atlases\Wooden\Arimo20.txt" />
@@ -156,6 +155,7 @@
156155
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored (TextureClip).shader" />
157156
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Header.txt" />
158157
<None Include="Assets\Resources\@Shaders\SkyBox-Alpha Blend.shader" />
158+
<None Include="Assets\StreamingAssets\Android\version.txt" />
159159
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 3.shader" />
160160
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored 1.shader" />
161161
<None Include="Assets\NGUI\Examples\Atlases\Fantasy\Fantasy Font - Normal.txt" />
@@ -164,7 +164,6 @@
164164
<None Include="Assets\NGUI\Examples\Atlases\Refractive\Refractive Font - Normal.txt" />
165165
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored 2.shader" />
166166
<None Include="Assets\Plugins\Android\res\values\strings.xml" />
167-
<None Include="Assets\StreamingAssets\Android\fileList.txt" />
168167
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 3.shader" />
169168
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 2.shader" />
170169
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 1.shader" />
@@ -182,6 +181,7 @@
182181
<None Include="Assets\NGUI\Examples\Shaders\Refractive.shader" />
183182
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text (TextureClip).shader" />
184183
<None Include="Assets\NGUI\Examples\Shaders\Unlit - Depth.shader" />
184+
<None Include="Assets\StreamingAssets\Android\fileList.txt" />
185185
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Normal.txt" />
186186
<None Include="Assets\Plugins\Android\AndroidManifest.xml" />
187187
<None Include="Assets\NGUI\Examples\Models\Orc Armor\Orc Armor.shader" />

‎Assembly-CSharp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@
245245
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 1.shader" />
246246
<None Include="Assets\md5Find.txt" />
247247
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 2.shader" />
248-
<None Include="Assets\StreamingAssets\Android\version.txt" />
249248
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 2.shader" />
250249
<None Include="Assets\NGUI\Examples\Models\Orc\Orc Skin.shader" />
251250
<None Include="Assets\NGUI\Examples\Atlases\Wooden\Arimo20.txt" />
@@ -262,6 +261,7 @@
262261
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored (TextureClip).shader" />
263262
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Header.txt" />
264263
<None Include="Assets\Resources\@Shaders\SkyBox-Alpha Blend.shader" />
264+
<None Include="Assets\StreamingAssets\Android\version.txt" />
265265
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 3.shader" />
266266
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored 1.shader" />
267267
<None Include="Assets\NGUI\Examples\Atlases\Fantasy\Fantasy Font - Normal.txt" />
@@ -270,7 +270,6 @@
270270
<None Include="Assets\NGUI\Examples\Atlases\Refractive\Refractive Font - Normal.txt" />
271271
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored 2.shader" />
272272
<None Include="Assets\Plugins\Android\res\values\strings.xml" />
273-
<None Include="Assets\StreamingAssets\Android\fileList.txt" />
274273
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 3.shader" />
275274
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 2.shader" />
276275
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 1.shader" />
@@ -288,6 +287,7 @@
288287
<None Include="Assets\NGUI\Examples\Shaders\Refractive.shader" />
289288
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text (TextureClip).shader" />
290289
<None Include="Assets\NGUI\Examples\Shaders\Unlit - Depth.shader" />
290+
<None Include="Assets\StreamingAssets\Android\fileList.txt" />
291291
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Normal.txt" />
292292
<None Include="Assets\Plugins\Android\AndroidManifest.xml" />
293293
<None Include="Assets\NGUI\Examples\Models\Orc Armor\Orc Armor.shader" />

‎Assets/Editor/ABBuild.cs‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3943,8 +3943,8 @@ static void BuildABFromPathList(string outPath, string[] list) {
39433943

39443944
// 开始打包
39453945
mMgr.BuildDirs(buildList);
3946-
string abOutPath = outPath + "/Assets/StreamingAssets";
3947-
mMgr.BuildAssetBundles(platform, 2, true, abOutPath);
3946+
mMgr.BuildAssetBundles(platform, 2, true, null);
3947+
mMgr.LocalAssetBundlesCopyToOtherProj("outPath/Proj", platform);
39483948
}
39493949

39503950
public static void BuildFromBuildPkg()
@@ -3999,7 +3999,7 @@ public static void BuildFromBuildPkg()
39993999
}
40004000

40014001
static public void BuildPlatform(eBuildPlatform platform, int compressType = 0, bool isMd5 = false,
4002-
string outPath = null, bool isForceAppend = false)
4002+
bool isForceAppend = false)
40034003
{
40044004
// GetResAllDirPath ();
40054005
// 编���平台`
@@ -4008,10 +4008,9 @@ static public void BuildPlatform(eBuildPlatform platform, int compressType = 0,
40084008
List<string> resList = GetResAllDirPath();
40094009
// resList.Add("Assets/Scene");
40104010
mMgr.BuildDirs(resList);
4011-
mMgr.BuildAssetBundles(platform, compressType, isMd5, outPath, isForceAppend);
4012-
// 增量更新同步一次新工程
4013-
if (isForceAppend || string.IsNullOrEmpty(outPath))
4014-
mMgr.LocalAssetBundlesCopyToOtherProj("outPath/Proj", platform);
4011+
mMgr.BuildAssetBundles(platform, compressType, isMd5, null, isForceAppend);
4012+
4013+
mMgr.LocalAssetBundlesCopyToOtherProj("outPath/Proj", platform);
40154014
/*
40164015
string outpath = GetAndCreateDefaultOutputPackagePath (platform);
40174016
string outFileName = outpath + "/" + GetCurrentPackageVersion (platform);
@@ -4150,7 +4149,7 @@ static public void OnBuildPlatformWinLz4() {
41504149

41514150
[MenuItem("Assets/平台打包/增量Windows(Lz4)")]
41524151
static public void OnAppendBuildPlatformWinLz4() {
4153-
BuildPlatform(eBuildPlatform.eBuildWindow, 2, false, null, true);
4152+
BuildPlatform(eBuildPlatform.eBuildWindow, 2, false, true);
41544153
}
41554154

41564155
[MenuItem("Assets/平台打包/Windows Md5(Lz4)")]
@@ -4161,7 +4160,7 @@ static public void OnBuildPlatformWinLz4Md5() {
41614160
[MenuItem("Assets/平台打包/增量Windows Md5(Lz4)")]
41624161
static public void OnAppendBuildPlatformWinLz4Md5()
41634162
{
4164-
BuildPlatform(eBuildPlatform.eBuildWindow, 2, true, null, true);
4163+
BuildPlatform(eBuildPlatform.eBuildWindow, 2, true, true);
41654164
}
41664165

41674166
[MenuItem("Assets/平台打包/OSX(Lz4)")]
@@ -4177,7 +4176,7 @@ static public void OnBuildPlatformOSXLz4Md5() {
41774176
[MenuItem("Assets/平台打包/增量OSX MD5(Lz4)")]
41784177
static public void OnAppendBuildPlatformOSXLz4Md5()
41794178
{
4180-
BuildPlatform (eBuildPlatform.eBuildMac, 2, true, null, true);
4179+
BuildPlatform (eBuildPlatform.eBuildMac, 2, true, true);
41814180
}
41824181

41834182
[MenuItem("Assets/平台打包/Android(Lz4)")]
@@ -4193,7 +4192,7 @@ static public void OnBuildPlatformAndroidLz4Md5() {
41934192
[MenuItem("Assets/平台打包/增量Android MD5(Lz4)")]
41944193
static public void OnAppendBuildPlatformAndroidLz4Md5()
41954194
{
4196-
BuildPlatform(eBuildPlatform.eBuildAndroid, 2, true, null, true);
4195+
BuildPlatform(eBuildPlatform.eBuildAndroid, 2, true, true);
41974196
}
41984197

41994198
[MenuItem("Assets/平台打包/IOS(Lz4)")]
@@ -4210,7 +4209,7 @@ static public void OnBuildPlatformIOSLz4Md5() {
42104209
[MenuItem("Assets/平台打包/增量IOS MD5(Lz4)")]
42114210
static public void OnAppendBuildPlatformIOSLz4Md5()
42124211
{
4213-
BuildPlatform (eBuildPlatform.eBuildIOS, 2, true, null, true);
4212+
BuildPlatform (eBuildPlatform.eBuildIOS, 2, true, true);
42144213
}
42154214

42164215
#endif
@@ -4448,11 +4447,8 @@ static private void Cmd_Build_AB(eBuildPlatform platform, int compressType, stri
44484447
if (!System.IO.Directory.Exists (searchProjPath)) {
44494448
System.IO.Directory.CreateDirectory (searchProjPath);
44504449
}
4451-
4452-
if (isAppend)
4453-
BuildPlatform (platform, compressType, true, null, isAppend);
4454-
else
4455-
BuildPlatform (platform, compressType, true, targetStreamingAssetsPath, isAppend);
4450+
4451+
BuildPlatform (platform, compressType, true, isAppend);
44564452
// 处理Manifest
44574453
string rootManifest = targetStreamingAssetsPath;
44584454
string copyManifest = "Assets/StreamingAssets";
@@ -4561,7 +4557,7 @@ static private void Cmd_Build(int compressType, bool isMd5, eBuildPlatform platf
45614557
// 增量
45624558
// build AssetsBundle to Target
45634559

4564-
BuildPlatform(platform, compressType, isMd5, targetStreamingAssetsPath);
4560+
BuildPlatform(platform, compressType, isMd5);
45654561
// 处理Manifest
45664562
string rootManifest = targetStreamingAssetsPath;
45674563
string copyManifest = "Assets/StreamingAssets";

0 commit comments

Comments
 (0)