From 23fb78319baa7e571d25b3bbdcee06401c62550d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 11 八月 2018 10:25:00 +0800
Subject: [PATCH] 1539 【BUG】打宝世界Boss界面出错
---
Core/GameEngine/Model/ConfigManager.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 08d4ec8..716d56b 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -10,11 +10,8 @@
public class ConfigManager : Singleton<ConfigManager>
{
- public static string CustomIV = "4vHKRj3yfzU=";
- public static string CustomKey = "xhVs6DRXLfUGxw+AhtfQdpQGoa+8SA9d";
-
- protected string[] lineStep = new string[] { "\r\n","\n" }; //琛岄棿闅斾綋
- protected string[] rowStep = new string[] { "\t" }; //娈甸棿闅斾綋
+ public readonly static string CustomIV = "4vHKRj3yfzU=";
+ public readonly static string CustomKey = "xhVs6DRXLfUGxw+AhtfQdpQGoa+8SA9d";
bool isPlaying = true;
@@ -403,7 +400,7 @@
{
if (_task.assetPath == AssetPath.ResourceOut)
{
- lines = File.ReadAllLines(_task.filePath,Encoding.UTF8);
+ lines = File.ReadAllLines(_task.filePath, Encoding.UTF8);
}
else if (_task.assetPath == AssetPath.External)
{
@@ -422,7 +419,8 @@
var crypS = new CryptoStream(tableMs, decryptor, CryptoStreamMode.Read);
sr = new StreamReader(crypS, Encoding.UTF8);
var content = sr.ReadToEnd();
- lines = content.Split(lineStep, StringSplitOptions.None);
+
+ lines = content.Split(new string[] { "\r\n" }, StringSplitOptions.None);
}
_task.state = TaskState.ReadFileSuccess;
@@ -457,7 +455,7 @@
var container = _task.container as Dictionary<string, ConfigBase>;
for (int i = 3; i < _task.contentLines.Length; i++)
{
- var contents = _task.contentLines[i].Split(rowStep, StringSplitOptions.None);
+ var contents = _task.contentLines[i].Split(new string[] { "\t" }, StringSplitOptions.None);
if (contents.Length <= 1)
{
continue;
@@ -537,7 +535,7 @@
case AssetPath.Resource:
path = StringUtility.Contact("Config/", fileName);
var textAsset = Resources.Load<TextAsset>(path);
- lines = textAsset.text.Split(lineStep, StringSplitOptions.None);
+ lines = textAsset.text.Split(new string[] { "\r\n" }, StringSplitOptions.None);
break;
case AssetPath.ResourceOut:
path = StringUtility.Contact(ResourcesPath.CONFIG_FODLER, "/", fileName, ".txt");
@@ -562,7 +560,7 @@
var crypS = new CryptoStream(ms, decryptor, CryptoStreamMode.Read);
var sr = new StreamReader(crypS, Encoding.UTF8);
var content = sr.ReadToEnd();
- lines = content.Split(lineStep, StringSplitOptions.None);
+ lines = content.Split(new string[] { "\r\n" }, StringSplitOptions.None);
break;
}
@@ -591,7 +589,7 @@
{
for (int i = 3; i < _task.contentLines.Length; i++)
{
- var contents = _task.contentLines[i].Split(rowStep, StringSplitOptions.None);
+ var contents = _task.contentLines[i].Split(new string[] { "\t" }, StringSplitOptions.None);
if (contents.Length <= 1)
{
continue;
--
Gitblit v1.8.0