From 7676088fbd244f5d99ead15d035a9023226f3a9e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 11 八月 2018 11:33:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PlayerPackModels.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/System/KnapSack/Logic/PlayerPackModels.cs b/System/KnapSack/Logic/PlayerPackModels.cs
index 1450947..4484afa 100644
--- a/System/KnapSack/Logic/PlayerPackModels.cs
+++ b/System/KnapSack/Logic/PlayerPackModels.cs
@@ -1099,6 +1099,7 @@
RefreshColorSelectAct(type);
}
SendEquipDevourRecordQuest();
+ EquipDecomRedCtrl();
}
public void SetLvSelect(EquipLvType type)
@@ -1123,6 +1124,7 @@
RefreshLvSelectAct(type);
}
SendEquipDevourRecordQuest();
+ EquipDecomRedCtrl();
}
public void SetStarSelect(EquipStarType type)
@@ -1133,6 +1135,7 @@
RefreshStarSelectAct(type);
}
SendEquipDevourRecordQuest();
+ EquipDecomRedCtrl();
}
public List<int> devourPlacelist { get; private set; }
@@ -1279,11 +1282,20 @@
public void GetSelectDevourList()
{
GetCanDevourModellist();
- for(int i = 0; i < canDevourModellist.Count; i++)
+ selectDevourlist.Clear();
+ selectDevourlist.AddRange(canDevourModellist);
+ }
+
+ public void RefreshGetNewItem(ItemModel model)
+ {
+ if (model == null) return;
+
+ if(CheckIsReachDevourCondi(model))
{
- if(!selectDevourlist.Contains(canDevourModellist[i]))
+ selectDevourlist.Add(model);
+ if (RefreshEquipDecomNumAct != null)
{
- selectDevourlist.Add(canDevourModellist[i]);
+ RefreshEquipDecomNumAct();
}
}
}
@@ -1296,6 +1308,27 @@
RefreshEquipDecomNumAct();
}
}
+
+ public bool CheckIsReachDevourCondi(ItemModel model)
+ {
+ if (model.chinItemModel.Type == 29)
+ {
+ if (!defaultUnSelectlist.Contains(model.itemId))
+ {
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ if (IsCanDevour(model))
+ {
+ return true;
+ }
+
+ }
+ return false;
+ }
public void RemoveSelectDevourModellist(ItemModel model)
{
--
Gitblit v1.8.0