2.3.5.0

DataEditorX/Common/ConfHelper.cs

@@ -33,7 +33,7 @@ public static string getValue1(string word)
             int i = word.IndexOf(SEP_LINE);
             if (i > 0)
                 return word.Substring(0, i);
-            return "";
+            return word;
         }
         /// <summary>
         /// 从词中获取第二个值

DataEditorX/Core/Mse/MseMaker.cs

@@ -220,19 +220,19 @@ public static string GetDesc(string cdesc, string regx)
 			Match mc = regex.Match(desc);
 			if (mc.Success)
 				return ((mc.Groups.Count > 1) ?
-				        mc.Groups[1].Value : mc.Groups[0].Value)
-					.Trim('\n').Replace("\n", "\n\t\t");
+				        mc.Groups[1].Value : mc.Groups[0].Value);
 			return "";
 		}
 
 		public string ReText(string text)
 		{
+			text = text.Trim('\n');
 			StringBuilder sb = new StringBuilder(text);
 			sb.Replace("\r\n", "\n");
 			sb.Replace("\r", "\n");
 			sb.Replace("\n\n", "\n");
 			sb.Replace("\n", "\n\t\t");
-			return sb.ToString().Trim('\n');
+			return sb.ToString();
 		}
 		//获取星星
 		public static string GetStar(long level)
@@ -371,6 +371,7 @@ public string[] GetTypes(Card c)
 		//写存档
 		public Dictionary<Card, string> WriteSet(string file, Card[] cards)
 		{
+			MessageBox.Show(""+cfg.replaces.Keys[0]+"/"+cfg.replaces[cfg.replaces.Keys[0]]);
 			Dictionary<Card, string> list = new Dictionary<Card, string>();
 			string pic = cfg.imagepath;
 			using (FileStream fs = new FileStream(file,
@@ -417,20 +418,20 @@ string getMonster(Card c, string img, bool isPendulum)
 			{
 				string text = GetDesc(c.desc, cfg.regx_monster);
 				if (string.IsNullOrEmpty(text))
-					text = ReText(c.desc);
+					text = c.desc;
 				sb.AppendLine("	" + TAG_TEXT + ":");
 				//sb.AppendLine(cfg.regx_monster + ":" + cfg.regx_pendulum);
-				sb.AppendLine("		" + reItalic(text));
+				sb.AppendLine("		" + ReText(reItalic(text)));
 				sb.AppendLine(GetLine(TAG_PENDULUM, "medium"));
 				sb.AppendLine(GetLine(TAG_PSCALE1, ((c.level >> 0x18) & 0xff).ToString()));
 				sb.AppendLine(GetLine(TAG_PSCALE2, ((c.level >> 0x10) & 0xff).ToString()));
 				sb.AppendLine("	" + TAG_PEND_TEXT + ":");
-				sb.AppendLine("		" + reItalic(GetDesc(c.desc, cfg.regx_pendulum)));
+				sb.AppendLine("		" + ReText(reItalic(GetDesc(c.desc, cfg.regx_pendulum))));
 			}
 			else//一般怪兽
 			{
 				sb.AppendLine("	" + TAG_TEXT + ":");
-				sb.AppendLine("		" + reItalic(ReText(c.desc)));
+				sb.AppendLine("		" + ReText(reItalic(c.desc)));
 			}
 			sb.AppendLine(GetLine(TAG_ATK, (c.atk < 0) ? UNKNOWN_ATKDEF : c.atk.ToString()));
 			sb.AppendLine(GetLine(TAG_DEF, (c.def < 0) ? UNKNOWN_ATKDEF : c.def.ToString()));
@@ -449,7 +450,7 @@ string getSpellTrap(Card c, string img, bool isSpell)
 			sb.AppendLine(GetLine(TAG_LEVEL, GetSpellTrapSymbol(c, isSpell)));
 			sb.AppendLine(GetLine(TAG_IMAGE, img));
 			sb.AppendLine("	" + TAG_TEXT + ":");
-			sb.AppendLine("		" + reItalic(ReText(c.desc)));
+			sb.AppendLine("		" + ReText(reItalic(c.desc)));
 			sb.AppendLine(GetLine(TAG_CODE, c.idString));
 			return sb.ToString();
 		}

DataEditorX/Properties/AssemblyInfo.cs

@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.4.2")]
+[assembly: AssemblyVersion("2.3.5.0")]

DataEditorX/changed.txt

 ★更新历史
+2.3.5.0
+mse更新效果文本的替换，支持去除换行
 2.3.4.2
 cht's pendulum
 2.3.4.1

DataEditorX/data/mse_Japanese.txt

@@ -30,6 +30,7 @@ pendulum-text = 】[\s\S]*?\n([\S\s]*?)\n【
 monster-text = [果|介|述|報]】\n([\S\s]*)
 # en  monster-text = Text:[\s\S]*?Text:\n([\S\s]*)
 ########################### Replace
+replace = \n 
 replace = ([·]) ・
 #replace = ([鮟|鱇|・|·]) <i>$1</i>
 #replace = \s <sym-auto>^</sym-auto>

DataEditorX/readme.txt

-[DataEditorX]2.3.4.2[DataEditorX]
+[DataEditorX]2.3.5.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)

win32/changed.txt

 ★更新历史
+2.3.5.0
+mse更新效果文本的替换，支持去除换行
 2.3.4.2
 cht's pendulum
 2.3.4.1

win32/data/mse_Japanese.txt

@@ -30,6 +30,7 @@ pendulum-text = 】[\s\S]*?\n([\S\s]*?)\n【
 monster-text = [果|介|述|報]】\n([\S\s]*)
 # en  monster-text = Text:[\s\S]*?Text:\n([\S\s]*)
 ########################### Replace
+replace = \n 
 replace = ([·]) ・
 #replace = ([鮟|鱇|・|·]) <i>$1</i>
 #replace = \s <sym-auto>^</sym-auto>

win32/readme.txt

-[DataEditorX]2.3.4.2[DataEditorX]
+[DataEditorX]2.3.5.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)