diff --git a/Engine/CLEngine.Core/framework/FrameworkSettings.cs b/Engine/CLEngine.Core/framework/FrameworkSettings.cs index e16a40417e3c2f7578bc05cfedbc6bc5cf592305..223dc3c829d423432047c0f0d4c734c37926d0e4 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 { - /// - /// 框架设置类 - /// 用于设置全局框架内容 - /// + /// + /// 框架设置类 + /// 用于设置全局框架内容 + /// #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; - /// - /// 默认背包位置 - /// - public static Vector2 DefaultBagPosition - { - get { return _defaultBagPosition; } - set { _defaultBagPosition = value; } - } + /// + /// 默认背包位置 + /// + public static Vector2 DefaultBagPosition + { + get { return _defaultBagPosition; } + set { _defaultBagPosition = value; } + } - static FrameworkSettings() - { - DefaultBagPosition = Vector2.Zero; - } - } + static FrameworkSettings() + { + DefaultBagPosition = Vector2.Zero; + } + /// + /// 物品列表 + /// + public static Dictionary> ItemTypes = new Dictionary>{ + {"物品",new List{"消耗品","任务用品","材料","礼包" } }, + {"装备",new List{"武器","鞋子","帽子","衣服","裤子","首饰","戒指" } }, + }; + } } \ No newline at end of file diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs index 090d20a0b40409b3253ad8458909c0c2550e76e2..265729cce30bc0cf2e7d36dc28cabc1ef3d4d23c 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; /// + /// 冷却时间 + /// + public int CD{ get { return _cd; }set { _cd = value; } } + /// /// 回复法力值 /// public int Mp{ get{ return _mp; }set{ _mp = value; } }