From 7277904a49ffc1d358040cfaf6206cb6e59512d9 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 21 八月 2018 11:14:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/ConfigManager.cs | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index a7acb01..82dbee8 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -373,7 +373,7 @@
}
else
{
- path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/", fileName, ".bytes");
+ path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/", fileName, ".txt");
}
var task = new ConfigTask(typeof(T), AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External, path);
@@ -396,35 +396,9 @@
(object _obj) =>
{
string[] lines = null;
- StreamReader sr = null;
-
try
{
- if (_task.assetPath == AssetPath.ResourceOut)
- {
- lines = File.ReadAllLines(_task.filePath, Encoding.UTF8);
- }
- else if (_task.assetPath == AssetPath.External)
- {
- var tripleDESCryptoServiceProvider = new TripleDESCryptoServiceProvider();
- tripleDESCryptoServiceProvider.Key = Convert.FromBase64String(CustomKey);
- tripleDESCryptoServiceProvider.IV = Convert.FromBase64String(CustomIV);
- tripleDESCryptoServiceProvider.Mode = CipherMode.CBC;
- tripleDESCryptoServiceProvider.Padding = PaddingMode.PKCS7;
- var decryptor = tripleDESCryptoServiceProvider.CreateDecryptor();
-
- var expectedSteam = new FileStream(_task.filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
- var bytes = new byte[expectedSteam.Length];
- expectedSteam.Read(bytes, 0, bytes.Length);
- var tableMs = new MemoryStream(bytes);
-
- var crypS = new CryptoStream(tableMs, decryptor, CryptoStreamMode.Read);
- sr = new StreamReader(crypS, Encoding.UTF8);
- var content = sr.ReadToEnd();
-
- lines = content.Split(new string[] { "\r\n" }, StringSplitOptions.None);
- }
-
+ lines = File.ReadAllLines(_task.filePath, Encoding.UTF8);
_task.state = TaskState.ReadFileSuccess;
}
catch (Exception ex)
--
Gitblit v1.8.0