Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/AssetVersion/DownLoadAndDiscompressTask.cs

@@ -20,17 +20,16 @@
    public int totalCount { get; private set; }

    public int okCount { get; private set; }

    public bool restartApp { get; private set; }

    public bool reinitedBuiltInAsset { get; private set; }



    public event Action<Step> downLoadStepChangeEvent;



    Action downLoadOkCallBack;



    Step m_Step = Step.None;

    public Step step

    {

    public Step step {

        get { return m_Step; }

        set

        {

        set {

            if (m_Step != value)

            {

                m_Step = value;

@@ -52,6 +51,7 @@
        okCount = 0;

        step = Step.DownLoadPrepared;

        restartApp = false;

        reinitedBuiltInAsset = false;

        totalSize = 0;



        for (int i = 0; i < tasks.Count; i++)

@@ -64,6 +64,11 @@
                restartApp = true;

            }

#endif



            if (!reinitedBuiltInAsset && task.relativePath.Contains("builtin"))

            {

                reinitedBuiltInAsset = true;

            }

        }



        if (totalSize > BYTE_PER_MILLIONBYTE)

@@ -123,6 +128,11 @@
        {

            SDKUtility.Instance.RestartApp();

        }



        if (reinitedBuiltInAsset)

        {

            AssetBundleUtility.Instance.ReInitBuiltInAsset();

        }

    }



    private void OnFileDownLoadCompleted(bool _ok, AssetVersion _assetVersion)