1930【1.0.15】【主干】功能预告跳转八卦炉激活，功能预告界面未关闭

client_linchunjie

2018-09-14 a0ede150686a218c92b901b1f20aef12a9913890

 Core/GameEngine/Model/ConfigManager.cs

@@ -14,7 +14,8 @@
    bool isPlaying = true;



    bool m_Inited = false;

    public bool inited {

    public bool inited

    {

        get { return m_Inited; }

        private set { m_Inited = value; }

    }

@@ -40,6 +41,7 @@
        AddAsyncTask<IconConfig>();

        AddAsyncTask<ItemConfig>();

        AddAsyncTask<SkillConfig>();

        AddAsyncTask<DirtyNameConfig>();

        AddAsyncTask<TASKINFOConfig>();

        AddAsyncTask<mapnpcConfig>();

        AddAsyncTask<LoginSeverListConfig>();

@@ -185,8 +187,13 @@
        AddAsyncTask<AllPeoplePartyAwardConfig>();

        AddAsyncTask<OrderInfoConfig>();

        AddAsyncTask<TrialExchangeConfig>();

        AddAsyncTask<DogzDungeonConfig>();

        AddAsyncTask<TrialRewardsConfig>();

        AddAsyncTask<DogzEquipPlusConfig>();

        AddAsyncTask<FairyGrabBossConfig>();

        AddAsyncTask<DungeonSpecialStateTimeConfig>();

        AddAsyncTask<DailyQuestSpecialOpenTimeConfig>();



        while (!AllCompleted())

        {

            var completedCount = 0;

@@ -294,7 +301,7 @@
        switch (Application.platform)

        {

            case RuntimePlatform.Android:

                if (DeviceUtility.cpu >= 4 && DeviceUtility.memory > 3.5f * 1024)

                if (DeviceUtility.cpu >= 4 && DeviceUtility.memory > 3.2f * 1024)

                {

                    return 4;

                }

@@ -327,7 +334,7 @@
        switch (Application.platform)

        {

            case RuntimePlatform.Android:

                if (DeviceUtility.cpu >= 4 && DeviceUtility.memory > 3.5f * 1024)

                if (DeviceUtility.cpu >= 4 && DeviceUtility.memory > 3.2f * 1024)

                {

                    return 20;

                }

@@ -478,6 +485,7 @@
    {

        if (isPlaying && _task.state == TaskState.ReadFileFailure)

        {

            Thread.Sleep(30);

            ReadFile(_task, OnEndReadFile<T>);

        }

        else

@@ -493,6 +501,7 @@
        if (isPlaying && _task.state == TaskState.ParseFailure)

        {

            Debug.LogFormat("配置表解析失败：{0}", _task.taskName);

            Thread.Sleep(30);

            ReadFile(_task, OnEndReadFile<T>);

        }

    }