version

DataEditorX/CodeEditForm.cs

@@ -605,7 +605,8 @@ void FctbMouseClick(object sender, MouseEventArgs e)
 
         private void menuitem_testlua_Click(object sender, EventArgs e)
         {
-            string fn = new FileInfo(this.nowFile).Name;
+            FileInfo fi = new FileInfo(this.nowFile);
+            string fn = fi.Name;
             if (!fn.ToUpper().EndsWith(".LUA"))
             {
                 return;
@@ -614,10 +615,11 @@ private void menuitem_testlua_Click(object sender, EventArgs e)
             bool error=false;
             try
             {
-
+                Directory.SetCurrentDirectory(fi.DirectoryName);
                 Lua lua = new Lua();
                 var env = lua.CreateEnvironment();
-                env.DoChunk("Duel={} Effect={} Card={} aux={} Auxiliary={} _G={}" + cCode + "={} " + this.fctb.Text, "test.lua");
+                string pre = "Duel={} Effect={} Card={} aux={} Auxiliary={} " + cCode + "={} Duel.LoadScript=function(str) end ";
+                env.DoChunk(pre + this.fctb.Text, "test.lua");
             }
             catch (LuaException ex)
             {
@@ -644,6 +646,10 @@ private void OnDragEnter(object sender, DragEventArgs e)
         private void OnDragDtop(object sender, DragEventArgs e)
         {
             string[] drops = (string[])e.Data.GetData(DataFormats.FileDrop);
+            if (drops == null)
+            {
+                return;
+            }
             List<string> files = new List<string>();
             foreach (string file in drops)
             {

DataEditorX/Config/DataManager.cs

@@ -92,13 +92,12 @@ public static string SubString(string content, string tag)
             long lkey;
             foreach (string line in lines)
             {
-                string l = line.Trim(); //姑且做一下Trim 190324 by JoyJ
-                if (l.StartsWith("#"))
+                if (line.StartsWith("#"))
                 {
                     continue;
                 }
 
-                string[] words = l.Split(SEP_LINE);
+                string[] words = line.Split(SEP_LINE);
                 if (words.Length < 2)
                 {
                     continue;

DataEditorX/DataEditForm.Designer.cs

@@ -135,10 +135,10 @@ private void InitializeComponent()
             this.lv_cardlist = new DataEditorX.DListView();
             this.ch_cardcode = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.ch_cardname = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.pl_markers = new DataEditorX.DFlowLayoutPanel();
             this.pl_cardtype = new DataEditorX.DFlowLayoutPanel();
             this.pl_category = new DataEditorX.DFlowLayoutPanel();
             this.lb_scripttext = new DataEditorX.DListBox();
-            this.pl_markers = new DataEditorX.DFlowLayoutPanel();
             this.mainMenu.SuspendLayout();
             this.pl_bottom.SuspendLayout();
             this.pl_main.SuspendLayout();
@@ -1108,6 +1108,7 @@ private void InitializeComponent()
             // 
             // splitContainer.Panel2
             // 
+            this.splitContainer.Panel2.Controls.Add(this.pl_markers);
             this.splitContainer.Panel2.Controls.Add(this.pl_cardtype);
             this.splitContainer.Panel2.Controls.Add(this.tb_cardtext);
             this.splitContainer.Panel2.Controls.Add(this.tb_cardname);
@@ -1136,7 +1137,6 @@ private void InitializeComponent()
             this.splitContainer.Panel2.Controls.Add(this.tb_cardalias);
             this.splitContainer.Panel2.Controls.Add(this.tb_setcode1);
             this.splitContainer.Panel2.Controls.Add(this.tb_atk);
-            this.splitContainer.Panel2.Controls.Add(this.pl_markers);
             this.splitContainer.Panel2.Controls.Add(this.lb_cardcode);
             this.splitContainer.Panel2.Controls.Add(this.lb_pleft_right);
             this.splitContainer.Panel2.Controls.Add(this.lb_cardalias);
@@ -1183,6 +1183,17 @@ private void InitializeComponent()
             this.ch_cardname.Text = "Card Name";
             this.ch_cardname.Width = 1294;
             // 
+            // pl_markers
+            // 
+            this.pl_markers.AutoScroll = true;
+            this.pl_markers.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pl_markers.Location = new System.Drawing.Point(265, 234);
+            this.pl_markers.Margin = new System.Windows.Forms.Padding(1, 2, 1, 2);
+            this.pl_markers.Name = "pl_markers";
+            this.pl_markers.Padding = new System.Windows.Forms.Padding(2);
+            this.pl_markers.Size = new System.Drawing.Size(63, 60);
+            this.pl_markers.TabIndex = 20;
+            // 
             // pl_cardtype
             // 
             this.pl_cardtype.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1225,17 +1236,6 @@ private void InitializeComponent()
             this.lb_scripttext.TabIndex = 6;
             this.lb_scripttext.SelectedIndexChanged += new System.EventHandler(this.Lb_scripttextSelectedIndexChanged);
             // 
-            // pl_markers
-            // 
-            this.pl_markers.AutoScroll = true;
-            this.pl_markers.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pl_markers.Location = new System.Drawing.Point(275, 233);
-            this.pl_markers.Margin = new System.Windows.Forms.Padding(1, 2, 1, 2);
-            this.pl_markers.Name = "pl_markers";
-            this.pl_markers.Padding = new System.Windows.Forms.Padding(2);
-            this.pl_markers.Size = new System.Drawing.Size(60, 60);
-            this.pl_markers.TabIndex = 20;
-            // 
             // DataEditForm
             // 
             this.AllowDrop = true;

DataEditorX/DataEditForm.cs

@@ -2163,6 +2163,10 @@ private void menuitem_language_Click(object sender, EventArgs e)
 		private void OnDragDrop(object sender, DragEventArgs e)
 		{
 			string[] drops = (string[])e.Data.GetData(DataFormats.FileDrop);
+			if (drops == null)
+			{
+				return;
+			}
 			List<string> files = new List<string>();
 			foreach (string file in drops)
 			{

DataEditorX/Properties/AssemblyInfo.cs

@@ -27,4 +27,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("3.0.0.3")]
+[assembly: AssemblyVersion("3.0.0.4")]

DataEditorX/changed.txt

 ★更新历史
+3.0.0.4
+修正不显示连接标记的bug
+修正拖拽非文件时报错的bug
+现在高亮单词的范围将更广
 3.0.0.3
 大量文字更新
 现在可以拖拽文件进窗口来打开它了
 现在在代码菜单也能选数据库打开了，反之亦然
-
 3.0.0.2
 增加了一个简易的语法检查功能
 从此版本开始，准备开始对一些简单的错误进行提示（标红）

DataEditorX/readme.txt

-[DataEditorX]3.0.0.3[DataEditorX]
-[URL]https://cdn01.moecube.com/DataEditorX/releases/DataEditorX-3.0.0.3.zip[URL]
+[DataEditorX]3.0.0.4[DataEditorX]
+[URL]https://cdn01.moecube.com/DataEditorX/releases/DataEditorX-3.0.0.4.zip[URL]
 
 ★运行环境(Environment)
 本程序基于.Net framework 4.6开发