Skip to content

D
DataEditorX
Commit f7b90978 authored by JoyJ's avatar JoyJ
Browse files
Options

fixes

parent ef599f95
Pipeline #134 passed with stage
    in 1 minute and 10 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 279 additions and 34 deletions
    DataEditorX/Controls/MySyntaxHighlighter.cs
    View file @ f7b90978
    This diff is collapsed.
    DataEditorX/CountLimitForm.Designer.cs
    View file @ f7b90978
    ......@@ -30,18 +30,18 @@ private void InitializeComponent()
    {
    this.checkIsOath = new System.Windows.Forms.CheckBox();
    this.groupBox1 = new System.Windows.Forms.GroupBox();
    this.label2 = new System.Windows.Forms.Label();
    this.checkIsSingle = new System.Windows.Forms.CheckBox();
    this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
    this.checkIsHasCode = new System.Windows.Forms.CheckBox();
    this.checkIsInDuel = new System.Windows.Forms.CheckBox();
    this.btnOK = new System.Windows.Forms.Button();
    this.btnCancel = new System.Windows.Forms.Button();
    this.numCount = new System.Windows.Forms.NumericUpDown();
    this.label1 = new System.Windows.Forms.Label();
    this.label2 = new System.Windows.Forms.Label();
    this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
    this.groupBox1.SuspendLayout();
    ((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit();
    ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
    ((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit();
    this.SuspendLayout();
    //
    // checkIsOath
    ......@@ -69,6 +69,15 @@ private void InitializeComponent()
    this.groupBox1.TabStop = false;
    this.groupBox1.Text = "效果特点";
    //
    // label2
    //
    this.label2.AutoSize = true;
    this.label2.Location = new System.Drawing.Point(156, 64);
    this.label2.Name = "label2";
    this.label2.Size = new System.Drawing.Size(53, 12);
    this.label2.TabIndex = 7;
    this.label2.Text = "code偏移";
    //
    // checkIsSingle
    //
    this.checkIsSingle.AutoSize = true;
    ......@@ -79,6 +88,18 @@ private void InitializeComponent()
    this.checkIsSingle.Text = "与其他效果共用次数，且没有同名卡限制";
    this.checkIsSingle.UseVisualStyleBackColor = true;
    //
    // numericUpDown1
    //
    this.numericUpDown1.Location = new System.Drawing.Point(215, 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.TabIndex = 6;
    //
    // checkIsHasCode
    //
    this.checkIsHasCode.AutoSize = true;
    ......@@ -122,7 +143,7 @@ private void InitializeComponent()
    this.btnCancel.Text = "取消";
    this.btnCancel.UseVisualStyleBackColor = true;
    //
    // numCode
    // numCount
    //
    this.numCount.Location = new System.Drawing.Point(75, 130);
    this.numCount.Minimum = new decimal(new int[] {
    ......@@ -130,7 +151,7 @@ private void InitializeComponent()
    0,
    0,
    0});
    this.numCount.Name = "numCode";
    this.numCount.Name = "numCount";
    this.numCount.Size = new System.Drawing.Size(57, 21);
    this.numCount.TabIndex = 4;
    this.numCount.Value = new decimal(new int[] {
    ......@@ -148,27 +169,6 @@ private void InitializeComponent()
    this.label1.TabIndex = 5;
    this.label1.Text = "次数限制";
    //
    // label2
    //
    this.label2.AutoSize = true;
    this.label2.Location = new System.Drawing.Point(156, 64);
    this.label2.Name = "label2";
    this.label2.Size = new System.Drawing.Size(53, 12);
    this.label2.TabIndex = 7;
    this.label2.Text = "code偏移";
    //
    // numericUpDown1
    //
    this.numericUpDown1.Location = new System.Drawing.Point(215, 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.TabIndex = 6;
    //
    // CountLimitForm
    //
    this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
    ......@@ -185,10 +185,11 @@ private void InitializeComponent()
    this.Name = "CountLimitForm";
    this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
    this.Text = "使用次数限制";
    this.TopMost = true;
    this.groupBox1.ResumeLayout(false);
    this.groupBox1.PerformLayout();
    ((System.ComponentModel.ISupportInitialize)(this.numCount)).EndInit();
    ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
    ((System.ComponentModel.ISupportInitialize)(this.numCount)).EndInit();
    this.ResumeLayout(false);
    this.PerformLayout();
    ......
    DataEditorX/CountLimitForm.cs
    View file @ f7b90978
    ......@@ -32,9 +32,9 @@ public class EffectCountLimit
    public bool IsInDuel = false;
    public bool IsHasCode = false;
    public bool IsSingle = false;
    public decimal Code;
    public decimal Offset;
    public decimal Count;
    public decimal Code = 1000;
    public decimal Offset = 0;
    public decimal Count = 1;
    public EffectCountLimit(decimal code)
    {
    Code = code;
    ......
    DataEditorX/DataEditorX.csproj
    View file @ f7b90978
    ......@@ -167,6 +167,12 @@
    <Compile Include="EffectCreatorForm.Designer.cs">
    <DependentUpon>EffectCreatorForm.cs</DependentUpon>
    </Compile>
    <Compile Include="ResetForm.cs">
    <SubType>Form</SubType>
    </Compile>
    <Compile Include="ResetForm.Designer.cs">
    <DependentUpon>ResetForm.cs</DependentUpon>
    </Compile>
    <Compile Include="Language\LanguageHelper.cs" />
    <Compile Include="Language\LMsg.cs" />
    <Compile Include="Language\MyMsg.cs" />
    ......@@ -258,6 +264,9 @@
    <EmbeddedResource Include="MainForm.resx">
    <DependentUpon>MainForm.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="ResetForm.resx">
    <DependentUpon>ResetForm.cs</DependentUpon>
    </EmbeddedResource>
    </ItemGroup>
    <ItemGroup>
    <None Include="data\_functions.txt">
    ......
    DataEditorX/EffectCreatorForm.Designer.cs
    View file @ f7b90978
    ......@@ -479,6 +479,7 @@ private void InitializeComponent()
    this.checkReset.TabIndex = 2;
    this.checkReset.Text = "这个效果在满足某种条件后会消失(Reset)";
    this.checkReset.UseVisualStyleBackColor = true;
    this.checkReset.CheckedChanged += new System.EventHandler(this.checkReset_CheckedChanged);
    //
    // checkCountLimit
    //
    ......
    DataEditorX/EffectCreatorForm.cs
    View file @ f7b90978
    ......@@ -137,9 +137,9 @@ private string ProcessEffectCountLimit()
    }
    if (extraOptions.Count > 0)
    {
    return $"e{numEffectNum}:SetCountLimit({countLimit.Count},{this.LinkStrings(extraOptions)})";
    return $"e{numEffectNum.Value}:SetCountLimit({countLimit.Count},{this.LinkStrings(extraOptions)})";
    }
    return $"e{numEffectNum}:SetCountLimit({countLimit.Count})";
    return $"e{numEffectNum.Value}:SetCountLimit({countLimit.Count})";
    }
    private string ProcessEffectProperty()
    {
    ......@@ -326,5 +326,21 @@ private void checkCountLimit_CheckedChanged(object sender, EventArgs e)
    }
    }
    }
    private void checkReset_CheckedChanged(object sender, EventArgs e)
    {
    if (checkCountLimit.Checked)
    {
    if (countLimit == null)
    {
    countLimit = new EffectCountLimit(numCardCode.Value);
    }
    CountLimitForm form = new CountLimitForm(countLimit);
    if (form.ShowDialog() == DialogResult.OK)
    {
    countLimit = form.CountLimit;
    }
    }
    }
    }
    }
    DataEditorX/ResetForm.Designer.cs 0 → 100644
    View file @ f7b90978
    namespace DataEditorX
    {
    partial class ResetForm
    {
    /// <summary>
    /// Required designer variable.
    /// </summary>
    private System.ComponentModel.IContainer components = null;
    /// <summary>
    /// Clean up any resources being used.
    /// </summary>
    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
    protected override void Dispose(bool disposing)
    {
    if (disposing && (components != null))
    {
    components.Dispose();
    }
    base.Dispose(disposing);
    }
    #region Windows Form Designer generated code
    /// <summary>
    /// Required method for Designer support - do not modify
    /// the contents of this method with the code editor.
    /// </summary>
    private void InitializeComponent()
    {
    this.checkResetPhase = new System.Windows.Forms.CheckBox();
    this.checkResetEvent = new System.Windows.Forms.CheckBox();
    this.SuspendLayout();
    //
    // checkResetPhase
    //
    this.checkResetPhase.AutoSize = true;
    this.checkResetPhase.Location = new System.Drawing.Point(12, 12);
    this.checkResetPhase.Name = "checkResetPhase";
    this.checkResetPhase.Size = new System.Drawing.Size(108, 16);
    this.checkResetPhase.TabIndex = 0;
    this.checkResetPhase.Text = "阶段结束时消失";
    this.checkResetPhase.UseVisualStyleBackColor = true;
    //
    // checkResetEvent
    //
    this.checkResetEvent.AutoSize = true;
    this.checkResetEvent.Location = new System.Drawing.Point(12, 170);
    this.checkResetEvent.Name = "checkResetEvent";
    this.checkResetEvent.Size = new System.Drawing.Size(108, 16);
    this.checkResetEvent.TabIndex = 1;
    this.checkResetEvent.Text = "发生事件时消失";
    this.checkResetEvent.UseVisualStyleBackColor = true;
    //
    // ResetForm
    //
    this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
    this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    this.ClientSize = new System.Drawing.Size(433, 290);
    this.Controls.Add(this.checkResetEvent);
    this.Controls.Add(this.checkResetPhase);
    this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
    this.MaximizeBox = false;
    this.MinimizeBox = false;
    this.Name = "ResetForm";
    this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
    this.Text = "效果消失设定";
    this.ResumeLayout(false);
    this.PerformLayout();
    }
    #endregion
    private System.Windows.Forms.CheckBox checkResetPhase;
    private System.Windows.Forms.CheckBox checkResetEvent;
    }
    }
    \ No newline at end of file
    DataEditorX/ResetForm.cs 0 → 100644
    View file @ f7b90978
    using System.Windows.Forms;
    namespace DataEditorX
    {
    public partial class ResetForm : Form
    {
    class Position
    {
    }
    class Reset
    {
    }
    public ResetForm()
    {
    this.InitializeComponent();
    }
    }
    }
    DataEditorX/ResetForm.resx 0 → 100644
    View file @ f7b90978
    <?xml version="1.0" encoding="utf-8"?>
    <root>
    <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
    <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value : The object must be serialized with
    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
    : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value : The object must be serialized with
    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
    : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value : The object must be serialized into a byte array
    : using a System.ComponentModel.TypeConverter
    : and then encoded with base64 encoding.
    -->
    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
    <xsd:complexType>
    <xsd:choice maxOccurs="unbounded">
    <xsd:element name="metadata">
    <xsd:complexType>
    <xsd:sequence>
    <xsd:element name="value" type="xsd:string" minOccurs="0" />
    </xsd:sequence>
    <xsd:attribute name="name" use="required" type="xsd:string" />
    <xsd:attribute name="type" type="xsd:string" />
    <xsd:attribute name="mimetype" type="xsd:string" />
    <xsd:attribute ref="xml:space" />
    </xsd:complexType>
    </xsd:element>
    <xsd:element name="assembly">
    <xsd:complexType>
    <xsd:attribute name="alias" type="xsd:string" />
    <xsd:attribute name="name" type="xsd:string" />
    </xsd:complexType>
    </xsd:element>
    <xsd:element name="data">
    <xsd:complexType>
    <xsd:sequence>
    <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
    <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
    </xsd:sequence>
    <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
    <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
    <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
    <xsd:attribute ref="xml:space" />
    </xsd:complexType>
    </xsd:element>
    <xsd:element name="resheader">
    <xsd:complexType>
    <xsd:sequence>
    <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
    </xsd:sequence>
    <xsd:attribute name="name" type="xsd:string" use="required" />
    </xsd:complexType>
    </xsd:element>
    </xsd:choice>
    </xsd:complexType>
    </xsd:element>
    </xsd:schema>
    <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
    </resheader>
    <resheader name="version">
    <value>2.0</value>
    </resheader>
    <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    </root>
    \ No newline at end of file
    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