update log; rewrite diy script init

DataEditorX/Core/CardEdit.cs

@@ -314,10 +314,10 @@ public bool OpenScript(bool openinthis, string addrequire)
                         {
                             // DIY script
                             sw.WriteLine("--" + c.name);
-                            sw.WriteLine("local m=" + id.ToString());
-                            sw.WriteLine("local cm=_G[\"c\"..m]");
+                            sw.WriteLine("local id=" + id.ToString());
+                            sw.WriteLine("local this=_G[\"c\"..m]");
                             sw.WriteLine("Duel.LoadScript(\"" + addrequire + ".lua\")");
-                            sw.WriteLine("function cm.initial_effect(c)");
+                            sw.WriteLine("function this.initial_effect(c)");
                             sw.WriteLine("\t");
                             sw.WriteLine("end");
                         }

DataEditorX/CountLimitForm.Designer.cs

@@ -49,7 +49,7 @@ private void InitializeComponent()
             this.checkIsOath.AutoSize = true;
             this.checkIsOath.Location = new System.Drawing.Point(6, 20);
             this.checkIsOath.Name = "checkIsOath";
-            this.checkIsOath.Size = new System.Drawing.Size(276, 16);
+            this.checkIsOath.Size = new System.Drawing.Size(268, 16);
             this.checkIsOath.TabIndex = 0;
             this.checkIsOath.Text = "誓约效果(发动被无效不计数，效果被无效计数)";
             this.checkIsOath.UseVisualStyleBackColor = true;
@@ -72,7 +72,7 @@ private void InitializeComponent()
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(156, 64);
+            this.label2.Location = new System.Drawing.Point(132, 65);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 7;
@@ -83,21 +83,26 @@ private void InitializeComponent()
             this.checkIsSingle.AutoSize = true;
             this.checkIsSingle.Location = new System.Drawing.Point(6, 86);
             this.checkIsSingle.Name = "checkIsSingle";
-            this.checkIsSingle.Size = new System.Drawing.Size(240, 16);
+            this.checkIsSingle.Size = new System.Drawing.Size(236, 16);
             this.checkIsSingle.TabIndex = 3;
             this.checkIsSingle.Text = "与其他效果共用次数，且没有同名卡限制";
             this.checkIsSingle.UseVisualStyleBackColor = true;
             // 
             // numericUpDown1
             // 
-            this.numericUpDown1.Location = new System.Drawing.Point(215, 61);
+            this.numericUpDown1.Increment = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDown1.Location = new System.Drawing.Point(185, 61);
             this.numericUpDown1.Maximum = new decimal(new int[] {
             10000,
             0,
             0,
             0});
             this.numericUpDown1.Name = "numericUpDown1";
-            this.numericUpDown1.Size = new System.Drawing.Size(57, 21);
+            this.numericUpDown1.Size = new System.Drawing.Size(57, 19);
             this.numericUpDown1.TabIndex = 6;
             // 
             // checkIsHasCode
@@ -105,7 +110,7 @@ private void InitializeComponent()
             this.checkIsHasCode.AutoSize = true;
             this.checkIsHasCode.Location = new System.Drawing.Point(6, 64);
             this.checkIsHasCode.Name = "checkIsHasCode";
-            this.checkIsHasCode.Size = new System.Drawing.Size(108, 16);
+            this.checkIsHasCode.Size = new System.Drawing.Size(109, 16);
             this.checkIsHasCode.TabIndex = 2;
             this.checkIsHasCode.Text = "同名卡1回合X次";
             this.checkIsHasCode.UseVisualStyleBackColor = true;
@@ -115,7 +120,7 @@ private void InitializeComponent()
             this.checkIsInDuel.AutoSize = true;
             this.checkIsInDuel.Location = new System.Drawing.Point(6, 42);
             this.checkIsInDuel.Name = "checkIsInDuel";
-            this.checkIsInDuel.Size = new System.Drawing.Size(126, 16);
+            this.checkIsInDuel.Size = new System.Drawing.Size(127, 16);
             this.checkIsInDuel.TabIndex = 1;
             this.checkIsInDuel.Text = "决斗中只能发动X次";
             this.checkIsInDuel.UseVisualStyleBackColor = true;
@@ -152,7 +157,7 @@ private void InitializeComponent()
             0,
             0});
             this.numCount.Name = "numCount";
-            this.numCount.Size = new System.Drawing.Size(57, 21);
+            this.numCount.Size = new System.Drawing.Size(57, 19);
             this.numCount.TabIndex = 4;
             this.numCount.Value = new decimal(new int[] {
             1,

DataEditorX/DataEditorX.csproj

@@ -62,6 +62,9 @@
     <Reference Include="FastColoredTextBox, Version=2.16.24.0, Culture=neutral, PublicKeyToken=fb8aa12b994ef61b, processorArchitecture=MSIL">
       <HintPath>..\packages\FCTB.2.16.24\lib\FastColoredTextBox.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.1.3.50, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\packages\AvalonEdit.6.1.3.50\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Neo.Lua, Version=5.3.0.0, Culture=neutral, PublicKeyToken=fdb0cd4fe8a6e3b2, processorArchitecture=MSIL">
@@ -97,6 +100,12 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CodeEditForm_Avalon.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CodeEditForm_Avalon.Designer.cs">
+      <DependentUpon>CodeEditForm_Avalon.cs</DependentUpon>
+    </Compile>
     <Compile Include="CodeEditForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -258,6 +267,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="CodeEditForm_Avalon.resx">
+      <DependentUpon>CodeEditForm_Avalon.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CodeEditForm.resx">
       <DependentUpon>CodeEditForm.cs</DependentUpon>
     </EmbeddedResource>

DataEditorX/EffectCreatorForm.cs

@@ -342,5 +342,10 @@ private void checkReset_CheckedChanged(object sender, EventArgs e)
                 }
             }
         }
+
+        private void checkHintTiming_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }

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

DataEditorX/changed.txt

 ★更新历史
+3.0.1.0
+更新了一个新的编辑器。现在能正常显示中文了。
+旧编辑器仍可使用，请在菜单里进行切换。
+初始化中的m / cm更名为id / this。
+现在可以初始化各种不同的类型了。
 3.0.0.6
 你现在可以在选项菜单中调整函数提示的字体及其大小了。
 现在当滚动到文本末尾时，仍然可以继续向下滚动。

DataEditorX/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AvalonEdit" version="6.1.3.50" targetFramework="net46" />
   <package id="DockPanelSuite" version="3.0.6" targetFramework="net46" />
   <package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net46" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net46" />