Commit d94e6465 authored by keyongyu's avatar keyongyu

2.2.7.4

parent 77d7c7ae
...@@ -31,7 +31,7 @@ public partial class DataEditForm : DockContent ...@@ -31,7 +31,7 @@ public partial class DataEditForm : DockContent
/// <summary>搜索条件</summary> /// <summary>搜索条件</summary>
Card srcCard=new Card(0); Card srcCard=new Card(0);
string[] strs=null; string[] strs=null;
List<long> tmpCodes; List<string> tmpCodes;
string title; string title;
string nowCdbFile=""; string nowCdbFile="";
int MaxRow=20; int MaxRow=20;
...@@ -75,7 +75,7 @@ public DataEditForm() ...@@ -75,7 +75,7 @@ public DataEditForm()
void Initialize() void Initialize()
{ {
datacfg=null; datacfg=null;
tmpCodes = new List<long>(); tmpCodes = new List<string>();
InitializeComponent(); InitializeComponent();
title=this.Text; title=this.Text;
nowCdbFile=""; nowCdbFile="";
...@@ -1062,8 +1062,11 @@ void Menuitem_readydkClick(object sender, EventArgs e) ...@@ -1062,8 +1062,11 @@ void Menuitem_readydkClick(object sender, EventArgs e)
dlg.Filter=LANG.GetMsg(LMSG.ydkType); dlg.Filter=LANG.GetMsg(LMSG.ydkType);
if(dlg.ShowDialog()==DialogResult.OK) if(dlg.ShowDialog()==DialogResult.OK)
{ {
tmpCodes.Clear();
string[] ids = YGOUtil.ReadYDK(dlg.FileName);
tmpCodes.AddRange(ids);
SetCards(DataBase.Read(nowCdbFile, true, SetCards(DataBase.Read(nowCdbFile, true,
YGOUtil.ReadYDK(dlg.FileName)), false); ids), false);
} }
} }
} }
...@@ -1077,8 +1080,11 @@ void Menuitem_readimagesClick(object sender, EventArgs e) ...@@ -1077,8 +1080,11 @@ void Menuitem_readimagesClick(object sender, EventArgs e)
fdlg.Description= LANG.GetMsg(LMSG.SelectImagePath); fdlg.Description= LANG.GetMsg(LMSG.SelectImagePath);
if(fdlg.ShowDialog()==DialogResult.OK) if(fdlg.ShowDialog()==DialogResult.OK)
{ {
tmpCodes.Clear();
string[] ids = YGOUtil.ReadImage(fdlg.SelectedPath);
tmpCodes.AddRange(ids);
SetCards(DataBase.Read(nowCdbFile, true, SetCards(DataBase.Read(nowCdbFile, true,
YGOUtil.ReadImage(fdlg.SelectedPath)), false); ids), false);
} }
} }
} }
...@@ -1524,7 +1530,7 @@ public void CompareCards(string cdbfile,bool checktext) ...@@ -1524,7 +1530,7 @@ public void CompareCards(string cdbfile,bool checktext)
foreach(Card card in mcards) foreach(Card card in mcards)
{ {
if (!CheckCard(cards, card, checktext)) if (!CheckCard(cards, card, checktext))
tmpCodes.Add(card.id); tmpCodes.Add(card.id.ToString());
} }
if (tmpCodes.Count == 0) if (tmpCodes.Count == 0)
{ {
......
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
// //
// You can specify all the values or you can use the default the Revision and // You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below: // Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("2.2.7.3")] [assembly: AssemblyVersion("2.2.7.4")]
[DataEditorX]2.2.7.3[DataEditorX] [DataEditorX]2.2.7.4[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL] [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★文件关联 ★文件关联
...@@ -58,6 +58,8 @@ Ctrl+鼠标左键 跳转到函数定义 ...@@ -58,6 +58,8 @@ Ctrl+鼠标左键 跳转到函数定义
Ctrl+鼠标滑轮 缩放文字 Ctrl+鼠标滑轮 缩放文字
★更新历史 ★更新历史
2.2.7.4
lua编辑器,修复按ydk,图像读取,编辑卡片后列表结果bug
2.2.7.3 2.2.7.3
lua编辑器,4个空格转换为tab键 lua编辑器,4个空格转换为tab键
2.2.7.2 2.2.7.2
......
No preview for this file type
# history # history
F:\games\ygopro\cards.cdb
F:\games\ygopro\script\c17857780.lua F:\games\ygopro\script\c17857780.lua
F:\games\ygopro\script\c27551.lua F:\games\ygopro\script\c27551.lua
F:\games\ygopro\cards.cdb
F:\games\ygopro\p.zip.cdb F:\games\ygopro\p.zip.cdb
F:\games\ygopro\script\c168917.lua F:\games\ygopro\script\c168917.lua
F:\games\ygopro\script\c47198668.lua F:\games\ygopro\script\c47198668.lua
......
[DataEditorX]2.2.7.3[DataEditorX] [DataEditorX]2.2.7.4[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL] [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★文件关联 ★文件关联
...@@ -58,6 +58,8 @@ Ctrl+鼠标左键 跳转到函数定义 ...@@ -58,6 +58,8 @@ Ctrl+鼠标左键 跳转到函数定义
Ctrl+鼠标滑轮 缩放文字 Ctrl+鼠标滑轮 缩放文字
★更新历史 ★更新历史
2.2.7.4
lua编辑器,修复按ydk,图像读取,编辑卡片后列表结果bug
2.2.7.3 2.2.7.3
lua编辑器,4个空格转换为tab键 lua编辑器,4个空格转换为tab键
2.2.7.2 2.2.7.2
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment