From 21a1542f9d99466b2aedd0992a1032b37b4154a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 20 八月 2018 20:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
Core/GameEngine/Model/ConfigManager.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index d24ce41..a7acb01 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -187,6 +187,7 @@
AddAsyncTask<AllPeoplePartyAwardConfig>();
AddAsyncTask<OrderInfoConfig>();
AddAsyncTask<TrialExchangeConfig>();
+ AddAsyncTask<TrialRewardsConfig>();
while (!AllCompleted())
{
@@ -244,6 +245,7 @@
StartSyncTask<IconConfig>(AssetPath.ResourceOut);
StartSyncTask<SysInfoConfig>(AssetPath.ResourceOut);
StartSyncTask<LanguageConfig>(AssetPath.ResourceOut);
+ StartSyncTask<RealmConfig>(AssetPath.ResourceOut);
}
public bool AllCompleted()
--
Gitblit v1.8.0