From b657f16dc5ecc017e28737760563480249d4f635 Mon Sep 17 00:00:00 2001 From: Peter Xin Date: Fri, 1 Aug 2014 08:46:50 +0800 Subject: [PATCH] Fixed Bug from release #2 --- .../ProtoTroopMember.Designer.cs | 92 +++++++++---------- .../DataEditor.Control.Wrapper.csproj | 1 + DataEditor.Control/DataEditor.Control.csproj | 7 +- DataEditor.Control/WrapBaseEditor.cs | 1 + ...Editor.Control.csproj.FileListAbsolute.txt | 2 + DataEditor.Help/DataEditor.Help.csproj | 7 +- ...ataEditor.Help.csproj.FileListAbsolute.txt | 2 + DataEditor.Ruby/DataEditor.Ruby.csproj | 2 +- ...ataEditor.Ruby.csproj.FileListAbsolute.txt | 1 + 9 files changed, 62 insertions(+), 53 deletions(-) diff --git a/DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs b/DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs index 84e9f9b..c1cf573 100644 --- a/DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs +++ b/DataEditor.Control.Prototype/ProtoTroopMember.Designer.cs @@ -33,6 +33,8 @@ private void InitializeComponent() this.btAuto = new System.Windows.Forms.Button(); this.btBackground = new System.Windows.Forms.Button(); this.btBattleTest = new System.Windows.Forms.Button(); + this.troopMain = new DataEditor.Control.Prototype.ProtoTroopBitmap(); + this.lbList = new DataEditor.Control.Prototype.ProtoListBox(); this.label2 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); @@ -47,11 +49,9 @@ private void InitializeComponent() this.label6 = new System.Windows.Forms.Label(); this.cbFlash = new System.Windows.Forms.CheckBox(); this.cbUndead = new System.Windows.Forms.CheckBox(); + this.cbType = new DataEditor.Control.Prototype.ProtoComboBox(); this.nudX = new System.Windows.Forms.NumericUpDown(); this.nudY = new System.Windows.Forms.NumericUpDown(); - this.troopMain = new DataEditor.Control.Prototype.ProtoTroopBitmap(); - this.lbList = new DataEditor.Control.Prototype.ProtoListBox(); - this.cbType = new DataEditor.Control.Prototype.ProtoComboBox(); this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.panel1.SuspendLayout(); @@ -121,6 +121,35 @@ private void InitializeComponent() this.btBattleTest.UseVisualStyleBackColor = true; this.btBattleTest.Click += new System.EventHandler(this.btBattleTest_Click); // + // troopMain + // + this.troopMain.Background = null; + this.troopMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tableLayoutPanel1.SetColumnSpan(this.troopMain, 3); + this.troopMain.Components = ((System.Collections.Generic.List)(resources.GetObject("troopMain.Components"))); + this.troopMain.Coodinates = ((System.Collections.Generic.List)(resources.GetObject("troopMain.Coodinates"))); + this.troopMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.troopMain.Frontground = null; + this.troopMain.Location = new System.Drawing.Point(3, 29); + this.troopMain.Name = "troopMain"; + this.tableLayoutPanel1.SetRowSpan(this.troopMain, 2); + this.troopMain.SelectedIndex = -1; + this.troopMain.Size = new System.Drawing.Size(462, 292); + this.troopMain.TabIndex = 3; + this.troopMain.SelectedIndexChanged += new System.EventHandler(this.troopMain_SelectedIndexChanged); + this.troopMain.SelectedBitmapMoved += new System.EventHandler(this.troopMain_SelectedBitmapMoved); + // + // lbList + // + this.lbList.DisappearRectLosingFocus = false; + this.lbList.Dock = System.Windows.Forms.DockStyle.Fill; + this.lbList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.lbList.FormattingEnabled = true; + this.lbList.Location = new System.Drawing.Point(627, 106); + this.lbList.Name = "lbList"; + this.lbList.Size = new System.Drawing.Size(153, 215); + this.lbList.TabIndex = 4; + // // label2 // this.label2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -301,6 +330,20 @@ private void InitializeComponent() this.cbUndead.UseVisualStyleBackColor = true; this.cbUndead.CheckedChanged += new System.EventHandler(this.cbUndead_CheckedChanged); // + // cbType + // + this.tableLayoutPanel2.SetColumnSpan(this.cbType, 3); + this.cbType.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbType.FormattingEnabled = true; + this.cbType.ItemHeight = 12; + this.cbType.Location = new System.Drawing.Point(72, 3); + this.cbType.Name = "cbType"; + this.cbType.Size = new System.Drawing.Size(234, 18); + this.cbType.TabIndex = 8; + this.cbType.SelectedIndexChanged += new System.EventHandler(this.cbType_SelectedIndexChanged); + this.cbType.Enter += new System.EventHandler(this.cbType_Enter); + // // nudX // this.nudX.Dock = System.Windows.Forms.DockStyle.Fill; @@ -327,49 +370,6 @@ private void InitializeComponent() this.nudY.Size = new System.Drawing.Size(84, 21); this.nudY.TabIndex = 10; // - // troopMain - // - this.troopMain.Background = null; - this.troopMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tableLayoutPanel1.SetColumnSpan(this.troopMain, 3); - this.troopMain.Components = ((System.Collections.Generic.List)(resources.GetObject("troopMain.Components"))); - this.troopMain.Coodinates = ((System.Collections.Generic.List)(resources.GetObject("troopMain.Coodinates"))); - this.troopMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.troopMain.Frontground = null; - this.troopMain.Location = new System.Drawing.Point(3, 29); - this.troopMain.Name = "troopMain"; - this.tableLayoutPanel1.SetRowSpan(this.troopMain, 2); - this.troopMain.SelectedIndex = -1; - this.troopMain.Size = new System.Drawing.Size(462, 292); - this.troopMain.TabIndex = 3; - this.troopMain.SelectedIndexChanged += new System.EventHandler(this.troopMain_SelectedIndexChanged); - this.troopMain.SelectedBitmapMoved += new System.EventHandler(this.troopMain_SelectedBitmapMoved); - // - // lbList - // - this.lbList.DisappearRectLosingFocus = false; - this.lbList.Dock = System.Windows.Forms.DockStyle.Fill; - this.lbList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.lbList.FormattingEnabled = true; - this.lbList.Location = new System.Drawing.Point(627, 106); - this.lbList.Name = "lbList"; - this.lbList.Size = new System.Drawing.Size(153, 215); - this.lbList.TabIndex = 4; - // - // cbType - // - this.tableLayoutPanel2.SetColumnSpan(this.cbType, 3); - this.cbType.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cbType.FormattingEnabled = true; - this.cbType.ItemHeight = 12; - this.cbType.Location = new System.Drawing.Point(72, 3); - this.cbType.Name = "cbType"; - this.cbType.Size = new System.Drawing.Size(234, 18); - this.cbType.TabIndex = 8; - this.cbType.SelectedIndexChanged += new System.EventHandler(this.cbType_SelectedIndexChanged); - this.cbType.Enter += new System.EventHandler(this.cbType_Enter); - // // ProtoTroopMember // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj b/DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj index 221d43f..7894500 100644 --- a/DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj +++ b/DataEditor.Control.Wrapper/DataEditor.Control.Wrapper.csproj @@ -127,6 +127,7 @@ {3332a025-6e2b-4d9f-8a46-9f2350b39750} DataEditor.FuzzyData.Extra + False {3516d3c7-f112-4763-9f2d-0b17991c12ff} diff --git a/DataEditor.Control/DataEditor.Control.csproj b/DataEditor.Control/DataEditor.Control.csproj index 7705607..9f9d326 100644 --- a/DataEditor.Control/DataEditor.Control.csproj +++ b/DataEditor.Control/DataEditor.Control.csproj @@ -30,9 +30,6 @@ 4 - - ..\..\DataEditor\DataEditor.FuzzyData\bin\Debug\DataEditor.FuzzyData.dll - @@ -61,6 +58,10 @@ {d7dfc2b5-bb85-4037-b052-c4f1e3c1bde0} DataEditor.Contract + + {3516d3c7-f112-4763-9f2d-0b17991c12ff} + DataEditor.FuzzyData + {aafc4019-7092-4e66-9f1d-8a3ea4ba75a0} DataEditor.Help diff --git a/DataEditor.Control/WrapBaseEditor.cs b/DataEditor.Control/WrapBaseEditor.cs index c148c9f..a10e06d 100644 --- a/DataEditor.Control/WrapBaseEditor.cs +++ b/DataEditor.Control/WrapBaseEditor.cs @@ -93,6 +93,7 @@ public virtual FuzzyData.FuzzyObject Parent FuzzyData.FuzzyObject origin = GetValueFromChild(value); TValue ans = ConvertToValue(origin); if (ans == null) + //this.value = parent; EnableData = SetDefault() ? DataState.Disable : DataState.Default; else { diff --git a/DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt b/DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt index e337293..a4d712b 100644 --- a/DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt +++ b/DataEditor.Control/obj/Debug/DataEditor.Control.csproj.FileListAbsolute.txt @@ -48,3 +48,5 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.csprojResolveAssemblyReference.cache E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.dll E:\VS Projects\DataEditor.Ruby\DataEditor.Control\obj\Debug\DataEditor.Control.pdb +E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData.dll +E:\VS Projects\DataEditor.Ruby\DataEditor.Control\bin\Debug\DataEditor.FuzzyData.pdb diff --git a/DataEditor.Help/DataEditor.Help.csproj b/DataEditor.Help/DataEditor.Help.csproj index 1084f8f..2bfdba3 100644 --- a/DataEditor.Help/DataEditor.Help.csproj +++ b/DataEditor.Help/DataEditor.Help.csproj @@ -31,9 +31,6 @@ 4 - - ..\..\DataEditor\DataEditor.FuzzyData\bin\Debug\DataEditor.FuzzyData.dll - @@ -85,6 +82,10 @@ {a9c0dc50-cec6-401b-92e3-65787c9bedc9} DataEditor.FuzzyData.Serialization.RubyMarshal + + {3516d3c7-f112-4763-9f2d-0b17991c12ff} + DataEditor.FuzzyData + diff --git a/DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt b/DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt index f3cbc90..a5e1631 100644 --- a/DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt +++ b/DataEditor.Help/obj/Debug/DataEditor.Help.csproj.FileListAbsolute.txt @@ -50,3 +50,5 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Control.Wind E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.csproj.GenerateResource.Cache E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.dll E:\VS Projects\DataEditor.Ruby\DataEditor.Help\obj\Debug\DataEditor.Help.pdb +E:\VS Projects\DataEditor.Ruby\DataEditor.Help\bin\Debug\DataEditor.FuzzyData.dll +E:\VS Projects\DataEditor.Ruby\DataEditor.Help\bin\Debug\DataEditor.FuzzyData.pdb diff --git a/DataEditor.Ruby/DataEditor.Ruby.csproj b/DataEditor.Ruby/DataEditor.Ruby.csproj index 02115f0..08ed706 100644 --- a/DataEditor.Ruby/DataEditor.Ruby.csproj +++ b/DataEditor.Ruby/DataEditor.Ruby.csproj @@ -59,7 +59,7 @@ W:\IronRuby 1.0v4\bin\Microsoft.Scripting.dll - W:\IronRuby 1.0v4\bin\Microsoft.Scripting.Debugging.dll + ..\..\..\IronRuby 1.0v4\bin\Microsoft.Scripting.Debugging.dll diff --git a/DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt b/DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt index 8ac2298..7d74607 100644 --- a/DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt +++ b/DataEditor.Ruby/obj/Debug/DataEditor.Ruby.csproj.FileListAbsolute.txt @@ -85,3 +85,4 @@ E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.Control.pdb E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.Help.pdb E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\DataEditor.FuzzyData.Serialization.RubyMarshal.pdb E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\obj\Debug\DataEditor.Ruby.dll +E:\VS Projects\DataEditor.Ruby\DataEditor.Ruby\bin\Debug\Microsoft.Scripting.Debugging.dll