From eb66539450a103e285e77f6211f45266aa475000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=AF=E9=91=AB=20=E9=96=A2?= Date: Sun, 14 Jul 2019 18:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=85=A5ItemObject?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CLEditor/windows/DataBaseWindow.xaml | 207 ++++++++++--------- CLEditor/windows/DataBaseWindow.xaml.cs | 8 +- Engine/CLEngine.Core/framework/ItemObject.cs | 32 ++- 3 files changed, 150 insertions(+), 97 deletions(-) diff --git a/CLEditor/windows/DataBaseWindow.xaml b/CLEditor/windows/DataBaseWindow.xaml index 4cf396b..46fdbdd 100644 --- a/CLEditor/windows/DataBaseWindow.xaml +++ b/CLEditor/windows/DataBaseWindow.xaml @@ -14,120 +14,137 @@ - - - - + + + + + + + + diff --git a/CLEditor/windows/DataBaseWindow.xaml.cs b/CLEditor/windows/DataBaseWindow.xaml.cs index 2503dcc..7206cae 100644 --- a/CLEditor/windows/DataBaseWindow.xaml.cs +++ b/CLEditor/windows/DataBaseWindow.xaml.cs @@ -1,4 +1,5 @@ -using System; +using CLEngine.Core; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -23,5 +24,10 @@ namespace CLEngine.Editor.windows { InitializeComponent(); } + + private void CloseBtn_Click(object sender, RoutedEventArgs e) + { + this.Close(); + } } } diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs index 265729c..41c1a7c 100644 --- a/Engine/CLEngine.Core/framework/ItemObject.cs +++ b/Engine/CLEngine.Core/framework/ItemObject.cs @@ -95,10 +95,40 @@ namespace CLEngine.Core.framework [DataMember] private int _addADDef; [DataMember] private int _addAPDef; [DataMember] private int _cd; + [DataMember] private bool _onlyGetOne; + [DataMember] private float _hitAccuracy; + [DataMember] private float _missPercent; + [DataMember] private float _magicUseSpeed; + [DataMember] private string _classification; + [DataMember] private bool _onlyStoreOne; [NonSerialized] private Texture2D _texture; private int _positionInBag; /// + /// 仓库唯一 + /// + public bool OnlyStoreOne{ get{ return _onlyStoreOne; }set{ _onlyStoreOne = value; } } + /// + /// 分类 + /// + public string Classification{ get{ return _classification; }set{ _classification = value; } } + /// + /// 施法速率 + /// + public float MagicUseSpeed{ get{ return _magicUseSpeed; }set{ _magicUseSpeed = value; } } + /// + /// 闪避率 + /// + public float MissPercent { get { return _missPercent; } set { _missPercent = value; } } + /// + /// 命中率 + /// + public float HitAccuracy{ get{ return _hitAccuracy; }set{ _hitAccuracy = value; } } + /// + /// 背包唯一 + /// + public bool OnlyGetOne{ get{ return _onlyGetOne; }set{ _onlyGetOne = value; } } + /// /// 冷却时间 /// public int CD{ get { return _cd; }set { _cd = value; } } @@ -297,7 +327,7 @@ namespace CLEngine.Core.framework /// /// 附加属性：角色魔法值 /// - public int AddHeroMp { get { return _addMp; } set { _addMp = value; } } + public int AddMp { get { return _addMp; } set { _addMp = value; } } /// /// 附加属性：角色生命值恢复 /// -- Gitee