1.5.5.1

.gitignore

+Images/
 #################
 ## Eclipse
 #################

DataEditorX/DataEditForm.Designer.cs

@@ -465,7 +465,7 @@ private void InitializeComponent()
         	// 
         	// tb_pleft
         	// 
-        	this.tb_pleft.Location = new System.Drawing.Point(275, 313);
+        	this.tb_pleft.Location = new System.Drawing.Point(297, 312);
         	this.tb_pleft.MaxLength = 12;
         	this.tb_pleft.Name = "tb_pleft";
         	this.tb_pleft.Size = new System.Drawing.Size(38, 21);
@@ -475,7 +475,7 @@ private void InitializeComponent()
         	// 
         	// tb_pright
         	// 
-        	this.tb_pright.Location = new System.Drawing.Point(331, 313);
+        	this.tb_pright.Location = new System.Drawing.Point(353, 313);
         	this.tb_pright.MaxLength = 12;
         	this.tb_pright.Name = "tb_pright";
         	this.tb_pright.Size = new System.Drawing.Size(38, 21);
@@ -569,7 +569,7 @@ private void InitializeComponent()
         	// 
         	// tb_atk
         	// 
-        	this.tb_atk.Location = new System.Drawing.Point(449, 311);
+        	this.tb_atk.Location = new System.Drawing.Point(450, 311);
         	this.tb_atk.MaxLength = 12;
         	this.tb_atk.Name = "tb_atk";
         	this.tb_atk.Size = new System.Drawing.Size(38, 21);
@@ -692,7 +692,7 @@ private void InitializeComponent()
         	// lb2
         	// 
         	this.lb2.AutoSize = true;
-        	this.lb2.Location = new System.Drawing.Point(317, 317);
+        	this.lb2.Location = new System.Drawing.Point(339, 316);
         	this.lb2.Name = "lb2";
         	this.lb2.Size = new System.Drawing.Size(11, 12);
         	this.lb2.TabIndex = 7;

DataEditorX/DataEditForm.cs

@@ -1322,9 +1322,12 @@ void Pl_imageDragEnter(object sender, DragEventArgs e)
 		}
 		void InportImage(string file,string tid)
 		{
-			pl_image.BackgroundImage.Dispose();
-			pl_image.BackgroundImage=m_cover;
 			string f=Path.Combine(PICPATH,tid+".jpg");
+			if(File.Exists(f))
+			{
+				pl_image.BackgroundImage.Dispose();
+				pl_image.BackgroundImage=m_cover;
+			}
 			TaskHelper.ToImg(file,f,
 			                 Path.Combine(PICPATH2,tid+".jpg"));
 			setImage(f);

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("1.5.5.0")]
+[assembly: AssemblyVersion("1.5.5.1")]

DataEditorX/app.config

@@ -25,6 +25,6 @@
 		<add key="image_pendulum" value="14,46,149,120" />
 		<!-- MSE -->
 		<add key="mse-pendulum-text" value="】[\s\S]*?\n([\S\s]*?)\n【" />
-		<add key="mse-monster-text" value="果】\n([\S\s]*)" />
+		<add key="mse-monster-text" value="[果|介]】\n([\S\s]*)" />
 	</appSettings>
 </configuration>
\ No newline at end of file

DataEditorX/chinese/language.txt

@@ -13,7 +13,7 @@ DataEditForm->lb_atkdef ATK/DEF
 DataEditForm->lb_cardalias 同名卡
 DataEditForm->lb_cardcode 卡片密码
 DataEditForm->lb_categorys 效果种类
-DataEditForm->lb_pleft_right PScale
+DataEditForm->lb_pleft_right 灵摆刻度
 DataEditForm->lb_scripttext 
 DataEditForm->lb_tiptexts 提示文字
 DataEditForm->lb_types 卡片种类

DataEditorX/chinese/mse-pendulum.txt

@@ -12,9 +12,9 @@
 		%desc%
 	attack: %atk%
 	defense: %def%
-	gamecode: %code%
 	pendulum: medium
 	pendulum scale 1: %pl%
 	pendulum scale 2: %pr%
 	pendulum text: 
-		%pdesc%
\ No newline at end of file
+		%pdesc%
+	gamecode: %code%
\ No newline at end of file

DataEditorX/readme.txt

-[DataEditorX]1.5.5.0[DataEditorX]
+[DataEditorX]1.5.5.1[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -47,6 +47,8 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+1.5.5.1
+修复第2次导入图片，出bug
 1.5.5.0
 完成导出MSE存档，简体测试OK
 注：config设置P描述和正常描述的分离的正则表达式

win32/DataEditorX.exe.config

@@ -25,6 +25,6 @@
 		<add key="image_pendulum" value="14,46,149,120" />
 		<!-- MSE -->
 		<add key="mse-pendulum-text" value="】[\s\S]*?\n([\S\s]*?)\n【" />
-		<add key="mse-monster-text" value="果】\n([\S\s]*)" />
+		<add key="mse-monster-text" value="[果|介]】\n([\S\s]*)" />
 	</appSettings>
 </configuration>
\ No newline at end of file

win32/chinese/language.txt

@@ -13,7 +13,7 @@ DataEditForm->lb_atkdef ATK/DEF
 DataEditForm->lb_cardalias 同名卡
 DataEditForm->lb_cardcode 卡片密码
 DataEditForm->lb_categorys 效果种类
-DataEditForm->lb_pleft_right PScale
+DataEditForm->lb_pleft_right 灵摆刻度
 DataEditForm->lb_scripttext 
 DataEditForm->lb_tiptexts 提示文字
 DataEditForm->lb_types 卡片种类

win32/chinese/mse-pendulum.txt

@@ -12,9 +12,9 @@
 		%desc%
 	attack: %atk%
 	defense: %def%
-	gamecode: %code%
 	pendulum: medium
 	pendulum scale 1: %pl%
 	pendulum scale 2: %pr%
 	pendulum text: 
-		%pdesc%
\ No newline at end of file
+		%pdesc%
+	gamecode: %code%
\ No newline at end of file

win32/readme.txt

-[DataEditorX]1.5.5.0[DataEditorX]
+[DataEditorX]1.5.5.1[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -47,6 +47,8 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+1.5.5.1
+修复第2次导入图片，出bug
 1.5.5.0
 完成导出MSE存档，简体测试OK
 注：config设置P描述和正常描述的分离的正则表达式