From 08468164a0221d2327fee694525395704e194820 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 29 八月 2018 16:44:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FairyAu/WarehouseTipsWin.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/System/FairyAu/WarehouseTipsWin.cs b/System/FairyAu/WarehouseTipsWin.cs
index 6a256ef..f4e97d3 100644
--- a/System/FairyAu/WarehouseTipsWin.cs
+++ b/System/FairyAu/WarehouseTipsWin.cs
@@ -111,6 +111,7 @@
_FamilyPosition = (int)PlayerDatas.Instance.fairyData.mine.FamilyLV;
PlayerFairyAuTreasureData.Event_FairyAuIntegral += FairyAuIntegral;//浠欑洘绉垎鍒锋柊
PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo += FamilyStoreItemInfo;//浠撳簱淇℃伅鍒锋柊
+ PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo += Del_FamilyStoreItemInfo;//浠撳簱鐗╁搧鍒犻櫎
PlayerFairyAuTreasureData.Event_FamilyActionInfo += FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鍒锋柊
_GridlineCtrl.OnRefreshCell += OnRefreshGridCell;
_bool = false;
@@ -149,6 +150,7 @@
PlayerFairyAuTreasureData.Event_FairyAuIntegral -= FairyAuIntegral;//浠欑洘绉垎鍒锋柊
PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo -= FamilyStoreItemInfo;//浠撳簱淇℃伅鍒锋柊
PlayerFairyAuTreasureData.Event_FamilyActionInfo -= FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鍒锋柊
+ PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo -= Del_FamilyStoreItemInfo;//浠撳簱鐗╁搧鍒犻櫎
_GridlineCtrl.OnRefreshCell -= OnRefreshGridCell;
}
@@ -265,6 +267,7 @@
_CA610.StoreItemIndex = (byte)(_indexList);
_CA610.ItemID = (uint)_WPID;
_CA610.ExcangeCount = 1;
+ ClearItemID(_indexList);
GameNetSystem.Instance.SendInfo(_CA610);
KnapSackEventMgr.Instance.HideItemPopWin();
}
@@ -911,6 +914,20 @@
SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
_GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
}
+
+ void Del_FamilyStoreItemInfo(List<int> List)//鐗╁搧鍒犻櫎
+ {
+ QueryFamilyAction();//瀹舵棌琛屼负淇℃伅鏌ヨ
+ _listArray.Clear();
+ foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
+ {
+ _listArray.Add(key);
+ }
+ SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
+ _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
+
+ }
+
void FamilyActionInfo()
{
_listArray.Clear();
@@ -1003,6 +1020,7 @@
int Order = 0;//闃舵暟
int Color = 0;//棰滆壊
int Star = 0;//棰滆壊
+ int EquipPlace = 0;//瑁呭浣嶇疆
if (playerFairyAuTreasureData.JumpItemID == 0)
{
return;
@@ -1016,21 +1034,32 @@
Order = itemconfig.LV;
Color = itemconfig.ItemColor;
Star = itemconfig.StarLevel;
+ EquipPlace = itemconfig.EquipPlace;
foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
{
- var item_config = Config.Instance.Get<ItemConfig>(key);
- if (item_config.EquipPlace == 0 && item_config.EquipPlace > 10)
+ var Item_ID = playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID;
+ var item_config = Config.Instance.Get<ItemConfig>(Item_ID);
+ if (item_config==null && item_config.EquipPlace == 0 && item_config.EquipPlace > 10)
{
continue;
}
if (item_config.LV >= Order && item_config.ItemColor >= Color
- && item_config.StarLevel >= Star && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)
+ && item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace
+ && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)
{
DicHighlight.Add(key,1);
}
}
}
+
+ private void ClearItemID(int Index)
+ {
+ if (DicHighlight.ContainsKey(Index))
+ {
+ DicHighlight.Clear();
+ }
+ }
}
}
--
Gitblit v1.8.0