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

client_Zxw

2018-08-24 0e3ecea60bf85eb59bfd0479eac08a1acd14608f

 Core/GameEngine/Login/Launch.cs

@@ -13,9 +13,11 @@
    static public LaunchStage currentStage { get { return m_CurrentStage; } }



    static float m_Progress = 0f;

    static public float progress {

    static public float progress

    {

        get { return m_Progress; }

        set {

        set

        {

            if (m_Progress != value)

            {

                m_Progress = value;

@@ -69,12 +71,9 @@
    IEnumerator Co_Lanuch()

    {

#if !UNITY_EDITOR

        if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)

        {

            while (!SDKUtility.Instance.InitFinished)

            {

                yield return null;

            }

        }

#endif

        var cpu = 2;