Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

cehua_ZMY

2019-06-20 fc262fb90adea743699ef01bc625af867645eaab

 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