From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
Core/GameEngine/Login/LaunchPostProcess.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Core/GameEngine/Login/LaunchPostProcess.cs b/Core/GameEngine/Login/LaunchPostProcess.cs
index f2c4c18..f1f3685 100644
--- a/Core/GameEngine/Login/LaunchPostProcess.cs
+++ b/Core/GameEngine/Login/LaunchPostProcess.cs
@@ -10,7 +10,7 @@
bool m_Completed = false;
public bool completed { get { return m_Completed; } set { m_Completed = value; } }
- public float progress { get { return ConfigManager.Instance.GetProgress(); } }
+ public float progress { get { return Config.Instance.GetProgress(); } }
float startTime = 0f;
@@ -18,16 +18,16 @@
{
completed = false;
startTime = Time.time;
- StartCoroutine(ConfigManager.Instance.Co_LoadConfigs());
+ StartCoroutine(Config.Instance.Co_LoadConfigs());
}
private void Update()
{
- if (!completed && ConfigManager.Instance.AllCompleted())
+ if (!completed && Config.Instance.AllCompleted())
{
try
{
- ConfigManager.Instance.ConfigParsePostProcess();
+ Config.Instance.ConfigParsePostProcess();
GeneralConfig.Instance.Init();
InGameDownLoad.Instance.ParseRewardConfig();
ModelCenter.Instance.Init();
--
Gitblit v1.8.0