From f11a7aae6f821913aa4bc415961db4cb18f3e3b6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 20 八月 2018 21:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzModel.cs | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index c50516b..43eae00 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -69,7 +69,7 @@
AddAssistItem = int.Parse(_funcCfg.Numerical2);
AddAssistItemCnt = ConfigParse.GetMultipleStr<int>(_funcCfg.Numerical3);
m_DogzEquipStrenLimit = ConfigParse.GetDic<int, int>(_funcCfg.Numerical4);
- _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("DogzPack");
+ _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("DogzPack");
DogzPackGridCnt = int.Parse(_funcCfg.Numerical1);
}
/// <summary>
@@ -236,28 +236,48 @@
ItemModel itemModel = playerPack.GetItemModelByIndex(type, index);
int dogzId = GetDogzIDByIndex(index);
- if (itemModel != null)
+ List<ItemModel> modellist = GetDogzEquips(dogzId);
+ if(modellist != null)
{
- for (int i = 0; i < m_DogzEquipDict[dogzId].Count; i++)
+ if (itemModel != null)
{
- if (m_DogzEquipDict[dogzId][i].itemInfo.ItemPlace == index)
+ bool isAdd = true;
+ for (int i = 0; i < modellist.Count; i++)
{
- m_DogzEquipDict[dogzId][i] = itemModel;
- return;
+ if (modellist[i].itemInfo.ItemPlace == index)
+ {
+ isAdd = false;
+ modellist[i] = itemModel;
+ break;
+ }
+ }
+ if(isAdd)
+ {
+ modellist.Add(itemModel);
+ }
+ }
+ else
+ {
+ for (int i = 0; i < modellist.Count; i++)
+ {
+ if (modellist[i].itemInfo.ItemPlace == index)
+ {
+ modellist.RemoveAt(i);
+ break;
+ }
}
}
}
else
{
- for (int i = 0; i < m_DogzEquipDict[dogzId].Count; i++)
+ if(itemModel != null)
{
- if (m_DogzEquipDict[dogzId][i].itemInfo.ItemPlace == index)
- {
- m_DogzEquipDict[dogzId].RemoveAt(i);
- return;
- }
+ List<ItemModel> equipDatas = new List<ItemModel>();
+ equipDatas.Add(itemModel);
+ m_DogzEquipDict.Add(dogzId,equipDatas);
}
}
+
if(RefreshDogzEquipAct != null)
{
--
Gitblit v1.8.0