diff --git a/CLEditor/windows/DataBaseWindow.xaml b/CLEditor/windows/DataBaseWindow.xaml
index 4cf396bd885261d55023b38f8000f74d8faf94e2..46fdbdd5401cea9ebd344441f140b37d9e8e55c3 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 2503dccb42d5723805ea25265b447925742e5346..7206cae7058d8b97cb11297fbcf95018a28b1ef6 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 265729cce30bc0cf2e7d36dc28cabc1ef3d4d23c..41c1a7c8e4388fd1a24fa71a4595984bb96d4df1 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; } }
///
/// 附加属性：角色生命值恢复
///