From fc262fb90adea743699ef01bc625af867645eaab Mon Sep 17 00:00:00 2001
From: cehua_ZMY <1417318640@qq.com>
Date: 星期四, 20 六月 2019 14:43:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

---
 Assets/Editor/Tool/UpdateAssetBundleName.cs |    2 +-
 Assets/Editor/Tool/BuildExtersion.cs        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Editor/Tool/BuildExtersion.cs b/Assets/Editor/Tool/BuildExtersion.cs
index 731be5e..59872ec 100644
--- a/Assets/Editor/Tool/BuildExtersion.cs
+++ b/Assets/Editor/Tool/BuildExtersion.cs
@@ -252,7 +252,7 @@
                 BuiltInResourceSetting.SetLaunchBackGround(publisher, buildParameters.buildTarget);
                 BuiltInResourceSetting.SetLoginBackGround(publisher, buildParameters.buildTarget);
                 BuiltInResourceSetting.SetLoginLogo(publisher, buildParameters.buildTarget);
-                UpdateBuiltInSetting.SetAllLuaAssetBundleName();
+                UpdateBuiltInSetting.SetBuiltinAssetBundleName();
                 ExcuteBuildAsset("builtin", buildParameters);
             }
             else
diff --git a/Assets/Editor/Tool/UpdateAssetBundleName.cs b/Assets/Editor/Tool/UpdateAssetBundleName.cs
index 14da414..a16d9bf 100644
--- a/Assets/Editor/Tool/UpdateAssetBundleName.cs
+++ b/Assets/Editor/Tool/UpdateAssetBundleName.cs
@@ -445,7 +445,7 @@
     static string assetPath = "Assets/ResourcesOut/BuiltIn/";
 
     [MenuItem("绋嬪簭/璁剧疆璧勬簮鍖呭悕/鏇存柊BuiltIn(All) AssetBundleName")]
-    public static void SetAllLuaAssetBundleName()
+    public static void SetBuiltinAssetBundleName()
     {
         var allFiles = new List<FileInfo>();
         FileExtersion.GetAllDirectoryFileInfos(rootPath, allFiles);

--
Gitblit v1.8.0