From acfca961246869403f530f0850bc3eb415aa6143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=94=E5=87=A4=E5=95=B8=E5=A4=A9?= <1379113792@qq.com>
Date: Sun, 14 Jul 2019 09:12:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=B7=E5=8D=B4?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Engine/CLEngine.Core/framework/ItemObject.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs
index 090d20a..265729c 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -94,10 +94,15 @@ namespace CLEngine.Core.framework
 		[DataMember] private int _addAP;
 		[DataMember] private int _addADDef;
 		[DataMember] private int _addAPDef;
+		[DataMember] private int _cd;
 		[NonSerialized] private Texture2D _texture;
 
 		private int _positionInBag;
 		/// <summary>
+		/// 冷却时间
+		/// </summary>
+		public int CD{ get { return _cd; }set { _cd = value; } }
+		/// <summary>
 		/// 回复法力值
 		/// </summary>
 		public int Mp{ get{ return _mp; }set{ _mp = value; } }
-- 
Gitee


From 4a0e6f3b0fcd2c3d830c1e125a9e1214f387cb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=94=E5=87=A4=E5=95=B8=E5=A4=A9?= <1379113792@qq.com>
Date: Sun, 14 Jul 2019 09:22:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9EItem=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/FrameworkSettings.cs            | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/Engine/CLEngine.Core/framework/FrameworkSettings.cs b/Engine/CLEngine.Core/framework/FrameworkSettings.cs
index e16a404..223dc3c 100644
--- a/Engine/CLEngine.Core/framework/FrameworkSettings.cs
+++ b/Engine/CLEngine.Core/framework/FrameworkSettings.cs
@@ -1,33 +1,41 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Microsoft.Xna.Framework;
 
 namespace CLEngine.Core.framework
 {
-    /// <summary>
-    /// 框架设置类
-    /// 用于设置全局框架内容
-    /// </summary>
+	/// <summary>
+	/// 框架设置类
+	/// 用于设置全局框架内容
+	/// </summary>
 #if WIN
-    [Serializable]
+	[Serializable]
 #endif
-    [DataContract]
-    public static class FrameworkSettings
-    {
-        [DataMember] private static Vector2 _defaultBagPosition;
+	[DataContract]
+	public static class FrameworkSettings
+	{
+		[DataMember] private static Vector2 _defaultBagPosition;
 
-        /// <summary>
-        /// 默认背包位置
-        /// </summary>
-        public static Vector2 DefaultBagPosition
-        {
-            get { return _defaultBagPosition; }
-            set { _defaultBagPosition = value; }
-        }
+		/// <summary>
+		/// 默认背包位置
+		/// </summary>
+		public static Vector2 DefaultBagPosition
+		{
+			get { return _defaultBagPosition; }
+			set { _defaultBagPosition = value; }
+		}
 
-        static FrameworkSettings()
-        {
-            DefaultBagPosition = Vector2.Zero;
-        }
-    }
+		static FrameworkSettings()
+		{
+			DefaultBagPosition = Vector2.Zero;
+		}
+		/// <summary>
+		/// 物品列表
+		/// </summary>
+		public static Dictionary<string, List<string>> ItemTypes = new Dictionary<string, List<string>>{
+		{"物品",new List<string>{"消耗品","任务用品","材料","礼包" } },
+		{"装备",new List<string>{"武器","鞋子","帽子","衣服","裤子","首饰","戒指" } },
+		};
+	}
 }
\ No newline at end of file
-- 
Gitee