Skip to content

Commit fd348d1

Browse files
author
None
committed
修正MAC下打包没有记录AssetBundles.xml放入fileList中
1 parent 4692c5d commit fd348d1

5 files changed

Lines changed: 19 additions & 18 deletions

File tree

‎Assembly-CSharp-Editor.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<None Include="Assets\NGUI\Examples\Atlases\Wooden\Arimo20.txt" />
144144
<None Include="Assets\NGUI\Examples\Atlases\Wooden\Arimo14.txt" />
145145
<None Include="Assets\Plugins\Android\res\values\styles.xml" />
146+
<None Include="Assets\StreamingAssets\Mac\version.txt" />
146147
<None Include="Assets\Resources\@Shaders\Lightmap-Unlit-Wind.shader" />
147-
<None Include="Assets\StreamingAssets\Mac\fileList.txt" />
148148
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 1.shader" />
149149
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored (TextureClip).shader" />
150150
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored (Packed) (TextureClip).shader" />
@@ -156,6 +156,7 @@
156156
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored (TextureClip).shader" />
157157
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Header.txt" />
158158
<None Include="Assets\Resources\@Shaders\SkyBox-Alpha Blend.shader" />
159+
<None Include="Assets\StreamingAssets\Mac\fileList.txt" />
159160
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 3.shader" />
160161
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored 1.shader" />
161162
<None Include="Assets\NGUI\Examples\Atlases\Fantasy\Fantasy Font - Normal.txt" />
@@ -166,12 +167,13 @@
166167
<None Include="Assets\Plugins\Android\res\values\strings.xml" />
167168
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 3.shader" />
168169
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 2.shader" />
169-
<None Include="Assets\StreamingAssets\Mac\AssetBundles.xml" />
170+
<None Include="Assets\StreamingAssets\Windows\version.txt" />
170171
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 1.shader" />
171172
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored 1.shader" />
172173
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored.shader" />
173174
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored.shader" />
174175
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text.shader" />
176+
<None Include="Assets\StreamingAssets\Windows\fileList.txt" />
175177
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed.shader" />
176178
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 3.shader" />
177179
<None Include="Assets\NGUI\Examples\Shaders\Unlit - Additive Colored.shader" />
@@ -181,10 +183,11 @@
181183
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text (TextureClip).shader" />
182184
<None Include="Assets\NGUI\Examples\Shaders\Unlit - Depth.shader" />
183185
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Normal.txt" />
186+
<None Include="Assets\StreamingAssets\Windows\AssetBundles.xml" />
184187
<None Include="Assets\Plugins\Android\AndroidManifest.xml" />
188+
<None Include="Assets\StreamingAssets\Mac\AssetBundles.xml" />
185189
<None Include="Assets\NGUI\Examples\Models\Orc Armor\Orc Armor.shader" />
186190
<None Include="Assets\NGUI\Examples\Resources\Localization.txt" />
187-
<None Include="Assets\StreamingAssets\Mac\version.txt" />
188191
<None Include="Assets\AssetBundles.xml" />
189192
<None Include="Assets\Plugins\Android\res\values-v14\styles.xml" />
190193
<Reference Include="UnityEditor.Advertisements">
@@ -238,10 +241,6 @@
238241
<Reference Include="UnityEditor.iOS.Extensions.Common">
239242
<HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>
240243
</Reference>
241-
</ItemGroup>
242-
<ItemGroup>
243-
<ProjectReference Include="Assembly-CSharp.csproj">
244-
<Project>{C9FDEFFB-4FAB-3868-9F69-14816408FD50}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
245244
</ItemGroup>
246245
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
247246
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎Assembly-CSharp.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@
249249
<None Include="Assets\NGUI\Examples\Atlases\Wooden\Arimo20.txt" />
250250
<None Include="Assets\NGUI\Examples\Atlases\Wooden\Arimo14.txt" />
251251
<None Include="Assets\Plugins\Android\res\values\styles.xml" />
252+
<None Include="Assets\StreamingAssets\Mac\version.txt" />
252253
<None Include="Assets\Resources\@Shaders\Lightmap-Unlit-Wind.shader" />
253-
<None Include="Assets\StreamingAssets\Mac\fileList.txt" />
254254
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 1.shader" />
255255
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored (TextureClip).shader" />
256256
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored (Packed) (TextureClip).shader" />
@@ -262,6 +262,7 @@
262262
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored (TextureClip).shader" />
263263
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Header.txt" />
264264
<None Include="Assets\Resources\@Shaders\SkyBox-Alpha Blend.shader" />
265+
<None Include="Assets\StreamingAssets\Mac\fileList.txt" />
265266
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Masked 3.shader" />
266267
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored 1.shader" />
267268
<None Include="Assets\NGUI\Examples\Atlases\Fantasy\Fantasy Font - Normal.txt" />
@@ -272,12 +273,13 @@
272273
<None Include="Assets\Plugins\Android\res\values\strings.xml" />
273274
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text 3.shader" />
274275
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 2.shader" />
275-
<None Include="Assets\StreamingAssets\Mac\AssetBundles.xml" />
276+
<None Include="Assets\StreamingAssets\Windows\version.txt" />
276277
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 1.shader" />
277278
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored 1.shader" />
278279
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Premultiplied Colored.shader" />
279280
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Colored.shader" />
280281
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text.shader" />
282+
<None Include="Assets\StreamingAssets\Windows\fileList.txt" />
281283
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed.shader" />
282284
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Transparent Packed 3.shader" />
283285
<None Include="Assets\NGUI\Examples\Shaders\Unlit - Additive Colored.shader" />
@@ -287,10 +289,11 @@
287289
<None Include="Assets\NGUI\Resources\Shaders\Unlit - Text (TextureClip).shader" />
288290
<None Include="Assets\NGUI\Examples\Shaders\Unlit - Depth.shader" />
289291
<None Include="Assets\NGUI\Examples\Atlases\SciFi\SciFi Font - Normal.txt" />
292+
<None Include="Assets\StreamingAssets\Windows\AssetBundles.xml" />
290293
<None Include="Assets\Plugins\Android\AndroidManifest.xml" />
294+
<None Include="Assets\StreamingAssets\Mac\AssetBundles.xml" />
291295
<None Include="Assets\NGUI\Examples\Models\Orc Armor\Orc Armor.shader" />
292296
<None Include="Assets\NGUI\Examples\Resources\Localization.txt" />
293-
<None Include="Assets\StreamingAssets\Mac\version.txt" />
294297
<None Include="Assets\AssetBundles.xml" />
295298
<None Include="Assets\Plugins\Android\res\values-v14\styles.xml" />
296299
<Reference Include="UnityEngine.UI">

‎Assets/Editor/ABBuild.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,7 +2232,6 @@ public bool BuildCSharpProject(string ProjFileName, string buildExe)
22322232

22332233
public void BuildCSharpProjectUpdateFile(string streamAssetsPath, string outPath, string version)
22342234
{
2235-
#if UNITY_EDITOR_WIN
22362235
/*
22372236
string unityEditorPath = GetUnityEditorPath();
22382237
if (string.IsNullOrEmpty(unityEditorPath))
@@ -2296,7 +2295,6 @@ public void BuildCSharpProjectUpdateFile(string streamAssetsPath, string outPath
22962295
bool[] firstDownArr = firstDowns.ToArray();
22972296
ExternMd5WriteToFileList(fileArr, fileListFileName1, firstDownArr);
22982297
ExternMd5WriteToFileList(fileArr, fileListFileName2, firstDownArr);
2299-
#endif
23002298
}
23012299

23022300
private void CSharpDllCopyTo(string srcDll, string dstDll)

‎Assets/StreamingAssets.meta‎

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

‎AutoBuild/.idea/workspace.xml‎

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

0 commit comments

Comments
 (0)