From 681aa4e909838416cb34689011b3c3a7b649cfa8 Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期四, 09 八月 2018 14:10:58 +0800
Subject: [PATCH] 修改git工程中配置表读取的行尾错误。
---
Core/GameEngine/Model/ConfigManager.cs | 6 +-----
Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index a644121..7778f95 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -403,11 +403,7 @@
{
if (_task.assetPath == AssetPath.ResourceOut)
{
- var fileInfo = new FileInfo(_task.filePath);
- var fs = fileInfo.OpenRead();
- sr = new StreamReader(fs, Encoding.UTF8);
- var content = sr.ReadToEnd();
- lines = content.Split(lineStep, StringSplitOptions.None);
+ lines = File.ReadAllLines(_task.filePath,Encoding.UTF8);
}
else if (_task.assetPath == AssetPath.External)
{
diff --git a/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta b/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta
index c8835b5..8e22d6a 100644
--- a/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta
+++ b/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta
@@ -1,8 +1,10 @@
fileFormatVersion: 2
-guid: 3c817ad288f3e2a4e92d436c3d75938e
+guid: a53e1a4c69fcb264eac797b394e065da
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.8.0