Skip to content

D
DataEditorX
Commit eb0e9f17 authored by keyongyu's avatar keyongyu
Browse files
Options

1.6.7.0

parent 9c6df5b0
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 120 deletions
DataEditorX/Core/DataBase.cs
View file @ eb0e9f17
......@@ -341,8 +341,13 @@ public static string GetSelectSQL(Card c)
{
StringBuilder sb=new StringBuilder();
sb.Append("SELECT datas.*,texts.* FROM datas,texts WHERE datas.id=texts.id ");
if(!string.IsNullOrEmpty(c.name))
sb.Append(" and texts.name like '%"+c.name+"%' ");
if(!string.IsNullOrEmpty(c.name)){
if(c.name.IndexOf("%%")>=0)
c.name=c.name.Replace("%%","%");
else
c.name="%"+c.name.Replace("%","/%").Replace("_","/_")+"%";
sb.Append(" and texts.name like '"+c.name+"' ");
}
if(!string.IsNullOrEmpty(c.desc))
sb.Append(" and texts.desc like '%"+c.desc+"%' ");
if(c.ot>0)
......@@ -357,7 +362,21 @@ public static string GetSelectSQL(Card c)
sb.Append(" and datas.type & "+toInt(c.type)+" = "+toInt(c.type));
if(c.category>0)
sb.Append(" and datas.category & "+toInt(c.category)+" = "+toInt(c.category));
if(c.atk>0)
sb.Append(" and datas.atk >= "+c.atk.ToString());
else if(c.atk==-2)
sb.Append(" and datas.atk = "+c.atk.ToString());
else if(c.atk==-1)
sb.Append(" and datas.atk = 0");
if(c.def>0)
sb.Append(" and datas.def >= "+c.def.ToString());
else if(c.def==-2)
sb.Append(" and datas.def = "+c.def.ToString());
else if(c.def==-1)
sb.Append(" and datas.def = 0");
if(c.id>0 && c.alias>0)
sb.Append(" and datas.id BETWEEN "+c.alias.ToString()+" and "+c.id.ToString());
else if(c.id>0)
......
DataEditorX/DataEditForm.Designer.cs
View file @ eb0e9f17
......@@ -40,14 +40,6 @@ private void InitializeComponent()
this.menuitem_open = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_new = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_compdb = new System.Windows.Forms.ToolStripMenuItem();
this.tsep5 = new System.Windows.Forms.ToolStripSeparator();
this.menuitem_copyselectto = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_saveasmse_select = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_copyto = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_saveasmse = new System.Windows.Forms.ToolStripMenuItem();
this.tsep4 = new System.Windows.Forms.ToolStripSeparator();
this.menuitem_cutimages = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_convertimage = new System.Windows.Forms.ToolStripMenuItem();
this.tsep1 = new System.Windows.Forms.ToolStripSeparator();
this.menuitem_readydk = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_readimages = new System.Windows.Forms.ToolStripMenuItem();
......@@ -55,6 +47,17 @@ private void InitializeComponent()
this.menuitem_openLastDataBase = new System.Windows.Forms.ToolStripMenuItem();
this.tsep2 = new System.Windows.Forms.ToolStripSeparator();
this.menuitem_quit = new System.Windows.Forms.ToolStripMenuItem();
this.menu_tools = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_copyselectto = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_saveasmse_select = new System.Windows.Forms.ToolStripMenuItem();
this.tsep4 = new System.Windows.Forms.ToolStripSeparator();
this.menuitem_copyto = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_saveasmse = new System.Windows.Forms.ToolStripMenuItem();
this.tsep5 = new System.Windows.Forms.ToolStripSeparator();
this.menuitem_cutimages = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_convertimage = 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();
this.menuitem_about = new System.Windows.Forms.ToolStripMenuItem();
this.menuitem_checkupdate = new System.Windows.Forms.ToolStripMenuItem();
......@@ -110,8 +113,6 @@ private void InitializeComponent()
this.tb_setcode2 = new System.Windows.Forms.TextBox();
this.tb_setcode3 = new System.Windows.Forms.TextBox();
this.tb_setcode4 = new System.Windows.Forms.TextBox();
this.menuitem_cancelTask = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
......@@ -119,6 +120,7 @@ private void InitializeComponent()
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuitem_file,
this.menu_tools,
this.menuitem_help});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
......@@ -132,14 +134,6 @@ private void InitializeComponent()
this.menuitem_open,
this.menuitem_new,
this.menuitem_compdb,
this.tsep5,
this.menuitem_copyselectto,
this.menuitem_saveasmse_select,
this.menuitem_copyto,
this.menuitem_saveasmse,
this.tsep4,
this.menuitem_cutimages,
this.menuitem_convertimage,
this.tsep1,
this.menuitem_readydk,
this.menuitem_readimages,
......@@ -174,58 +168,6 @@ private void InitializeComponent()
this.menuitem_compdb.Text = "Compression DataBase";
this.menuitem_compdb.Click += new System.EventHandler(this.Menuitem_compdbClick);
//
// tsep5
//
this.tsep5.Name = "tsep5";
this.tsep5.Size = new System.Drawing.Size(229, 6);
//
// menuitem_copyselectto
//
this.menuitem_copyselectto.Name = "menuitem_copyselectto";
this.menuitem_copyselectto.Size = new System.Drawing.Size(232, 22);
this.menuitem_copyselectto.Text = "Select Copy To...";
this.menuitem_copyselectto.Click += new System.EventHandler(this.Menuitem_copyselecttoClick);
//
// menuitem_saveasmse_select
//
this.menuitem_saveasmse_select.Name = "menuitem_saveasmse_select";
this.menuitem_saveasmse_select.Size = new System.Drawing.Size(232, 22);
this.menuitem_saveasmse_select.Text = "Select Save As MSE";
this.menuitem_saveasmse_select.Click += new System.EventHandler(this.Menuitem_saveasmse_selectClick);
//
// menuitem_copyto
//
this.menuitem_copyto.Name = "menuitem_copyto";
this.menuitem_copyto.Size = new System.Drawing.Size(232, 22);
this.menuitem_copyto.Text = "All Now Copy To...";
this.menuitem_copyto.Click += new System.EventHandler(this.Menuitem_copytoClick);
//
// menuitem_saveasmse
//
this.menuitem_saveasmse.Name = "menuitem_saveasmse";
this.menuitem_saveasmse.Size = new System.Drawing.Size(232, 22);
this.menuitem_saveasmse.Text = "All Now Save As MSE";
this.menuitem_saveasmse.Click += new System.EventHandler(this.Menuitem_saveasmseClick);
//
// tsep4
//
this.tsep4.Name = "tsep4";
this.tsep4.Size = new System.Drawing.Size(229, 6);
//
// menuitem_cutimages
//
this.menuitem_cutimages.Name = "menuitem_cutimages";
this.menuitem_cutimages.Size = new System.Drawing.Size(232, 22);
this.menuitem_cutimages.Text = "Cut Images";
this.menuitem_cutimages.Click += new System.EventHandler(this.Menuitem_cutimagesClick);
//
// menuitem_convertimage
//
this.menuitem_convertimage.Name = "menuitem_convertimage";
this.menuitem_convertimage.Size = new System.Drawing.Size(232, 22);
this.menuitem_convertimage.Text = "Inport Images";
this.menuitem_convertimage.Click += new System.EventHandler(this.Menuitem_convertimageClick);
//
// tsep1
//
this.tsep1.Name = "tsep1";
......@@ -269,14 +211,91 @@ private void InitializeComponent()
this.menuitem_quit.Text = "Quit(&Q)";
this.menuitem_quit.Click += new System.EventHandler(this.Menuitem_quitClick);
//
// menu_tools
//
this.menu_tools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuitem_copyselectto,
this.menuitem_saveasmse_select,
this.tsep4,
this.menuitem_copyto,
this.menuitem_saveasmse,
this.tsep5,
this.menuitem_cutimages,
this.menuitem_convertimage,
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_copyselectto
//
this.menuitem_copyselectto.Name = "menuitem_copyselectto";
this.menuitem_copyselectto.Size = new System.Drawing.Size(200, 22);
this.menuitem_copyselectto.Text = "Select Copy To...";
this.menuitem_copyselectto.Click += new System.EventHandler(this.Menuitem_copyselecttoClick);
//
// menuitem_saveasmse_select
//
this.menuitem_saveasmse_select.Name = "menuitem_saveasmse_select";
this.menuitem_saveasmse_select.Size = new System.Drawing.Size(200, 22);
this.menuitem_saveasmse_select.Text = "Select Save As MSE";
this.menuitem_saveasmse_select.Click += new System.EventHandler(this.Menuitem_saveasmse_selectClick);
//
// tsep4
//
this.tsep4.Name = "tsep4";
this.tsep4.Size = new System.Drawing.Size(197, 6);
//
// menuitem_copyto
//
this.menuitem_copyto.Name = "menuitem_copyto";
this.menuitem_copyto.Size = new System.Drawing.Size(200, 22);
this.menuitem_copyto.Text = "All Now Copy To...";
this.menuitem_copyto.Click += new System.EventHandler(this.Menuitem_copytoClick);
//
// menuitem_saveasmse
//
this.menuitem_saveasmse.Name = "menuitem_saveasmse";
this.menuitem_saveasmse.Size = new System.Drawing.Size(200, 22);
this.menuitem_saveasmse.Text = "All Now Save As MSE";
this.menuitem_saveasmse.Click += new System.EventHandler(this.Menuitem_saveasmseClick);
//
// tsep5
//
this.tsep5.Name = "tsep5";
this.tsep5.Size = new System.Drawing.Size(197, 6);
//
// menuitem_cutimages
//
this.menuitem_cutimages.Name = "menuitem_cutimages";
this.menuitem_cutimages.Size = new System.Drawing.Size(200, 22);
this.menuitem_cutimages.Text = "Cut Images";
this.menuitem_cutimages.Click += new System.EventHandler(this.Menuitem_cutimagesClick);
//
// menuitem_convertimage
//
this.menuitem_convertimage.Name = "menuitem_convertimage";
this.menuitem_convertimage.Size = new System.Drawing.Size(200, 22);
this.menuitem_convertimage.Text = "Inport Images";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(197, 6);
//
// menuitem_cancelTask
//
this.menuitem_cancelTask.Name = "menuitem_cancelTask";
this.menuitem_cancelTask.Size = new System.Drawing.Size(200, 22);
this.menuitem_cancelTask.Text = "Cancel Task";
//
// menuitem_help
//
this.menuitem_help.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuitem_about,
this.menuitem_checkupdate,
this.menuitem_github,
this.toolStripSeparator1,
this.menuitem_cancelTask});
this.menuitem_github});
this.menuitem_help.Name = "menuitem_help";
this.menuitem_help.Size = new System.Drawing.Size(64, 21);
this.menuitem_help.Text = "Help(&H)";
......@@ -825,18 +844,6 @@ private void InitializeComponent()
this.tb_setcode4.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
this.tb_setcode4.TextChanged += new System.EventHandler(this.Tb_setcode4TextChanged);
//
// menuitem_cancelTask
//
this.menuitem_cancelTask.Name = "menuitem_cancelTask";
this.menuitem_cancelTask.Size = new System.Drawing.Size(158, 22);
this.menuitem_cancelTask.Text = "Cancel Task";
this.menuitem_cancelTask.Click += new System.EventHandler(this.Menuitem_cancelTaskClick);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(155, 6);
//
// DataEditForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -904,6 +911,7 @@ private void InitializeComponent()
this.ResumeLayout(false);
this.PerformLayout();
}
private System.Windows.Forms.ToolStripMenuItem menu_tools;
private System.Windows.Forms.ToolStripMenuItem menuitem_cancelTask;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.TextBox tb_setcode4;
......
DataEditorX/DataEditForm.cs
View file @ eb0e9f17
......@@ -104,9 +104,7 @@ void DataEditFormLoad(object sender, EventArgs e)
if(File.Exists(nowCdbFile))
Open(nowCdbFile);
#if !DEBUG
checkupdate(false);
#endif
//checkupdate(false);
}
//窗体关闭
void DataEditFormFormClosing(object sender, FormClosingEventArgs e)
......@@ -406,10 +404,14 @@ Card GetCard()
c.level+=(temp << 0x10);
if(tb_atk.Text=="?"||tb_atk.Text=="？")
c.atk=-2;
else if(tb_atk.Text==".")
c.atk=-1;
else
int.TryParse( tb_atk.Text,out c.atk);
if(tb_def.Text=="?"||tb_def.Text=="？")
c.def=-2;
else if(tb_def.Text==".")
c.def=-1;
else
int.TryParse( tb_def.Text,out c.def);
long.TryParse( tb_cardcode.Text,out c.id);
......
DataEditorX/Properties/AssemblyInfo.cs
View file @ eb0e9f17
......@@ -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.6.7.0")]
[assembly: AssemblyVersion("1.6.8.0")]
DataEditorX/chinese/language.txt
View file @ eb0e9f17
......@@ -22,6 +22,7 @@ DataEditForm->lb4 /
DataEditForm->lb5 /
DataEditForm->lv_cardlist0 密码
DataEditForm->lv_cardlist1 卡片名称
DataEditForm->menu_tools 功能(&T)
DataEditForm->menuitem_cancelTask 取消当前任务
DataEditForm->menuitem_compdb 压缩当前数据库
DataEditForm->menuitem_convertimage 批量导入卡图
......
DataEditorX/chinese/mse-config.txt
View file @ eb0e9f17
......@@ -4,9 +4,7 @@
cn2tw = true
########################### Spell/Trap
spell = [魔法卡%%]
# spell = 【魔法カード%%】
trap = [陷阱卡%%]
# trap = 【罠カード%%】
############################ Text
pendulum-text = 】[\s\S]*?\n([\S\s]*?)\n【
# pendulum-text = ([\S\s]*?)\n【
......
DataEditorX/english/language.txt
View file @ eb0e9f17
......@@ -22,6 +22,7 @@ DataEditForm->lb4 /
DataEditForm->lb5 /
DataEditForm->lv_cardlist0 Card Code
DataEditForm->lv_cardlist1 Card Name
DataEditForm->menu_tools Tools
DataEditForm->menuitem_cancelTask Cancel Task
DataEditForm->menuitem_compdb Compression DataBase
DataEditForm->menuitem_convertimage Inport Images
......
DataEditorX/readme.txt
View file @ eb0e9f17
[DataEditorX]1.6.7.0[DataEditorX]
[DataEditorX]1.6.8.0[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
★注意：
1.脚本提示文字修改：点击列表，编辑文本，按Enter确定输入。
2.攻击力为？，可以输入？，?，-2任意一个都可以。
★卡片搜索
1.仅支持第一个系列名搜索,暂不支持P的刻度搜索
2.支持卡片名称，描述，规则，属性，等级，种族，卡片类型，效果类型，密码
3.ATK,DEF搜索：
如果是0，则输入-1或者.搜索
如果是?，则输入-2或者?或者？搜索
4.卡片名称搜索：
AOJ%% 以“AOJ”开头
流%%天 以“流”开头，“天”结尾
%%战士 以“战士”结尾
5.密码范围搜索示例：
--密码或同名卡为10000000，的卡片 卡片密码： 10000000 同名卡: 0
--同名卡为10000000的卡片 卡片密码： 0 同名卡: 10000000
--大于密码10000000，小于20000000的卡片 同名卡： 10000000 卡片密码: 20000000
★支援Magic Set Editor 2
下载/更新：
Magic Set Editor 2/update/download.bat
★MSE存档生成设置
config文件，设置pendulum文本和普通文本的正则正则表达式，用来分离文本
mse-head MSE的风格设置文件
mse-monster 普通怪兽模版
mse-pendulum P怪兽模版
mse-spelltrap 魔陷模版
mse-italic 特数字替换，达到一个位置使用2种字体的效果
mse-config 设置pendulum文本和普通文本的正则正则表达式，用来分离文本
★支持关联cdb文件，命令参数启动。
关联cdb文件：
......@@ -29,14 +47,6 @@ mse-italic 特数字替换，达到一个位置使用2种字体的效果
替换复制：如果存在卡片，就用最新的替换
不替换复制：如果存在卡片，就跳过
★卡片搜索
1.不支持系列名，ATK，DEF搜索
2.支持卡片名称，描述，规则，属性，等级，种族，卡片类型，效果类型，密码
3.密码范围搜索示例：
--密码或同名卡为10000000，的卡片 卡片密码： 10000000 同名卡: 0
--同名卡为10000000的卡片 卡片密码： 0 同名卡: 10000000
--大于密码10000000，小于20000000的卡片 同名卡： 10000000 卡片密码: 20000000
★bug反馈
Email:247321453@qq.com
提交版本前，请检查更新。
......@@ -56,6 +66,11 @@ DataEditorX.exe.config
描述不详细的bug，我修复不了。（都不知道是bug是什么）
★更新历史
1.6.8.0
不再支持自动更新，请大家每天手动更新，下个版本添加多cdb编辑
把文件菜单的项分开
改进卡名搜索
添加atk，def搜索
1.6.7.0
任务进度提示
取消任务
......
win32/DataEditorX.exe
View file @ eb0e9f17
No preview for this file type
win32/chinese/language.txt
View file @ eb0e9f17
......@@ -22,6 +22,7 @@ DataEditForm->lb4 /
DataEditForm->lb5 /
DataEditForm->lv_cardlist0 密码
DataEditForm->lv_cardlist1 卡片名称
DataEditForm->menu_tools 功能(&T)
DataEditForm->menuitem_cancelTask 取消当前任务
DataEditForm->menuitem_compdb 压缩当前数据库
DataEditForm->menuitem_convertimage 批量导入卡图
......
win32/chinese/mse-config.txt
View file @ eb0e9f17
......@@ -4,9 +4,7 @@
cn2tw = true
########################### Spell/Trap
spell = [魔法卡%%]
# spell = 【魔法カード%%】
trap = [陷阱卡%%]
# trap = 【罠カード%%】
############################ Text
pendulum-text = 】[\s\S]*?\n([\S\s]*?)\n【
# pendulum-text = ([\S\s]*?)\n【
......
win32/english/language.txt
View file @ eb0e9f17
......@@ -22,6 +22,7 @@ DataEditForm->lb4 /
DataEditForm->lb5 /
DataEditForm->lv_cardlist0 Card Code
DataEditForm->lv_cardlist1 Card Name
DataEditForm->menu_tools Tools
DataEditForm->menuitem_cancelTask Cancel Task
DataEditForm->menuitem_compdb Compression DataBase
DataEditForm->menuitem_convertimage Inport Images
......
win32/readme.txt
View file @ eb0e9f17
[DataEditorX]1.6.7.0[DataEditorX]
[DataEditorX]1.6.8.0[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
★注意：
1.脚本提示文字修改：点击列表，编辑文本，按Enter确定输入。
2.攻击力为？，可以输入？，?，-2任意一个都可以。
★卡片搜索
1.仅支持第一个系列名搜索,暂不支持P的刻度搜索
2.支持卡片名称，描述，规则，属性，等级，种族，卡片类型，效果类型，密码
3.ATK,DEF搜索：
如果是0，则输入-1或者.搜索
如果是?，则输入-2或者?或者？搜索
4.卡片名称搜索：
AOJ%% 以“AOJ”开头
流%%天 以“流”开头，“天”结尾
%%战士 以“战士”结尾
5.密码范围搜索示例：
--密码或同名卡为10000000，的卡片 卡片密码： 10000000 同名卡: 0
--同名卡为10000000的卡片 卡片密码： 0 同名卡: 10000000
--大于密码10000000，小于20000000的卡片 同名卡： 10000000 卡片密码: 20000000
★支援Magic Set Editor 2
下载/更新：
Magic Set Editor 2/update/download.bat
★MSE存档生成设置
config文件，设置pendulum文本和普通文本的正则正则表达式，用来分离文本
mse-head MSE的风格设置文件
mse-monster 普通怪兽模版
mse-pendulum P怪兽模版
mse-spelltrap 魔陷模版
mse-italic 特数字替换，达到一个位置使用2种字体的效果
mse-config 设置pendulum文本和普通文本的正则正则表达式，用来分离文本
★支持关联cdb文件，命令参数启动。
关联cdb文件：
......@@ -29,14 +47,6 @@ mse-italic 特数字替换，达到一个位置使用2种字体的效果
替换复制：如果存在卡片，就用最新的替换
不替换复制：如果存在卡片，就跳过
★卡片搜索
1.不支持系列名，ATK，DEF搜索
2.支持卡片名称，描述，规则，属性，等级，种族，卡片类型，效果类型，密码
3.密码范围搜索示例：
--密码或同名卡为10000000，的卡片 卡片密码： 10000000 同名卡: 0
--同名卡为10000000的卡片 卡片密码： 0 同名卡: 10000000
--大于密码10000000，小于20000000的卡片 同名卡： 10000000 卡片密码: 20000000
★bug反馈
Email:247321453@qq.com
提交版本前，请检查更新。
......@@ -56,6 +66,11 @@ DataEditorX.exe.config
描述不详细的bug，我修复不了。（都不知道是bug是什么）
★更新历史
1.6.8.0
不再支持自动更新，请大家每天手动更新，下个版本添加多cdb编辑
把文件菜单的项分开
改进卡名搜索
添加atk，def搜索
1.6.7.0
任务进度提示
取消任务
......
win32/win32.zip
View file @ eb0e9f17
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