Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 Core/GameEngine/Model/ConfigManager.cs

@@ -36,13 +36,13 @@
    {

        StartSyncTask<PriorBundleConfig>(AssetPath.Resource);

        StartSyncTask<PriorLanguageConfig>(AssetPath.Resource);

        StartSyncTask<LoginSeverListConfig>(AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External);

    }



    List<ConfigTask> configTasks = new List<ConfigTask>();



    public IEnumerator Co_LoadConfigs()

    {

        StartSyncTask<LoginSeverListConfig>(AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External);

        AddAsyncTask<IconConfig>();

        AddAsyncTask<ItemConfig>();

        AddAsyncTask<SkillConfig>();