Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 fdb2bd928c43e8efa39586b4309ae2b9a892ceef

 Assets/Editor/Tool/BuildExtersion.cs

@@ -86,7 +86,7 @@
            {

                UpdateScriptableObjectsSetting.SetAllScriptableObjectAssetBundleName();

                ExcuteBuildAsset("config", buildParameters);

                TableTool.ReadAllTxtToBytes(StringUtility.Contact(buildParameters.GetWholeOutPutPath(), "/config"));

                TableTool.CopyConfigsToOutPutPath(StringUtility.Contact(buildParameters.GetWholeOutPutPath(), "/config"));

            }

            else

            {

@@ -175,6 +175,32 @@
        }

    }



    public static void BuildBuiltIn()

    {

        try

        {

            var buildParameters = new BuildParameters();

            if (!buildParameters.error)

            {

                var publisher = buildParameters.publisher;

                BuiltInResourceSetting.SetLaunchBackGround(publisher, buildParameters.buildTarget);

                BuiltInResourceSetting.SetLoginBackGround(publisher, buildParameters.buildTarget);

                BuiltInResourceSetting.SetLoginLogo(publisher, buildParameters.buildTarget);

                ExcuteBuildAsset("builtin", buildParameters);

            }

            else

            {

                EditorApplication.Exit(1);

            }

        }

        catch (Exception ex)

        {

            Debug.Log("打包builtin失败");

            Debug.Log(ex);

            EditorApplication.Exit(1);

        }

    }



    public static void MakeAssetVersionFile()

    {

        try

@@ -212,6 +238,7 @@
    {

        public bool error = false;

        public string outputPath;

        public string publisher;

        public BuildTarget buildTarget;



        public BuildParameters()

@@ -238,6 +265,10 @@
                                break;

                        }

                    }

                    else if (arg.ToLower() == "-publisher")

                    {

                        publisher = args[i + 1];

                    }

                }



                error = false;