Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-21 e5530e1ca1f28ab70c783d2b3ec685bb6569504b

 Core/GameEngine/Model/ConfigManager.cs

@@ -214,6 +214,9 @@
        AddAsyncTask<FuncSwitchConfig>();

        AddAsyncTask<AncientRobotNameConfig>();

        AddAsyncTask<CrossServerArenaConfig>();

        AddAsyncTask<GatherSoulConfig>();

        AddAsyncTask<GatherSoulPropertyConfig>();

        AddAsyncTask<GatherSoulComposeConfig>();



        while (!AllCompleted())

        {