From 9c40abed1e586c7abca65bedc587047eee134847 Mon Sep 17 00:00:00 2001
From: yhh <359807859@qq.com>
Date: Wed, 10 Jul 2019 13:38:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20ItemObject.cs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Engine/CLEngine.Core/framework/ItemObject.cs | 322 ++++++++++---------
1 file changed, 165 insertions(+), 157 deletions(-)
diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs
index 497fab6..b32b2c7 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -1,164 +1,172 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
namespace CLEngine.Core.framework
{
- public class ItemEventArgs : EventArgs
- {
- int userId;
- public ItemEventArgs(int user)
- {
- userId = user;
- }
- }
- public class ItemObject
- {
- ///
- /// 使用事件
- ///
- public EventHandler Use;
- ///
- /// 获取事件
- ///
- public EventHandler Get;
- ///
- /// 丢弃事件
- ///
- public EventHandler Throw;
- ///
- /// 物品数量改变事件
- ///
- public EventHandler NumberChange;
+ ///
+ ///
+ ///
+ public class ItemEventArgs : EventArgs
+ {
+ int userId;
- [DataMember] private string _iconPath;
- [DataMember] private string _name;
- [DataMember] private string _description;
- [DataMember] private string _type;
- [DataMember] private int _userId;
- [DataMember] private int _id;
- [DataMember] private int _number;
- [DataMember] private int _maxNumber;
- [DataMember] private int _hp;//耐久
- [DataMember] private int _maxHp;//最大耐久
- //Add开头的为附加属性
- [DataMember] private int _addMoveSpeed;
- [DataMember] private int _addAtkSpeed;
- [DataMember] private int _addAtkRange;
- [DataMember] private int _addHeroHp;
- [DataMember] private int _addHeroMp;
- [DataMember] private int _addReturnHp;//回血
- [DataMember] private int _addReturnMp;//回蓝
- ///
- /// 物品类型
- ///
- public string Type { get { return _type; } set { _type = value; } }
- ///
- /// 物品描述
- ///
- public string Description { get { return _description; } set { _description = value; } }
- ///
- /// 物品名称
- ///
- public string Name { get { return _name; } set { _name = value; } }
- ///
- /// 物品图标路径
- ///
- public string IconPath { get { return _iconPath; } set { _iconPath = value; } }
- ///
- /// 持有者id
- ///
- public int userId { get { return _userId; } set { _userId = value; } }
- ///
- /// 物品id
- ///
- public int Id { get { return _id; } internal set { _id = value; } }
- ///
- /// 数量
- ///
- public int Number { get { return _number; } set { _number = value; } }
- ///
- /// 最大堆叠数量
- ///
- public int MaxNumber { get { return _maxNumber; } set { _maxNumber = value; } }
- ///
- /// 耐久
- ///
- public int Hp { get { return _hp; } set { _hp = value; } }
- ///
- /// 最大耐久
- ///
- public int MaxHp { get { return _maxHp; } set { _maxHp = value; } }
- ///
- /// 附加属性:移动速度
- ///
- public int AddMoveSpeed { get { return _addMoveSpeed; } set { _addMoveSpeed = value; } }
- ///
- /// 附加属性:攻击速度
- ///
- public int AddAtkSpeed { get { return _addAtkSpeed; } set { _addAtkSpeed = value; } }
- ///
- /// 附加属性:攻击范围
- ///
- public int AddAtkRange { get { return _addAtkRange; } set { _addAtkRange = value; } }
- ///
- /// 附加属性:角色生命值
- ///
- public int AddHeroHp { get { return _addHeroHp; } set { _addHeroHp = value; } }
- ///
- /// 附加属性:角色魔法值
- ///
- public int AddHeroMp { get { return _addHeroMp; } set { _addHeroMp = value; } }
- ///
- /// 附加属性:角色生命值恢复
- ///
- public int AddReturnHp { get { return _addReturnHp; } set { _addReturnHp = value; } }
- ///
- /// 附加属性:角色魔法值恢复
- ///
- public int AddReturnMp { get { return _addReturnMp; } set { _addReturnMp = value; } }
- ///
- /// 使用物品
- ///
- public void UseItem()
- {
- if (Use != null)
- {
- Use.Invoke(this, new ItemEventArgs(userId));
- }
- }
- ///
- /// 获取物品
- ///
- public void getItem()
- {
- if (Get != null)
- {
- Get.Invoke(this, new ItemEventArgs(userId));
- }
- }
- ///
- /// 丢掉物品
- ///
- public void ThrowItem()
- {
- if (Throw != null)
- {
- Throw.Invoke(this, new ItemEventArgs(userId));
- }
- }
- ///
- /// 物品数量改变
- ///
- public void ItemNumberChange()
- {
- if (NumberChange != null)
- {
- NumberChange.Invoke(this, new ItemEventArgs(userId));
- }
- }
- }
+ ///
+ ///
+ ///
+ ///
+ public ItemEventArgs(int user)
+ {
+ userId = user;
+ }
+ }
+
+ ///
+ /// 游戏物品
+ ///
+ public class ItemObject
+ {
+ ///
+ /// 使用事件
+ ///
+ public EventHandler Use;
+ ///
+ /// 获取事件
+ ///
+ public EventHandler Get;
+ ///
+ /// 丢弃事件
+ ///
+ public EventHandler Throw;
+ ///
+ /// 物品数量改变事件
+ ///
+ public EventHandler NumberChange;
+
+ [DataMember] private string _iconPath;
+ [DataMember] private string _name;
+ [DataMember] private string _description;
+ [DataMember] private string _type;
+ [DataMember] private int _userId;
+ [DataMember] private int _id;
+ [DataMember] private int _number;
+ [DataMember] private int _maxNumber;
+ [DataMember] private int _hp;
+ [DataMember] private int _maxHp;
+ [DataMember] private int _addMoveSpeed;
+ [DataMember] private int _addAtkSpeed;
+ [DataMember] private int _addAtkRange;
+ [DataMember] private int _addHeroHp;
+ [DataMember] private int _addHeroMp;
+ [DataMember] private int _addReturnHp;
+ [DataMember] private int _addReturnMp;
+
+ ///
+ /// 物品类型
+ ///
+ public string Type { get { return _type; } set { _type = value; } }
+ ///
+ /// 物品描述
+ ///
+ public string Description { get { return _description; } set { _description = value; } }
+ ///
+ /// 物品名称
+ ///
+ public string Name { get { return _name; } set { _name = value; } }
+ ///
+ /// 物品图标路径
+ ///
+ public string IconPath { get { return _iconPath; } set { _iconPath = value; } }
+ ///
+ /// 持有者id
+ ///
+ public int userId { get { return _userId; } set { _userId = value; } }
+ ///
+ /// 物品id
+ ///
+ public int Id { get { return _id; } internal set { _id = value; } }
+ ///
+ /// 数量
+ ///
+ public int Number { get { return _number; } set { _number = value; } }
+ ///
+ /// 最大堆叠数量
+ ///
+ public int MaxNumber { get { return _maxNumber; } set { _maxNumber = value; } }
+ ///
+ /// 耐久
+ ///
+ public int Hp { get { return _hp; } set { _hp = value; } }
+ ///
+ /// 最大耐久
+ ///
+ public int MaxHp { get { return _maxHp; } set { _maxHp = value; } }
+ ///
+ /// 附加属性:移动速度
+ ///
+ public int AddMoveSpeed { get { return _addMoveSpeed; } set { _addMoveSpeed = value; } }
+ ///
+ /// 附加属性:攻击速度
+ ///
+ public int AddAtkSpeed { get { return _addAtkSpeed; } set { _addAtkSpeed = value; } }
+ ///
+ /// 附加属性:攻击范围
+ ///
+ public int AddAtkRange { get { return _addAtkRange; } set { _addAtkRange = value; } }
+ ///
+ /// 附加属性:角色生命值
+ ///
+ public int AddHeroHp { get { return _addHeroHp; } set { _addHeroHp = value; } }
+ ///
+ /// 附加属性:角色魔法值
+ ///
+ public int AddHeroMp { get { return _addHeroMp; } set { _addHeroMp = value; } }
+ ///
+ /// 附加属性:角色生命值恢复
+ ///
+ public int AddReturnHp { get { return _addReturnHp; } set { _addReturnHp = value; } }
+ ///
+ /// 附加属性:角色魔法值恢复
+ ///
+ public int AddReturnMp { get { return _addReturnMp; } set { _addReturnMp = value; } }
+ ///
+ /// 使用物品
+ ///
+ public void UseItem()
+ {
+ if (Use != null)
+ {
+ Use.Invoke(this, new ItemEventArgs(userId));
+ }
+ }
+ ///
+ /// 获取物品
+ ///
+ public void getItem()
+ {
+ if (Get != null)
+ {
+ Get.Invoke(this, new ItemEventArgs(userId));
+ }
+ }
+ ///
+ /// 丢掉物品
+ ///
+ public void ThrowItem()
+ {
+ if (Throw != null)
+ {
+ Throw.Invoke(this, new ItemEventArgs(userId));
+ }
+ }
+ ///
+ /// 物品数量改变
+ ///
+ public void ItemNumberChange()
+ {
+ if (NumberChange != null)
+ {
+ NumberChange.Invoke(this, new ItemEventArgs(userId));
+ }
+ }
+ }
}
--
Gitee
From 1bf16153c1918a394d6fd2eff99568fb6529b479 Mon Sep 17 00:00:00 2001
From: yhh <359807859@qq.com>
Date: Wed, 10 Jul 2019 13:47:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?=
=?UTF-8?q?=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/README.md b/README.md
index 79f0843..9bd9f0a 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,16 @@
- 编写该提交内容的作用
- 经项目管理者审核后合并至分支
+### 开发规范
+在开始开发项目当中,请先设置您的代码格式,在visual studio当中,`工具` -> `选项` -> `文本编辑器` -> `C#` -> `制表符`
+
+- 设置缩进为 `块`
+- 制表符当中选择 `保留制表符`
+- 制表符大小 `4`
+- 缩进大小 `4`
+
+代码整理: `ctrl + k + f`
+
### 编辑器展示

--
Gitee