Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 Core/GameEngine/Model/ConfigManager.cs

@@ -188,6 +188,7 @@
        AddAsyncTask<OrderInfoConfig>();

        AddAsyncTask<TrialExchangeConfig>();

        AddAsyncTask<DogzDungeonConfig>();

        AddAsyncTask<TrialRewardsConfig>();



        while (!AllCompleted())

        {