Commit fce39f6b authored by JoyJ's avatar JoyJ

update log; rewrite diy script init

parent 43f833b1
......@@ -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");
}
......
......@@ -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,
......
......@@ -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>
......
......@@ -163,7 +163,7 @@ private void InitializeComponent()
this.radioEffectTypeField.AutoSize = true;
this.radioEffectTypeField.Location = new System.Drawing.Point(6, 43);
this.radioEffectTypeField.Name = "radioEffectTypeField";
this.radioEffectTypeField.Size = new System.Drawing.Size(251, 16);
this.radioEffectTypeField.Size = new System.Drawing.Size(247, 16);
this.radioEffectTypeField.TabIndex = 1;
this.radioEffectTypeField.Text = "对其他卡也有效,或任何卡发生事件都触发";
this.radioEffectTypeField.UseVisualStyleBackColor = true;
......@@ -174,7 +174,7 @@ private void InitializeComponent()
this.radioEffectTypeSingle.Checked = true;
this.radioEffectTypeSingle.Location = new System.Drawing.Point(6, 21);
this.radioEffectTypeSingle.Name = "radioEffectTypeSingle";
this.radioEffectTypeSingle.Size = new System.Drawing.Size(251, 16);
this.radioEffectTypeSingle.Size = new System.Drawing.Size(247, 16);
this.radioEffectTypeSingle.TabIndex = 0;
this.radioEffectTypeSingle.TabStop = true;
this.radioEffectTypeSingle.Text = "只对自己有效,或只有自身状态变化时触发";
......@@ -195,7 +195,7 @@ private void InitializeComponent()
//
this.txtSearchEffectCode.Location = new System.Drawing.Point(6, 20);
this.txtSearchEffectCode.Name = "txtSearchEffectCode";
this.txtSearchEffectCode.Size = new System.Drawing.Size(268, 21);
this.txtSearchEffectCode.Size = new System.Drawing.Size(268, 19);
this.txtSearchEffectCode.TabIndex = 2;
this.txtSearchEffectCode.TextChanged += new System.EventHandler(this.txtSearchEffectCode_TextChanged);
//
......@@ -225,12 +225,12 @@ private void InitializeComponent()
//
this.radio_EffectTypeNone.AutoSize = true;
this.radio_EffectTypeNone.Checked = true;
this.radio_EffectTypeNone.Location = new System.Drawing.Point(336, 94);
this.radio_EffectTypeNone.Location = new System.Drawing.Point(292, 108);
this.radio_EffectTypeNone.Name = "radio_EffectTypeNone";
this.radio_EffectTypeNone.Size = new System.Drawing.Size(71, 16);
this.radio_EffectTypeNone.Size = new System.Drawing.Size(115, 16);
this.radio_EffectTypeNone.TabIndex = 12;
this.radio_EffectTypeNone.TabStop = true;
this.radio_EffectTypeNone.Text = "永续效果";
this.radio_EffectTypeNone.Text = "永续效果(无连锁)";
this.radio_EffectTypeNone.UseVisualStyleBackColor = true;
//
// radioEffectTypeTarget
......@@ -258,7 +258,7 @@ private void InitializeComponent()
this.radioEffectTypeXMaterial.AutoSize = true;
this.radioEffectTypeXMaterial.Location = new System.Drawing.Point(6, 108);
this.radioEffectTypeXMaterial.Name = "radioEffectTypeXMaterial";
this.radioEffectTypeXMaterial.Size = new System.Drawing.Size(233, 16);
this.radioEffectTypeXMaterial.Size = new System.Drawing.Size(232, 16);
this.radioEffectTypeXMaterial.TabIndex = 9;
this.radioEffectTypeXMaterial.Text = "作为素材使用的场合,XYZ怪兽获得效果";
this.radioEffectTypeXMaterial.UseVisualStyleBackColor = true;
......@@ -278,7 +278,7 @@ private void InitializeComponent()
this.radioEffectTypeQuick_F.AutoSize = true;
this.radioEffectTypeQuick_F.Location = new System.Drawing.Point(6, 86);
this.radioEffectTypeQuick_F.Name = "radioEffectTypeQuick_F";
this.radioEffectTypeQuick_F.Size = new System.Drawing.Size(149, 16);
this.radioEffectTypeQuick_F.Size = new System.Drawing.Size(145, 16);
this.radioEffectTypeQuick_F.TabIndex = 7;
this.radioEffectTypeQuick_F.Text = "诱发即时必发效果(2速)";
this.radioEffectTypeQuick_F.UseVisualStyleBackColor = true;
......@@ -288,7 +288,7 @@ private void InitializeComponent()
this.radioEffectTypeQuick_O.AutoSize = true;
this.radioEffectTypeQuick_O.Location = new System.Drawing.Point(158, 86);
this.radioEffectTypeQuick_O.Name = "radioEffectTypeQuick_O";
this.radioEffectTypeQuick_O.Size = new System.Drawing.Size(149, 16);
this.radioEffectTypeQuick_O.Size = new System.Drawing.Size(145, 16);
this.radioEffectTypeQuick_O.TabIndex = 6;
this.radioEffectTypeQuick_O.Text = "诱发即时选发效果(2速)";
this.radioEffectTypeQuick_O.UseVisualStyleBackColor = true;
......@@ -298,7 +298,7 @@ private void InitializeComponent()
this.radioEffectTypeTrigger_F.AutoSize = true;
this.radioEffectTypeTrigger_F.Location = new System.Drawing.Point(6, 64);
this.radioEffectTypeTrigger_F.Name = "radioEffectTypeTrigger_F";
this.radioEffectTypeTrigger_F.Size = new System.Drawing.Size(125, 16);
this.radioEffectTypeTrigger_F.Size = new System.Drawing.Size(121, 16);
this.radioEffectTypeTrigger_F.TabIndex = 5;
this.radioEffectTypeTrigger_F.Text = "诱发必发效果(1速)";
this.radioEffectTypeTrigger_F.UseVisualStyleBackColor = true;
......@@ -308,7 +308,7 @@ private void InitializeComponent()
this.radioEffectTypeTrigger_O.AutoSize = true;
this.radioEffectTypeTrigger_O.Location = new System.Drawing.Point(137, 64);
this.radioEffectTypeTrigger_O.Name = "radioEffectTypeTrigger_O";
this.radioEffectTypeTrigger_O.Size = new System.Drawing.Size(125, 16);
this.radioEffectTypeTrigger_O.Size = new System.Drawing.Size(121, 16);
this.radioEffectTypeTrigger_O.TabIndex = 4;
this.radioEffectTypeTrigger_O.Text = "诱发选发效果(1速)";
this.radioEffectTypeTrigger_O.UseVisualStyleBackColor = true;
......@@ -316,11 +316,11 @@ private void InitializeComponent()
// radioEffectTypeIgnition
//
this.radioEffectTypeIgnition.AutoSize = true;
this.radioEffectTypeIgnition.Location = new System.Drawing.Point(336, 64);
this.radioEffectTypeIgnition.Location = new System.Drawing.Point(292, 64);
this.radioEffectTypeIgnition.Name = "radioEffectTypeIgnition";
this.radioEffectTypeIgnition.Size = new System.Drawing.Size(71, 16);
this.radioEffectTypeIgnition.Size = new System.Drawing.Size(115, 16);
this.radioEffectTypeIgnition.TabIndex = 3;
this.radioEffectTypeIgnition.Text = "起动效果";
this.radioEffectTypeIgnition.Text = "起动效果(入连锁)";
this.radioEffectTypeIgnition.UseVisualStyleBackColor = true;
//
// radioEffectTypeFlip
......@@ -338,9 +338,9 @@ private void InitializeComponent()
this.radioEffectTypeActivate.AutoSize = true;
this.radioEffectTypeActivate.Location = new System.Drawing.Point(167, 20);
this.radioEffectTypeActivate.Name = "radioEffectTypeActivate";
this.radioEffectTypeActivate.Size = new System.Drawing.Size(215, 16);
this.radioEffectTypeActivate.Size = new System.Drawing.Size(163, 16);
this.radioEffectTypeActivate.TabIndex = 1;
this.radioEffectTypeActivate.Text = "魔法陷阱卡从手卡往场上放置并发动";
this.radioEffectTypeActivate.Text = "魔法陷阱卡的发动(入连锁)";
this.radioEffectTypeActivate.UseVisualStyleBackColor = true;
//
// radioEffectTypeEquip
......@@ -371,7 +371,7 @@ private void InitializeComponent()
this.checkOperation.AutoSize = true;
this.checkOperation.Location = new System.Drawing.Point(6, 86);
this.checkOperation.Name = "checkOperation";
this.checkOperation.Size = new System.Drawing.Size(186, 16);
this.checkOperation.Size = new System.Drawing.Size(177, 16);
this.checkOperation.TabIndex = 3;
this.checkOperation.Text = "有Operation(发动后具体动作)";
this.checkOperation.UseVisualStyleBackColor = true;
......@@ -381,7 +381,7 @@ private void InitializeComponent()
this.checkCost.AutoSize = true;
this.checkCost.Location = new System.Drawing.Point(6, 42);
this.checkCost.Name = "checkCost";
this.checkCost.Size = new System.Drawing.Size(216, 16);
this.checkCost.Size = new System.Drawing.Size(208, 16);
this.checkCost.TabIndex = 2;
this.checkCost.Text = "有Cost(发动条件,被复制后不检查)";
this.checkCost.UseVisualStyleBackColor = true;
......@@ -391,7 +391,7 @@ private void InitializeComponent()
this.checkTarget.AutoSize = true;
this.checkTarget.Location = new System.Drawing.Point(6, 64);
this.checkTarget.Name = "checkTarget";
this.checkTarget.Size = new System.Drawing.Size(240, 16);
this.checkTarget.Size = new System.Drawing.Size(229, 16);
this.checkTarget.TabIndex = 1;
this.checkTarget.Text = "有Target(防止空发,被复制后也要检查)";
this.checkTarget.UseVisualStyleBackColor = true;
......@@ -401,7 +401,7 @@ private void InitializeComponent()
this.checkCondition.AutoSize = true;
this.checkCondition.Location = new System.Drawing.Point(6, 20);
this.checkCondition.Name = "checkCondition";
this.checkCondition.Size = new System.Drawing.Size(246, 16);
this.checkCondition.Size = new System.Drawing.Size(232, 16);
this.checkCondition.TabIndex = 0;
this.checkCondition.Text = "有Condition(发动前提,被复制后不检查)";
this.checkCondition.UseVisualStyleBackColor = true;
......@@ -423,7 +423,7 @@ private void InitializeComponent()
this.checkBox6.AutoSize = true;
this.checkBox6.Location = new System.Drawing.Point(6, 64);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(186, 16);
this.checkBox6.Size = new System.Drawing.Size(177, 16);
this.checkBox6.TabIndex = 3;
this.checkBox6.Text = "有Operation(发动后具体动作)";
this.checkBox6.UseVisualStyleBackColor = true;
......@@ -433,7 +433,7 @@ private void InitializeComponent()
this.checkTargetRange.AutoSize = true;
this.checkTargetRange.Location = new System.Drawing.Point(6, 42);
this.checkTargetRange.Name = "checkTargetRange";
this.checkTargetRange.Size = new System.Drawing.Size(162, 16);
this.checkTargetRange.Size = new System.Drawing.Size(157, 16);
this.checkTargetRange.TabIndex = 2;
this.checkTargetRange.Text = "有TargetRange(影响范围)";
this.checkTargetRange.UseVisualStyleBackColor = true;
......@@ -443,7 +443,7 @@ private void InitializeComponent()
this.checkRange.AutoSize = true;
this.checkRange.Location = new System.Drawing.Point(6, 20);
this.checkRange.Name = "checkRange";
this.checkRange.Size = new System.Drawing.Size(198, 16);
this.checkRange.Size = new System.Drawing.Size(196, 16);
this.checkRange.TabIndex = 0;
this.checkRange.Text = "有Range(位于某些位置才能发动)";
this.checkRange.UseVisualStyleBackColor = true;
......@@ -465,17 +465,18 @@ private void InitializeComponent()
this.checkHintTiming.AutoSize = true;
this.checkHintTiming.Location = new System.Drawing.Point(10, 64);
this.checkHintTiming.Name = "checkHintTiming";
this.checkHintTiming.Size = new System.Drawing.Size(276, 16);
this.checkHintTiming.Size = new System.Drawing.Size(267, 16);
this.checkHintTiming.TabIndex = 3;
this.checkHintTiming.Text = "某些额外时点要询问玩家是否发动(HintTiming)";
this.checkHintTiming.UseVisualStyleBackColor = true;
this.checkHintTiming.CheckedChanged += new System.EventHandler(this.checkHintTiming_CheckedChanged);
//
// checkReset
//
this.checkReset.AutoSize = true;
this.checkReset.Location = new System.Drawing.Point(10, 42);
this.checkReset.Name = "checkReset";
this.checkReset.Size = new System.Drawing.Size(246, 16);
this.checkReset.Size = new System.Drawing.Size(242, 16);
this.checkReset.TabIndex = 2;
this.checkReset.Text = "这个效果在满足某种条件后会消失(Reset)";
this.checkReset.UseVisualStyleBackColor = true;
......@@ -486,7 +487,7 @@ private void InitializeComponent()
this.checkCountLimit.AutoSize = true;
this.checkCountLimit.Location = new System.Drawing.Point(10, 20);
this.checkCountLimit.Name = "checkCountLimit";
this.checkCountLimit.Size = new System.Drawing.Size(198, 16);
this.checkCountLimit.Size = new System.Drawing.Size(190, 16);
this.checkCountLimit.TabIndex = 1;
this.checkCountLimit.Text = "每回合最多使用X次(CountLimit)";
this.checkCountLimit.UseVisualStyleBackColor = true;
......@@ -507,7 +508,7 @@ private void InitializeComponent()
//
this.txtSearchEffectCategory.Location = new System.Drawing.Point(6, 20);
this.txtSearchEffectCategory.Name = "txtSearchEffectCategory";
this.txtSearchEffectCategory.Size = new System.Drawing.Size(268, 21);
this.txtSearchEffectCategory.Size = new System.Drawing.Size(268, 19);
this.txtSearchEffectCategory.TabIndex = 2;
this.txtSearchEffectCategory.TextChanged += new System.EventHandler(this.txtSearchEffectCategory_TextChanged);
//
......@@ -543,7 +544,7 @@ private void InitializeComponent()
0,
0});
this.numCardCode.Name = "numCardCode";
this.numCardCode.Size = new System.Drawing.Size(98, 21);
this.numCardCode.Size = new System.Drawing.Size(98, 19);
this.numCardCode.TabIndex = 10;
this.numCardCode.Value = new decimal(new int[] {
1000,
......@@ -565,7 +566,7 @@ private void InitializeComponent()
0,
-2147483648});
this.numDescription.Name = "numDescription";
this.numDescription.Size = new System.Drawing.Size(70, 21);
this.numDescription.Size = new System.Drawing.Size(70, 19);
this.numDescription.TabIndex = 12;
this.numDescription.Value = new decimal(new int[] {
1,
......@@ -578,7 +579,7 @@ private void InitializeComponent()
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(113, 12);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(77, 12);
this.label2.Size = new System.Drawing.Size(73, 12);
this.label2.TabIndex = 11;
this.label2.Text = "描述(-1禁用)";
//
......@@ -596,7 +597,7 @@ private void InitializeComponent()
0,
0});
this.numEffectNum.Name = "numEffectNum";
this.numEffectNum.Size = new System.Drawing.Size(63, 21);
this.numEffectNum.Size = new System.Drawing.Size(63, 19);
this.numEffectNum.TabIndex = 14;
this.numEffectNum.Value = new decimal(new int[] {
1,
......@@ -638,7 +639,7 @@ private void InitializeComponent()
//
this.txtSearchProperty.Location = new System.Drawing.Point(6, 20);
this.txtSearchProperty.Name = "txtSearchProperty";
this.txtSearchProperty.Size = new System.Drawing.Size(268, 21);
this.txtSearchProperty.Size = new System.Drawing.Size(268, 19);
this.txtSearchProperty.TabIndex = 2;
this.txtSearchProperty.TextChanged += new System.EventHandler(this.txtSearchProperty_TextChanged);
//
......@@ -665,7 +666,7 @@ private void InitializeComponent()
0,
-2147483648});
this.numFunctionNum.Name = "numFunctionNum";
this.numFunctionNum.Size = new System.Drawing.Size(63, 21);
this.numFunctionNum.Size = new System.Drawing.Size(63, 19);
this.numFunctionNum.TabIndex = 18;
this.numFunctionNum.Value = new decimal(new int[] {
1,
......@@ -678,7 +679,7 @@ private void InitializeComponent()
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(259, 12);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(113, 12);
this.label4.Size = new System.Drawing.Size(109, 12);
this.label4.TabIndex = 17;
this.label4.Text = "函数识别码(-1禁用)";
//
......
......@@ -342,5 +342,10 @@ private void checkReset_CheckedChanged(object sender, EventArgs e)
}
}
}
private void checkHintTiming_CheckedChanged(object sender, EventArgs e)
{
}
}
}
......@@ -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")]
★更新历史
3.0.1.0
更新了一个新的编辑器。现在能正常显示中文了。
旧编辑器仍可使用,请在菜单里进行切换。
初始化中的m / cm更名为id / this。
现在可以初始化各种不同的类型了。
3.0.0.6
你现在可以在选项菜单中调整函数提示的字体及其大小了。
现在当滚动到文本末尾时,仍然可以继续向下滚动。
......
<?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" />
......
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