|
@@ -132,8 +132,8 @@ namespace GameLogic.Bag
|
|
|
public bool AddItem(int itemId, long count, string guid = "")
|
|
|
{
|
|
|
string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
|
|
|
-
|
|
|
- if(count <= 0)
|
|
|
+
|
|
|
+ if (count <= 0)
|
|
|
return false;
|
|
|
|
|
|
ItemInfo item = GetItemInfo(itemId, guidStr);
|
|
@@ -178,15 +178,16 @@ namespace GameLogic.Bag
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- if( count <= 0 )
|
|
|
+ if (count <= 0)
|
|
|
return false;
|
|
|
|
|
|
|
|
|
//法宝
|
|
|
if (item.config.itemTag == 11)
|
|
|
{
|
|
|
- AccountFileInfo.FaBaoData faaData = AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(f =>
|
|
|
- f.id == item.config.associateVlaue[1]);
|
|
|
+ AccountFileInfo.FaBaoData faaData = AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(
|
|
|
+ f =>
|
|
|
+ f.id == item.config.associateVlaue[1]);
|
|
|
if (faaData != null)
|
|
|
{
|
|
|
return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
|
|
@@ -194,53 +195,57 @@ namespace GameLogic.Bag
|
|
|
else
|
|
|
{
|
|
|
faaData = new AccountFileInfo.FaBaoData();
|
|
|
- faaData.id =item.config.associateVlaue[1];
|
|
|
+ faaData.id = item.config.associateVlaue[1];
|
|
|
faaData.level = 1;
|
|
|
faaData.useIndex = -1;
|
|
|
AccountFileInfo.Instance.playerData.AllFaBaoDatas.Add(faaData);
|
|
|
FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
|
|
|
PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
|
|
|
return true;
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
//功法
|
|
|
- else if (item.config.itemTag == 13)
|
|
|
+ else if (item.config.itemTag == 13)
|
|
|
{
|
|
|
- AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(s =>
|
|
|
- s.id == item.config.associateVlaue[1]);
|
|
|
+ AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(
|
|
|
+ s =>
|
|
|
+ s.id == item.config.associateVlaue[1]);
|
|
|
if (skillData != null)
|
|
|
{
|
|
|
- return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
|
|
|
+ return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[2]);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
skillData = new AccountFileInfo.SkillData();
|
|
|
- skillData.id =item.config.associateVlaue[1];
|
|
|
+ skillData.id = item.config.associateVlaue[1];
|
|
|
skillData.star = 1;
|
|
|
skillData.level = 1;
|
|
|
skillData.useIndex = -1;
|
|
|
AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
|
|
|
-
|
|
|
+
|
|
|
SkillInfo skillInfo = new SkillInfo(skillData);
|
|
|
skillInfo.index = skillData.useIndex;
|
|
|
PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
|
|
|
return true;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
- else if (item.config.itemTag == 9)
|
|
|
+ else if (item.config.itemTag == 2)
|
|
|
+ {
|
|
|
+ PlayerManager.Instance.myHero.heroData.exp += count;
|
|
|
+ AccountFileInfo.Instance.SavePlayerData();
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ else if (item.config.itemTag == 9)
|
|
|
{
|
|
|
return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
item.count += count;
|
|
|
|
|
|
- EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
|
|
|
- EventManager.Instance.Dispatch(CustomEventType.AddItem, new ItemUpdateData() { ItemInfo = item, Count = (int)count });
|
|
|
+ EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
|
|
|
+ new ItemUpdateData() { ItemInfo = item, Count = (int)count });
|
|
|
+ EventManager.Instance.Dispatch(CustomEventType.AddItem,
|
|
|
+ new ItemUpdateData() { ItemInfo = item, Count = (int)count });
|
|
|
AccountFileInfo.Instance.SaveItemData(item);
|
|
|
|
|
|
return true;
|
|
@@ -414,6 +419,7 @@ namespace GameLogic.Bag
|
|
|
{
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
if (item.config.ID <= 0)
|
|
|
{
|
|
|
return false;
|