From 8d06932ebf186837e048da4822bd837dbf90e212 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into ViewOtherPlayer
---
Core/GameEngine/Model/Config/ContinueSignInConfig.cs | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ContinueSignInConfig.cs b/Core/GameEngine/Model/Config/ContinueSignInConfig.cs
index 2a98c6e..a01b832 100644
--- a/Core/GameEngine/Model/Config/ContinueSignInConfig.cs
+++ b/Core/GameEngine/Model/Config/ContinueSignInConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: Fish
-// [ Date ]: 2019骞�2鏈�13鏃�
+// [ Date ]: Thursday, February 14, 2019
//--------------------------------------------------------
using System.Collections.Generic;
@@ -9,6 +9,7 @@
using System;
using UnityEngine;
+[XLua.LuaCallCSharp]
public partial class ContinueSignInConfig
{
@@ -121,7 +122,7 @@
}
public static bool inited { get; private set; }
- protected static Dictionary<string, string> rawDatas = null;
+ protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
public static void Init(bool sync=false)
{
inited = false;
@@ -147,17 +148,30 @@
}
for (int i = 3; i < lines.Length; i++)
{
- var line = lines[i];
- var index = line.IndexOf("\t");
- var id = line.Substring(0, index);
+ try
+ {
+ var line = lines[i];
+ var index = line.IndexOf("\t");
+ if (index == -1)
+ {
+ continue;
+ }
+ var id = line.Substring(0, index);
- if (preParse)
+ if (preParse)
+ {
+ var config = new ContinueSignInConfig(line);
+ configs[id] = config;
+ (config as IConfigPostProcess).OnConfigParseCompleted();
+ }
+ else
+ {
+ rawDatas[id] = line;
+ }
+ }
+ catch (System.Exception ex)
{
- configs[id] = new ContinueSignInConfig(line);
- }
- else
- {
- rawDatas[id] = line;
+ Debug.LogError(ex);
}
}
inited = true;
@@ -173,18 +187,31 @@
}
for (int i = 3; i < lines.Length; i++)
{
- var line = lines[i];
- var index = line.IndexOf("\t");
- var id = line.Substring(0, index);
+ try
+ {
+ var line = lines[i];
+ var index = line.IndexOf("\t");
+ if (index == -1)
+ {
+ continue;
+ }
+ var id = line.Substring(0, index);
- if (preParse)
- {
- configs[id] = new ContinueSignInConfig(line);
+ if (preParse)
+ {
+ var config = new ContinueSignInConfig(line);
+ configs[id] = config;
+ (config as IConfigPostProcess).OnConfigParseCompleted();
+ }
+ else
+ {
+ rawDatas[id] = line;
+ }
}
- else
- {
- rawDatas[id] = line;
- }
+ catch (System.Exception ex)
+ {
+ Debug.LogError(ex);
+ }
}
inited = true;
--
Gitblit v1.8.0