2.2.6.1

DataEditorX/Core/MSE.cs

@@ -55,18 +55,21 @@ public string[] WriteSet(string file,Card[] cards)
 				foreach(Card c in cards)
 				{
 					string jpg=MyPath.Combine(pic,c.id+".jpg");
-					string jpg1=MyPath.Combine(pic,c.idString+".jpg");
-					string jpg2=MyPath.Combine(pic,c.name+".jpg");
+					string jpg2=MyPath.Combine(pic,c.idString+".jpg");
+					string jpg3=MyPath.Combine(pic,c.name+".jpg");
+					string png=MyPath.Combine(pic,c.id+".png");
+					string png2=MyPath.Combine(pic,c.idString+".png");
+					string png3=MyPath.Combine(pic,c.name+".png");
 					if(File.Exists(jpg)){
 						list.Add(jpg);
 						jpg=Path.GetFileName(jpg);
 					}
-					else if(File.Exists(jpg1)){
-						list.Add(jpg1);
-						jpg=Path.GetFileName(jpg1);
-					}
 					else if(File.Exists(jpg2)){
-						File.Copy(jpg2, jpg, true);
+						list.Add(jpg2);
+						jpg=Path.GetFileName(jpg2);
+					}
+					else if(File.Exists(jpg3)){
+						File.Copy(jpg3, jpg, true);
 						if(File.Exists(jpg)){//复制失败
 							list.Add(jpg);
 							jpg=Path.GetFileName(jpg);
@@ -74,6 +77,23 @@ public string[] WriteSet(string file,Card[] cards)
 						else
 							jpg="";
 					}
+					else if(File.Exists(png)){
+						list.Add(png);
+						jpg=Path.GetFileName(png);
+					}
+					else if(File.Exists(png2)){
+						list.Add(png2);
+						jpg=Path.GetFileName(png2);
+					}
+					else if(File.Exists(png3)){
+						File.Copy(png3, png, true);
+						if(File.Exists(png)){//复制失败
+							list.Add(png);
+							jpg=Path.GetFileName(png);
+						}
+						else
+							jpg="";
+					}
 					else
 						jpg="";
 					if(c.IsType(CardType.TYPE_SPELL)||c.IsType(CardType.TYPE_TRAP))

DataEditorX/MainForm.cs

@@ -218,6 +218,7 @@ public void OpenScript(string file)
 				InitCodeEditor(funtxt, conlua);
 			}
 			cf.SetCDBList(cdblist.ToArray());
+			cf.DockAreas = DockAreas.Document;
 			cf.InitTooltip(tooltipDic, funList.ToArray(), conList.ToArray());
 			//cf.SetIMEMode(ImeMode.Inherit);
 			cf.Show(dockPanel1, DockState.Document);
@@ -241,6 +242,7 @@ public void Open(string file)
 			if(!isInitDataEditor)
 				datacfg.Init();
 			def.InitGameData(datacfg);
+			def.DockAreas = DockAreas.Document;
 			def.FormClosed+=new FormClosedEventHandler(def_FormClosed);
 			def.Show(dockPanel1, DockState.Document);
 			list.Add(def, "");
@@ -611,6 +613,7 @@ void AddFuncTooltip(string name,string desc)
 			}
 		}
 		#endregion
+		
 		#region constant
 		void AddAutoMenuItem(List<AutocompleteItem> list,string key,string desc)
 		{

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.2.6.1")]
+[assembly: AssemblyVersion("2.2.6.2")]

DataEditorX/readme.txt

-[DataEditorX]2.2.6.1[DataEditorX]
+[DataEditorX]2.2.6.2[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联
@@ -58,6 +58,8 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.6.2
+导出MSE存档，支持png,jpg格式，支持密码，带0密码，卡名命名方式
 2.2.6.1
 修复english的race的兽战士
 导出MSE存档,添加反转/filp

win32/chinese/history.txt

 # history
-F:\games\ygopro\cards.cdb
-F:\games\ygopro\script\c33396948.lua
-F:\games\ygocore\script\c114932.lua
+F:\games\ygopro\script\c255998.lua
+F:\games\ygopro\cards.cdb
\ No newline at end of file
-F:\games\ygocore\cards (2).cdb
-F:\games\ygopro\script\c32864.lua
-F:\games\ygocore\script\constant.lua
-F:\games\ygocore\script\utility.lua
-F:\games\ygocore\script\c99995595.lua
-F:\games\ygocore\single\[sample]BerserkDragon.lua
-F:\games\ygocore\script\c131182.lua
-F:\games\ygopro\script\c123709.lua
-F:\games\ygopro\script\c191749.lua
-F:\games\ygocore\script\c135598.lua
-F:\games\ygocore\script\c126218.lua
-E:\github\DataEditorX\DataEditorX\chinese\constant.lua
-F:\games\ygocore\script\c900787.lua
-F:\single.lua
-F:\games\ygopro\script\c126218.lua
-F:\games\ygopro\script\c102380.lua
-F:\games\ygopro\script\c168917.lua
\ No newline at end of file

win32/readme.txt

-[DataEditorX]2.2.6.1[DataEditorX]
+[DataEditorX]2.2.6.2[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★文件关联
@@ -58,6 +58,8 @@ Ctrl+鼠标左键 	跳转到函数定义
 Ctrl+鼠标滑轮 	缩放文字
 
 ★更新历史
+2.2.6.2
+导出MSE存档，支持png,jpg格式，支持密码，带0密码，卡名命名方式
 2.2.6.1
 修复english的race的兽战士
 导出MSE存档,添加反转/filp