Merge branch 'master' into TreasureRevise

client_linchunjie

2019-02-21 11971eedb6531fa41b33111e917d877e5aed7e1a

 Core/GameEngine/Login/LaunchPostProcess.cs

@@ -2,7 +2,6 @@
using System.Collections.Generic;

using UnityEngine;

using Snxxz.UI;



using System;



[XLua.LuaCallCSharp]

@@ -11,14 +10,13 @@


    bool m_Completed = false;

    public bool completed { get { return m_Completed; } set { m_Completed = value; } }

    public float progress { get { return Mathf.Clamp01((Time.time - startTime) * 0.1f + ConfigInitiator.progress * 0.7f); } }



    float startTime = 0f;

    DateTime startTime;



    public void Begin()

    {

        completed = false;

        startTime = Time.time;

        startTime = DateTime.Now;

        ConfigInitiator.Init();

    }



@@ -26,6 +24,8 @@
    {

        if (!completed && ConfigInitiator.done)

        {

            DebugEx.LogFormat("解析配置表耗时：{0}", (DateTime.Now - startTime).TotalMilliseconds);



            try

            {

                InGameDownLoad.Instance.ParseRewardConfig();

@@ -43,8 +43,6 @@
                {

                    AssetDeCompressTask.Delete7zFiles(ResourcesPath.Instance.ExternalStorePath);

                }



                DebugEx.LogFormat("解析配置表耗时：{0}", Time.time - startTime);

            }

            catch (Exception ex)

            {