From cd2579637ff4bf23c2978935384c3007c7ee68ee 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:45:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=AC=A1?=
=?UTF-8?q?=E6=8B=BE=E5=8F=96?=
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 265729c..2ac94ac 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -95,10 +95,15 @@ namespace CLEngine.Core.framework
[DataMember] private int _addADDef;
[DataMember] private int _addAPDef;
[DataMember] private int _cd;
+ [DataMember] private bool _onlyGetOnce;
[NonSerialized] private Texture2D _texture;
private int _positionInBag;
///
+ /// 是否只能拾取一次
+ ///
+ public bool OnlyGetOnce{ get{ return _onlyGetOnce; }set{ _onlyGetOnce = value; } }
+ ///
/// 冷却时间
///
public int CD{ get { return _cd; }set { _cd = value; } }
--
Gitee
From 6d47269f62e153bcd92ba2a83559be52ec10c196 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 10:05:19 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AA=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E4=B8=80=E4=B8=AA=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Engine/CLEngine.Core/framework/ItemManager.cs | 14 +++++++++-----
Engine/CLEngine.Core/framework/ItemObject.cs | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Engine/CLEngine.Core/framework/ItemManager.cs b/Engine/CLEngine.Core/framework/ItemManager.cs
index f0273e3..8a713a5 100644
--- a/Engine/CLEngine.Core/framework/ItemManager.cs
+++ b/Engine/CLEngine.Core/framework/ItemManager.cs
@@ -188,13 +188,15 @@ namespace CLEngine.Core.framework
{
var onget = WorldFindItemById(id);
ItemObject item = null;
- int max = _playerItem.Count;
- bool is_finish = false;
- for (int i = 0; i < max; i++)
+ var max = _playerItem.Count;
+ var is_finish = false;
+ var have = false;
+ for (var i = 0; i < max; i++)
{
item = _playerItem[i];
if (item.Id == id)
{
+ have = true;
if (item.Number + number <= item.MaxNumber)
{
item.Number += number;
@@ -203,7 +205,7 @@ namespace CLEngine.Core.framework
}
}
}
- if (!is_finish)
+ if (!is_finish||(!have&&item.OnlyGetOnce))
{
onget.Number = number;
_playerItem.Add(onget);
@@ -221,11 +223,13 @@ namespace CLEngine.Core.framework
ItemObject item = null;
var max = _playerItem.Count;
var is_finish = false;
+ var have = false;
for (int i = 0; i < max; i++)
{
item = _playerItem[i];
if (item.Name == name)
{
+ have = true;
if (item.Number + number <= item.MaxNumber)
{
item.Number += number;
@@ -234,7 +238,7 @@ namespace CLEngine.Core.framework
}
}
}
- if (!is_finish)
+ if (!is_finish || (!have && item.OnlyGetOnce))
{
onget.Number = number;
_playerItem.Add(onget);
diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs
index 2ac94ac..4628847 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -100,7 +100,7 @@ namespace CLEngine.Core.framework
private int _positionInBag;
///
- /// 是否只能拾取一次
+ /// 是否只能存在一件该物品
///
public bool OnlyGetOnce{ get{ return _onlyGetOnce; }set{ _onlyGetOnce = value; } }
///
--
Gitee
From fbc8bfda3b27eeb615af043e7c9da2c40d9a7ebf 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 16:06:22 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=87=E5=90=88UI?=
=?UTF-8?q?=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Engine/CLEngine.Core/framework/ItemObject.cs | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs
index 4628847..fcf48e4 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -96,10 +96,25 @@ namespace CLEngine.Core.framework
[DataMember] private int _addAPDef;
[DataMember] private int _cd;
[DataMember] private bool _onlyGetOnce;
+ [DataMember] private float _hitAccuracy;
+ [DataMember] private float _missPercent;
+ [DataMember] private float _magicUseSpeed;
[NonSerialized] private Texture2D _texture;
private int _positionInBag;
///
+ /// 施法速率
+ ///
+ 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 OnlyGetOnce{ get{ return _onlyGetOnce; }set{ _onlyGetOnce = value; } }
--
Gitee
From 181f943a60b6cdc543f16c70277d7520bd553de1 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 16:21:09 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Engine/CLEngine.Core/framework/ItemObject.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs
index fcf48e4..7881b76 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -317,7 +317,7 @@ namespace CLEngine.Core.framework
///
/// 附加属性：角色魔法值
///
- public int AddHeroMp { get { return _addMp; } set { _addMp = value; } }
+ public int AddMp { get { return _addMp; } set { _addMp = value; } }
///
/// 附加属性：角色生命值恢复
///
--
Gitee
From 0f36bcb6ca30052e101d6cbff012e9d5330d9d75 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 18:05:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=BA=E5=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Engine/CLEngine.Core/framework/ItemManager.cs | 2 +-
Engine/CLEngine.Core/framework/ItemObject.cs | 16 +++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Engine/CLEngine.Core/framework/ItemManager.cs b/Engine/CLEngine.Core/framework/ItemManager.cs
index 8a713a5..1a665f2 100644
--- a/Engine/CLEngine.Core/framework/ItemManager.cs
+++ b/Engine/CLEngine.Core/framework/ItemManager.cs
@@ -184,7 +184,7 @@ namespace CLEngine.Core.framework
///
///
///
- public static void GetItemById(int id, int number)
+ public static void GetItemById(int id, int number)//需要注意检索是否装备唯一
{
var onget = WorldFindItemById(id);
ItemObject item = null;
diff --git a/Engine/CLEngine.Core/framework/ItemObject.cs b/Engine/CLEngine.Core/framework/ItemObject.cs
index 7881b76..41c1a7c 100644
--- a/Engine/CLEngine.Core/framework/ItemObject.cs
+++ b/Engine/CLEngine.Core/framework/ItemObject.cs
@@ -95,14 +95,24 @@ namespace CLEngine.Core.framework
[DataMember] private int _addADDef;
[DataMember] private int _addAPDef;
[DataMember] private int _cd;
- [DataMember] private bool _onlyGetOnce;
+ [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; } }
@@ -115,9 +125,9 @@ namespace CLEngine.Core.framework
///
public float HitAccuracy{ get{ return _hitAccuracy; }set{ _hitAccuracy = value; } }
///
- /// 是否只能存在一件该物品
+ /// 背包唯一
///
- public bool OnlyGetOnce{ get{ return _onlyGetOnce; }set{ _onlyGetOnce = value; } }
+ public bool OnlyGetOne{ get{ return _onlyGetOne; }set{ _onlyGetOne = value; } }
///
/// 冷却时间
///
--
Gitee
From 04917bbff4b83bb1b82b7b6f9dfa2eecacb822aa 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: Mon, 15 Jul 2019 13:25:50 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Engine/CLEngine.Core/framework/ItemManager.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Engine/CLEngine.Core/framework/ItemManager.cs b/Engine/CLEngine.Core/framework/ItemManager.cs
index 1a665f2..d88fb9e 100644
--- a/Engine/CLEngine.Core/framework/ItemManager.cs
+++ b/Engine/CLEngine.Core/framework/ItemManager.cs
@@ -205,7 +205,7 @@ namespace CLEngine.Core.framework
}
}
}
- if (!is_finish||(!have&&item.OnlyGetOnce))
+ if (!is_finish||(!have&&item.OnlyGetOne))
{
onget.Number = number;
_playerItem.Add(onget);
@@ -238,7 +238,7 @@ namespace CLEngine.Core.framework
}
}
}
- if (!is_finish || (!have && item.OnlyGetOnce))
+ if (!is_finish || (!have && item.OnlyGetOne))
{
onget.Number = number;
_playerItem.Add(onget);
--
Gitee