Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
2han9B1a0 2020-07-07 10:57:34 +08:00
commit 504e6010e3
2 changed files with 32 additions and 4 deletions

View File

@ -415,7 +415,7 @@ internal sealed class XmlWorksheetReader : IDisposable
if (Reader.IsStartElement(NC, NsSpreadsheetMl))
{
var item = ReadCell(ref columnIndex);
if(item != null)
if (item != null)
{
cell[columnIndex] = item;
}
@ -499,7 +499,35 @@ internal sealed class XmlWorksheetReader : IDisposable
string rawValue = null;
while (!Reader.EOF)
{
if (Reader.IsStartElement(NV, NsSpreadsheetMl))
if (aT == NInlineStr && Reader.IsStartElement(NIs, NsSpreadsheetMl))
{
if (!XmlReaderHelper.ReadFirstContent(Reader))
{
continue;
}
while (!Reader.EOF)
{
if (Reader.IsStartElement(AT))
{
rawValue = Reader.ReadElementContentAsString();
if (Reader.NodeType == XmlNodeType.EndElement)
{
// 这里要读两次跳出<is>和<t>两个标签
Reader.Read();
Reader.Read();
}
return rawValue;
}
else if (!XmlReaderHelper.SkipContent(Reader))
{
break;
}
}
}
else if (Reader.IsStartElement(NV, NsSpreadsheetMl))
{
if (aT == AS)
{

View File

@ -19,8 +19,8 @@ namespace Assets.Scripts.Editor.LanguageTool
private static int IDFlag = 10000;
// excel 路径
private static string PrefrabCSVPath = Environment.CurrentDirectory + "/data_execl/excelTool/Export/LanguageText.csv";
private static string LuaCSVPath = Environment.CurrentDirectory + "/data_execl/excelTool/Export/LanguageLua.csv";
private static string PrefrabCSVPath = Environment.CurrentDirectory + "/data_execl/Language_data/LanguageText.csv";
private static string LuaCSVPath = Environment.CurrentDirectory + "/data_execl/Language_data/LanguageLua.csv";
// prefrab 路径
private static string[] PrefrabPath = new string[] { "Assets/ManagedResources/Prefabs/UI", "Assets/ManagedResources/UpdatePanel" };