2.1.3.0

DataEditorX/Core/Card.cs

@@ -86,7 +86,7 @@ public override bool Equals(object obj)
 		/// </summary>
 		public override string ToString()
 		{
-			return string.Format("{0} [{1}]", id.ToString("00000000"), name);
+			return string.Format("{0} [{1}]", idString, name);
 		}
 		public bool EqualsData(Card other)
 		{
@@ -113,6 +113,10 @@ public bool EqualsData(Card other)
 				equalBool = false;
 			else if (this.category != other.category)
 				equalBool = false;
+			else if (!this.name.Equals(other.name))
+				equalBool = false;
+			else if (!this.desc.Equals(other.desc))
+				equalBool = false;
 			return equalBool;
 		}
 		/// <summary>
@@ -125,10 +129,6 @@ public bool Equals(Card other)
 			bool equalBool=EqualsData(other);
 			if(!equalBool)
 				return false;
-			else if (!this.name.Equals(other.name))
-				equalBool = false;
-			else if (!this.desc.Equals(other.desc))
-				equalBool = false;
 			else if (this.str.Length != other.str.Length)
 				equalBool = false;
 			else
@@ -168,6 +168,11 @@ public override int GetHashCode()
 			return false;
 		}
 		
+		public string idString
+		{
+			get{return id.ToString("00000000");}
+		}
+		
 		public bool IsSetCode(long sc)
 		{
 			if((this.setcode&0xffff)==sc)

DataEditorX/Core/DataBase.cs

@@ -351,7 +351,7 @@ public static string GetSelectSQL(Card c)
 			if(!string.IsNullOrEmpty(c.desc))
 				sb.Append(" and texts.desc like '%"+c.desc+"%' ");
 			if(c.ot>0)
-				sb.Append(" and datas.ot & "+c.ot.ToString()+" = "+c.ot.ToString());
+				sb.Append(" and datas.ot = "+c.ot.ToString());
 			if(c.attribute>0)
 				sb.Append(" and datas.attribute & "+c.attribute.ToString()+" = "+c.attribute.ToString());
 			if(c.level>0)

DataEditorX/Core/MSE.cs

@@ -44,7 +44,12 @@ public string[] WriteSet(string file,Card[] cards,string pic)
 				foreach(Card c in cards)
 				{
 					string jpg=Path.Combine(pic,c.id+".jpg");
-					if(File.Exists(jpg)){
+					string jpg1=Path.Combine(pic,c.idString+".jpg");
+					if(File.Exists(jpg1)){
+						list.Add(jpg1);
+						jpg=Path.GetFileName(jpg1);
+					}
+					else if(File.Exists(jpg)){
 						list.Add(jpg);
 						jpg=Path.GetFileName(jpg);
 					}
@@ -93,7 +98,7 @@ string getMonster(Card c,string img,bool isPendulum)
 			sb.Replace("%atk%", (c.atk<0)?"?":c.atk.ToString());
 			sb.Replace("%def%", (c.def<0)?"?":c.def.ToString());
 			
-			sb.Replace("%code%", conv.Code(c.id));
+			sb.Replace("%code%", c.idString);
 			return sb.ToString();
 		}
 		string getSpellTrap(Card c,string img,bool isSpell)
@@ -105,7 +110,7 @@ string getSpellTrap(Card c,string img,bool isSpell)
 			sb.Replace("%level%", conv.GetST(c, isSpell));
 			sb.Replace("%image%", img);
 			sb.Replace("%desc%", conv.ReDesc(c.desc));
-			sb.Replace("%code%", conv.Code(c.id));
+			sb.Replace("%code%", c.idString);
 			return sb.ToString();
 		}
 	}

DataEditorX/Core/MSEConvert.cs

@@ -42,11 +42,6 @@ public class MSEConvert
 			mRacedic = racedic;
 			cfg=_cfg;
 		}
-		
-		public string Code(long id)
-		{
-			return id.ToString("00000000");
-		}
 		public string GetST(Card c,bool isSpell)
 		{
 			string level;

DataEditorX/Core/TaskHelper.cs

@@ -212,6 +212,8 @@ public void ExportData(string cdbfile)
 			string path=Path.GetDirectoryName(cdbfile);
 			string name=Path.GetFileNameWithoutExtension(cdbfile);
 			string zipname=Path.Combine(path, name+".zip");
+			string readme=Path.Combine(path, name+".txt");
+			string deckydk=Path.Combine(path, "deck/"+name+".ydk");
 			string pics=Path.Combine(path,"pics");
 			string thumb=Path.Combine(pics,"thumbnail");
 			string script=Path.Combine(path,"script");
@@ -221,6 +223,10 @@ public void ExportData(string cdbfile)
 			using(ZipStorer zips=ZipStorer.Create(zipname, ""))
 			{
 				zips.AddFile(cdbfile, name+".cdb","");
+				if(File.Exists(readme))
+					zips.AddFile(readme, "readme_"+name+".txt","");
+				if(File.Exists(deckydk))
+					zips.AddFile(deckydk, "deck/"+name+".ydk","");
 				foreach(Card c in cards)
 				{
 					i++;

DataEditorX/DataEditForm.Designer.cs

@@ -47,15 +47,17 @@ private void InitializeComponent()
         	this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
         	this.menuitem_quit = new System.Windows.Forms.ToolStripMenuItem();
         	this.menu_tools = new System.Windows.Forms.ToolStripMenuItem();
-        	this.menuitem_compdb = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_readydk = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_readimages = new System.Windows.Forms.ToolStripMenuItem();
+        	this.menuitem_compdb = new System.Windows.Forms.ToolStripMenuItem();
+        	this.menuitem_exportdata = new System.Windows.Forms.ToolStripMenuItem();
         	this.tsep5 = new System.Windows.Forms.ToolStripSeparator();
         	this.menuitem_saveasmse_select = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_saveasmse = new System.Windows.Forms.ToolStripMenuItem();
         	this.tsep3 = new System.Windows.Forms.ToolStripSeparator();
         	this.menuitem_cutimages = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_convertimage = new System.Windows.Forms.ToolStripMenuItem();
+        	this.menuitem_importmseimg = new System.Windows.Forms.ToolStripMenuItem();
         	this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
         	this.menuitem_cancelTask = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuitem_help = new System.Windows.Forms.ToolStripMenuItem();
@@ -113,7 +115,6 @@ private void InitializeComponent()
         	this.tb_setcode3 = new System.Windows.Forms.TextBox();
         	this.tb_setcode4 = new System.Windows.Forms.TextBox();
         	this.lb_cardcode = new System.Windows.Forms.Label();
-        	this.menuitem_exportdata = new System.Windows.Forms.ToolStripMenuItem();
         	this.menuStrip1.SuspendLayout();
         	this.SuspendLayout();
         	// 
@@ -211,19 +212,13 @@ private void InitializeComponent()
         	        	        	this.tsep3,
         	        	        	this.menuitem_cutimages,
         	        	        	this.menuitem_convertimage,
+        	        	        	this.menuitem_importmseimg,
         	        	        	this.toolStripSeparator1,
         	        	        	this.menuitem_cancelTask});
         	this.menu_tools.Name = "menu_tools";
         	this.menu_tools.Size = new System.Drawing.Size(67, 21);
         	this.menu_tools.Text = "Tools(&T)";
         	// 
-        	// menuitem_compdb
-        	// 
-        	this.menuitem_compdb.Name = "menuitem_compdb";
-        	this.menuitem_compdb.Size = new System.Drawing.Size(212, 22);
-        	this.menuitem_compdb.Text = "Compression DataBase";
-        	this.menuitem_compdb.Click += new System.EventHandler(this.Menuitem_compdbClick);
-        	// 
         	// menuitem_readydk
         	// 
         	this.menuitem_readydk.Name = "menuitem_readydk";
@@ -238,6 +233,20 @@ private void InitializeComponent()
         	this.menuitem_readimages.Text = "Cards From Images(&I)";
         	this.menuitem_readimages.Click += new System.EventHandler(this.Menuitem_readimagesClick);
         	// 
+        	// menuitem_compdb
+        	// 
+        	this.menuitem_compdb.Name = "menuitem_compdb";
+        	this.menuitem_compdb.Size = new System.Drawing.Size(212, 22);
+        	this.menuitem_compdb.Text = "Compression DataBase";
+        	this.menuitem_compdb.Click += new System.EventHandler(this.Menuitem_compdbClick);
+        	// 
+        	// menuitem_exportdata
+        	// 
+        	this.menuitem_exportdata.Name = "menuitem_exportdata";
+        	this.menuitem_exportdata.Size = new System.Drawing.Size(212, 22);
+        	this.menuitem_exportdata.Text = "Export Data";
+        	this.menuitem_exportdata.Click += new System.EventHandler(this.Menuitem_exportdataClick);
+        	// 
         	// tsep5
         	// 
         	this.tsep5.Name = "tsep5";
@@ -273,9 +282,16 @@ private void InitializeComponent()
         	// 
         	this.menuitem_convertimage.Name = "menuitem_convertimage";
         	this.menuitem_convertimage.Size = new System.Drawing.Size(212, 22);
-        	this.menuitem_convertimage.Text = "Inport Images";
+        	this.menuitem_convertimage.Text = "Import Images";
         	this.menuitem_convertimage.Click += new System.EventHandler(this.Menuitem_convertimageClick);
         	// 
+        	// menuitem_importmseimg
+        	// 
+        	this.menuitem_importmseimg.Name = "menuitem_importmseimg";
+        	this.menuitem_importmseimg.Size = new System.Drawing.Size(212, 22);
+        	this.menuitem_importmseimg.Text = "Drop Image to MSE";
+        	this.menuitem_importmseimg.Click += new System.EventHandler(this.Menuitem_importmseimgClick);
+        	// 
         	// toolStripSeparator1
         	// 
         	this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -884,13 +900,6 @@ private void InitializeComponent()
         	this.lb_cardcode.TabIndex = 7;
         	this.lb_cardcode.Text = "Card Code";
         	// 
-        	// menuitem_exportdata
-        	// 
-        	this.menuitem_exportdata.Name = "menuitem_exportdata";
-        	this.menuitem_exportdata.Size = new System.Drawing.Size(212, 22);
-        	this.menuitem_exportdata.Text = "Export Data";
-        	this.menuitem_exportdata.Click += new System.EventHandler(this.Menuitem_exportdataClick);
-        	// 
         	// DataEditForm
         	// 
         	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -959,6 +968,7 @@ private void InitializeComponent()
         	this.ResumeLayout(false);
         	this.PerformLayout();
         }
+        private System.Windows.Forms.ToolStripMenuItem menuitem_importmseimg;
         private System.Windows.Forms.ToolStripMenuItem menuitem_exportdata;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;

DataEditorX/DataEditForm.cs

@@ -362,7 +362,11 @@ void SetCard(Card c)
 			tb_def.Text=(c.def<0)?"?":c.def.ToString();
 			tb_cardcode.Text=c.id.ToString();
 			tb_cardalias.Text=c.alias.ToString();
-			string f=Path.Combine(PICPATH, c.id.ToString()+".jpg");
+			string f;
+			if(menuitem_importmseimg.Checked)
+				f=Path.Combine(IMAGEPATH, c.id.ToString()+".jpg");
+			else
+				f=Path.Combine(PICPATH, c.id.ToString()+".jpg");
 			setImage(f);
 		}
 		
@@ -1433,16 +1437,34 @@ void Pl_imageDragEnter(object sender, DragEventArgs e)
 			else
 				e.Effect = DragDropEffects.None;
 		}
+		void Menuitem_importmseimgClick(object sender, EventArgs e)
+		{
+			bool ischk=menuitem_importmseimg.Checked;
+			if(ischk){
+				pl_image.BackgroundImageLayout= ImageLayout.Stretch;
+			}else{
+				pl_image.BackgroundImageLayout= ImageLayout.Center;
+			}
+			menuitem_importmseimg.Checked=!ischk;
+		}
 		void InportImage(string file,string tid)
 		{
-			string f=Path.Combine(PICPATH,tid+".jpg");
+			string f;
+			bool isPics=!menuitem_importmseimg.Checked;
+			if(isPics)
+				f=Path.Combine(IMAGEPATH, tid+".jpg");
+			else
+				f=Path.Combine(PICPATH,tid+".jpg");
 			if(File.Exists(f))
 			{
 				pl_image.BackgroundImage.Dispose();
 				pl_image.BackgroundImage=m_cover;
 			}
-			tasker.ToImg(file,f,
-			             Path.Combine(PICPATH2,tid+".jpg"));
+			if(isPics)
+				tasker.ToImg(file,f,
+				             Path.Combine(PICPATH2,tid+".jpg"));
+			else
+				File.Copy(file, f, true);
 			setImage(f);
 		}
 		void setImage(string f){
@@ -1499,19 +1521,16 @@ void Menuitem_exportdataClick(object sender, EventArgs e)
 		/// <param name="cards"></param>
 		/// <param name="card"></param>
 		/// <returns></returns>
-		bool CheckCard(Card[] cards,Card card,bool checktext)
+		bool CheckCard(Card[] cards,Card card,bool checkinfo)
 		{
 			foreach(Card c in cards)
 			{
 				if(c.id!=card.id)
 					continue;
 				//data数据不一样
-				bool isSame=false;
-				if(checktext)
-					isSame=card.Equals(c);
+				if(checkinfo)
+					return card.EqualsData(c);
 				else
-					isSame=card.EqualsData(c);
-				if(isSame)
 					return true;
 			}
 			return false;
@@ -1546,5 +1565,6 @@ public void CompareCards(string cdbfile,bool checktext)
 			SetCards(getCompCards(), false);
 		}
 		#endregion
+		
 	}
 }

DataEditorX/MainForm.Designer.cs

@@ -63,13 +63,15 @@ private void InitializeComponent()
 			this.menuitem_comp2 = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
 			this.menuitem_quit = new System.Windows.Forms.ToolStripMenuItem();
-			this.menuitem_history = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_windows = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_dataeditor = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
 			this.menuitem_close = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_closeother = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuitem_closeall = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuitem_history = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+			this.menuitem_copyall = new System.Windows.Forms.ToolStripMenuItem();
 			this.menuStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -132,7 +134,6 @@ private void InitializeComponent()
 			// 
 			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
 									this.menuitem_file,
-									this.menuitem_history,
 									this.menuitem_windows});
 			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
 			this.menuStrip1.MdiWindowListItem = this.menuitem_windows;
@@ -148,11 +149,14 @@ private void InitializeComponent()
 									this.menuitem_new,
 									this.toolStripSeparator3,
 									this.menuitem_copyselect,
+									this.menuitem_copyall,
 									this.menuitem_pastecards,
 									this.toolStripSeparator4,
 									this.menuitem_comp1,
 									this.menuitem_comp2,
 									this.toolStripSeparator1,
+									this.menuitem_history,
+									this.toolStripSeparator5,
 									this.menuitem_quit});
 			this.menuitem_file.Name = "menuitem_file";
 			this.menuitem_file.Size = new System.Drawing.Size(53, 21);
@@ -229,12 +233,6 @@ private void InitializeComponent()
 			this.menuitem_quit.Text = "Quit";
 			this.menuitem_quit.Click += new System.EventHandler(this.QuitToolStripMenuItemClick);
 			// 
-			// menuitem_history
-			// 
-			this.menuitem_history.Name = "menuitem_history";
-			this.menuitem_history.Size = new System.Drawing.Size(78, 21);
-			this.menuitem_history.Text = "History(&H)";
-			// 
 			// menuitem_windows
 			// 
 			this.menuitem_windows.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -250,36 +248,54 @@ private void InitializeComponent()
 			// menuitem_dataeditor
 			// 
 			this.menuitem_dataeditor.Name = "menuitem_dataeditor";
-			this.menuitem_dataeditor.Size = new System.Drawing.Size(145, 22);
+			this.menuitem_dataeditor.Size = new System.Drawing.Size(152, 22);
 			this.menuitem_dataeditor.Text = "DataEditor";
 			this.menuitem_dataeditor.Click += new System.EventHandler(this.DataEditorToolStripMenuItemClick);
 			// 
 			// toolStripSeparator2
 			// 
 			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(142, 6);
+			this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
 			// 
 			// menuitem_close
 			// 
 			this.menuitem_close.Name = "menuitem_close";
-			this.menuitem_close.Size = new System.Drawing.Size(145, 22);
+			this.menuitem_close.Size = new System.Drawing.Size(152, 22);
 			this.menuitem_close.Text = "Close";
 			this.menuitem_close.Click += new System.EventHandler(this.CloseToolStripMenuItemClick);
 			// 
 			// menuitem_closeother
 			// 
 			this.menuitem_closeother.Name = "menuitem_closeother";
-			this.menuitem_closeother.Size = new System.Drawing.Size(145, 22);
+			this.menuitem_closeother.Size = new System.Drawing.Size(152, 22);
 			this.menuitem_closeother.Text = "Close Other";
 			this.menuitem_closeother.Click += new System.EventHandler(this.CloseOtherToolStripMenuItemClick);
 			// 
 			// menuitem_closeall
 			// 
 			this.menuitem_closeall.Name = "menuitem_closeall";
-			this.menuitem_closeall.Size = new System.Drawing.Size(145, 22);
+			this.menuitem_closeall.Size = new System.Drawing.Size(152, 22);
 			this.menuitem_closeall.Text = "Close All";
 			this.menuitem_closeall.Click += new System.EventHandler(this.CloseAllToolStripMenuItemClick);
 			// 
+			// menuitem_history
+			// 
+			this.menuitem_history.Name = "menuitem_history";
+			this.menuitem_history.Size = new System.Drawing.Size(261, 22);
+			this.menuitem_history.Text = "History(&H)";
+			// 
+			// toolStripSeparator5
+			// 
+			this.toolStripSeparator5.Name = "toolStripSeparator5";
+			this.toolStripSeparator5.Size = new System.Drawing.Size(258, 6);
+			// 
+			// menuitem_copyall
+			// 
+			this.menuitem_copyall.Name = "menuitem_copyall";
+			this.menuitem_copyall.Size = new System.Drawing.Size(261, 22);
+			this.menuitem_copyall.Text = "Copy All Cards";
+			this.menuitem_copyall.Click += new System.EventHandler(this.Menuitem_copyallClick);
+			// 
 			// MainForm
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -299,6 +315,8 @@ private void InitializeComponent()
 			this.ResumeLayout(false);
 			this.PerformLayout();
 		}
+		private System.Windows.Forms.ToolStripMenuItem menuitem_copyall;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.ToolStripMenuItem menuitem_comp2;
 		private System.Windows.Forms.ToolStripMenuItem menuitem_comp1;

DataEditorX/MainForm.cs

@@ -339,6 +339,18 @@ void Menuitem_copyselecttoClick(object sender, EventArgs e)
 				}
 			}
 		}
+		void Menuitem_copyallClick(object sender, EventArgs e)
+		{
+			DataEditForm df =GetActive();
+			if(df!=null)
+			{
+				tCards=df.getCardList(false);
+				if(tCards!=null){
+					SetCopyNumber(tCards.Length);
+					MyMsg.Show(LMSG.CopyCards);
+				}
+			}
+		}
 		void SetCopyNumber(int c)
 		{
 			string tmp=menuitem_pastecards.Text;
@@ -362,6 +374,7 @@ void Menuitem_pastecardsClick(object sender, EventArgs e)
 		
 		#endregion
 		
+		#region compare
 		void Menuitem_comp1Click(object sender, EventArgs e)
 		{
 			compare1 = GetActive();
@@ -398,5 +411,7 @@ void Menuitem_comp2Click(object sender, EventArgs e)
 				CompareDB();
 			}
 		}
+		#endregion
+
 	}
 }

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

DataEditorX/chinese/language-dataeditor.txt

@@ -27,6 +27,7 @@ DataEditForm->menuitem_exportdata 导出所有卡片数据为zip
 DataEditForm->menuitem_cancelTask 取消当前任务
 DataEditForm->menuitem_compdb 压缩当前数据库
 DataEditForm->menuitem_convertimage 批量导入卡图
+DataEditForm->menuitem_importmseimg MSE图片库
 DataEditForm->menuitem_openLastDataBase 最后打开的数据库
 DataEditForm->menuitem_cutimages 裁剪列表卡片的图片
 DataEditForm->menuitem_saveasmse_select 所选卡片导出MSE存档

DataEditorX/chinese/language-mainform.txt

@@ -2,6 +2,7 @@
 MainForm->menuitem_new 新建(&N)
 MainForm->menuitem_open 打开(&O)
 MainForm->menuitem_copyselect 复制所选卡片
+MainForm->menuitem_copyall 复制所有卡片
 MainForm->menuitem_pastecards 粘贴卡片
 MainForm->menuitem_comp1 对比-卡片数据 1
 MainForm->menuitem_comp2 对比-卡片数据 2

DataEditorX/chinese/message.txt

@@ -62,5 +62,5 @@
 0x3d	清空历史记录
 0x3e	正在导出数据
 0x3f	导出数据完成
-0x40	是否对比卡片文字信息？
+0x40	是否对比卡片信息？
 0x41	对比完成
\ No newline at end of file

DataEditorX/english/language-dataeditor.txt

@@ -26,7 +26,8 @@ DataEditForm->menu_tools Tools
 DataEditForm->menuitem_exportdata Export Data
 DataEditForm->menuitem_cancelTask Cancel Task
 DataEditForm->menuitem_compdb Compression DataBase
-DataEditForm->menuitem_convertimage Inport Images
+DataEditForm->menuitem_importmseimg Drop Image to MSE
+DataEditForm->menuitem_convertimage Import Images
 DataEditForm->menuitem_openLastDataBase Open Last DataBase
 DataEditForm->menuitem_cutimages Cut Images For Game
 DataEditForm->menuitem_saveasmse_select Select Cards Save As...

DataEditorX/english/language-mainform.txt

 MainForm->menuitem_file File
 MainForm->menuitem_new New DataBase
 MainForm->menuitem_open Open DataBase
-MainForm->menuitem_copyselect Copy Select
+MainForm->menuitem_copyselect Copy Select Cards
+MainForm->menuitem_copyall Copy All Cards
 MainForm->menuitem_pastecards Paste Cards
 MainForm->menuitem_comp1 Compare-Cards 1
 MainForm->menuitem_comp2 Compare-Cards 2

DataEditorX/readme.txt

-[DataEditorX]2.1.2.0[DataEditorX]
+[DataEditorX]2.1.3.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -66,6 +66,17 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.1.3.0
+导出MSE存档，支持8位密码前面带0（00012345）
+支持浏览和导入MSE图片库的图片
+对比，仅密码或者卡片信息
+复制当前列表卡片
+导出zip：
+【名字】.cdb
+【名字】.txt
+desck/【名字】.ydk
+pics/*.jpg
+pics/thumbnail/*.jpg
 2.1.2.0
 修改网络连接数
 2.1.1.1

win32/chinese/history.txt

 # history
+F:\games\ygopro\cards.cdb
 F:\games\ygocore\my.cdb
-F:\games\ygocore\cards.cdb
-F:\games\ygopro\cards.cdb
+F:\games\ygocore\cards.cdb
\ No newline at end of file
\ No newline at end of file

win32/chinese/language-dataeditor.txt

@@ -27,6 +27,7 @@ DataEditForm->menuitem_exportdata 导出所有卡片数据为zip
 DataEditForm->menuitem_cancelTask 取消当前任务
 DataEditForm->menuitem_compdb 压缩当前数据库
 DataEditForm->menuitem_convertimage 批量导入卡图
+DataEditForm->menuitem_importmseimg MSE图片库
 DataEditForm->menuitem_openLastDataBase 最后打开的数据库
 DataEditForm->menuitem_cutimages 裁剪列表卡片的图片
 DataEditForm->menuitem_saveasmse_select 所选卡片导出MSE存档

win32/chinese/language-mainform.txt

@@ -2,6 +2,7 @@
 MainForm->menuitem_new 新建(&N)
 MainForm->menuitem_open 打开(&O)
 MainForm->menuitem_copyselect 复制所选卡片
+MainForm->menuitem_copyall 复制所有卡片
 MainForm->menuitem_pastecards 粘贴卡片
 MainForm->menuitem_comp1 对比-卡片数据 1
 MainForm->menuitem_comp2 对比-卡片数据 2

win32/chinese/message.txt

@@ -62,5 +62,5 @@
 0x3d	清空历史记录
 0x3e	正在导出数据
 0x3f	导出数据完成
-0x40	是否对比卡片文字信息？
+0x40	是否对比卡片信息？
 0x41	对比完成
\ No newline at end of file

win32/english/language-dataeditor.txt

@@ -26,7 +26,8 @@ DataEditForm->menu_tools Tools
 DataEditForm->menuitem_exportdata Export Data
 DataEditForm->menuitem_cancelTask Cancel Task
 DataEditForm->menuitem_compdb Compression DataBase
-DataEditForm->menuitem_convertimage Inport Images
+DataEditForm->menuitem_importmseimg Drop Image to MSE
+DataEditForm->menuitem_convertimage Import Images
 DataEditForm->menuitem_openLastDataBase Open Last DataBase
 DataEditForm->menuitem_cutimages Cut Images For Game
 DataEditForm->menuitem_saveasmse_select Select Cards Save As...

win32/english/language-mainform.txt

 MainForm->menuitem_file File
 MainForm->menuitem_new New DataBase
 MainForm->menuitem_open Open DataBase
-MainForm->menuitem_copyselect Copy Select
+MainForm->menuitem_copyselect Copy Select Cards
+MainForm->menuitem_copyall Copy All Cards
 MainForm->menuitem_pastecards Paste Cards
 MainForm->menuitem_comp1 Compare-Cards 1
 MainForm->menuitem_comp2 Compare-Cards 2

win32/readme.txt

-[DataEditorX]2.1.2.0[DataEditorX]
+[DataEditorX]2.1.3.0[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -66,6 +66,17 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.1.3.0
+导出MSE存档，支持8位密码前面带0（00012345）
+支持浏览和导入MSE图片库的图片
+对比，仅密码或者卡片信息
+复制当前列表卡片
+导出zip：
+【名字】.cdb
+【名字】.txt
+desck/【名字】.ydk
+pics/*.jpg
+pics/thumbnail/*.jpg
 2.1.2.0
 修改网络连接数
 2.1.1.1