Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 Core/GameEngine/Model/ConfigManager.cs

@@ -191,7 +191,7 @@
        AddAsyncTask<FairyGrabBossConfig>();

        AddAsyncTask<DungeonSpecialStateTimeConfig>();

        AddAsyncTask<DailyQuestSpecialOpenTimeConfig>();



        AddAsyncTask<WHYJRewardConfig>();

        while (!AllCompleted())

        {

            var completedCount = 0;

@@ -523,8 +523,7 @@
                lines = File.ReadAllLines(path, Encoding.UTF8);

                break;

            case AssetPath.External:

                var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("config/", fileName, ".txt"));

                path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, assetVersion.relativePath);

                path = AssetVersionUtility.GetAssetFilePath(StringUtility.Contact("config/", fileName, ".txt"));

                lines = File.ReadAllLines(path, Encoding.UTF8);

                break;

        }