From df33043da71b70d6f6dafcab6da1894a58732673 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 29 八月 2018 15:17:59 +0800
Subject: [PATCH] 3041 前端 通过跳转仙盟宝库某些物品为高亮
---
System/FairyAu/WarehouseGrid.cs | 7 +++
System/FairyAu/PlayerFairyAuTreasureData.cs | 1
System/FairyAu/WarehouseTipsWin.cs | 65 ++++++++++++++++++++++++++++----
3 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/System/FairyAu/PlayerFairyAuTreasureData.cs b/System/FairyAu/PlayerFairyAuTreasureData.cs
index 0568908..4b5060b 100644
--- a/System/FairyAu/PlayerFairyAuTreasureData.cs
+++ b/System/FairyAu/PlayerFairyAuTreasureData.cs
@@ -57,6 +57,7 @@
public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//浠撳簱淇℃伅鐨勫埛鏂�
public int _FairyAuIntegral = 0;//鑾峰彇浠欑洘绉垎
+ public int JumpItemID = 0;//璺宠浆鑾峰彇ID
public override void Init()
{
diff --git a/System/FairyAu/WarehouseGrid.cs b/System/FairyAu/WarehouseGrid.cs
index 30fee79..bf9306a 100644
--- a/System/FairyAu/WarehouseGrid.cs
+++ b/System/FairyAu/WarehouseGrid.cs
@@ -13,7 +13,7 @@
[SerializeField] GameObject m_ItemBG;
[SerializeField] ItemCell m_ItemCell;
[SerializeField] GameObject m_Lllume;
-
+ [SerializeField] UIEffect m_uieffect;
public GameObject ItemBG
{
get { return m_ItemBG; }
@@ -31,6 +31,11 @@
get { return m_Lllume; }
set { m_Lllume = value; }
}
+ public UIEffect Uieffect
+ {
+ get { return m_uieffect; }
+ set { m_uieffect = value; }
+ }
}
}
diff --git a/System/FairyAu/WarehouseTipsWin.cs b/System/FairyAu/WarehouseTipsWin.cs
index ed2dd5c..6a256ef 100644
--- a/System/FairyAu/WarehouseTipsWin.cs
+++ b/System/FairyAu/WarehouseTipsWin.cs
@@ -80,6 +80,7 @@
int Item_lv = 0;//鏍囪鐗╁搧闃舵暟
int Item_Color = 0;//鏍囪鐗╁搧棰滆壊
private Dictionary<int, bool> _EquipmentArray = new Dictionary<int, bool>();//鐢ㄦ潵瀛樺偍闇�瑕侀攢姣佺殑瑁呭涓嬫爣
+ private Dictionary<int, int> DicHighlight = new Dictionary<int, int>();//闇�瑕侀珮浜殑鐗╁搧
int _indexList = 0;//鏍囪闇�瑕佸厬鎹㈢殑鏁扮粍涓嬫爣
int _WPID = 0;//鐢ㄦ潵鏍囪闇�瑕佸厬鎹㈢殑鐗╁搧ID
private int SpiritPetDan = 0;
@@ -123,6 +124,7 @@
_CleanBtn.gameObject.SetActive(true);
_WarehouseCountBG.SetActive(true);
_CountText.text = playerFairyAuTreasureData._FairyAuIntegral.ToString();
+ SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
base.OnCreateGridLineCell(_GridlineCtrl);
}
@@ -135,6 +137,10 @@
protected override void OnPreClose()
{
+ if (playerFairyAuTreasureData.JumpItemID != 0)
+ {
+ playerFairyAuTreasureData.JumpItemID = 0;
+ }
}
protected override void OnAfterClose()
@@ -159,10 +165,17 @@
WarehouseGrid warehouseGrid = cell.transform.GetChild(childCode).GetComponent<WarehouseGrid>();
int cellCount = (cell.transform.childCount) * gridlineIndex + (childCode + 1);
warehouseGrid.ItemCell.gameObject.SetActive(false);
+ warehouseGrid.Uieffect.gameObject.SetActive(false);
if (cellCount - 1 < playerFairyAuTreasureData._DicfamilyStoreItem.Count)
{
warehouseGrid.ItemCell.gameObject.SetActive(true);
- FamilyStoreItem itemModel = playerFairyAuTreasureData._DicfamilyStoreItem[_listArray[cellCount - 1]];
+ int _IndexKey = _listArray[cellCount - 1];
+ FamilyStoreItem itemModel = playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey];
+ if (DicHighlight.ContainsKey(_IndexKey))//闇�瑕侀�変腑鐨勭壒鏁�
+ {
+ warehouseGrid.Uieffect.gameObject.SetActive(true);
+ warehouseGrid.Uieffect.Play();
+ }
ItemCellModel cellModel = new ItemCellModel(itemModel.ItemID, false, 0, 0, "", PackType.rptDeleted, true, itemModel._UserData);
warehouseGrid.ItemCell.Init(cellModel);
if (AchievementGoto.achievementType == AchievementGoto.SpiritPetDan)//鍏戞崲鐏靛疇涓癸紙221锛�
@@ -181,12 +194,12 @@
AchievementGuideEffect1.transform.SetParentEx(warehouseGrid.ItemCell.transform, Vector3.zero, Vector3.zero, Vector3.one);
}
}
- int _int = _listArray[cellCount - 1];
- LightUpJudgment(warehouseGrid.Lllume, _bool, playerFairyAuTreasureData._DicfamilyStoreItem[(_listArray[cellCount - 1])].Index);
+
+ LightUpJudgment(warehouseGrid.Lllume, _bool, playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey].Index);
warehouseGrid.ItemCell.cellBtn.RemoveAllListeners();
warehouseGrid.ItemCell.cellBtn.AddListener(() =>
{
- TypeJudgment(warehouseGrid.Lllume, _bool, (int)itemModel.ItemID, playerFairyAuTreasureData._DicfamilyStoreItem[(_listArray[cellCount - 1])].Index);
+ TypeJudgment(warehouseGrid.Lllume, _bool, (int)itemModel.ItemID, playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey].Index);
});
}
else
@@ -418,11 +431,11 @@
}
#region//涓�鎺ㄧ殑Toggle
- void IsNoConentA(Toggle toogleA )
+ void IsNoConentA(Toggle toogleA)
{
for (int i = 0; i < _ContentOne.childCount; i++)
{
-
+
if (_ContentOne.GetChild(i).GetComponent<Toggle>().name == toogleA.name)
{
_ContentOne.GetChild(i).GetComponent<Toggle>().isOn = true;
@@ -433,11 +446,11 @@
}
}
}
- void IsNoConentB(Toggle ToogleB )
+ void IsNoConentB(Toggle ToogleB)
{
for (int i = 0; i < _ContentTwo.childCount; i++)
{
-
+
if (_ContentTwo.GetChild(i).GetComponent<Toggle>().name == ToogleB.name)
{
_ContentTwo.GetChild(i).GetComponent<Toggle>().isOn = true;
@@ -895,6 +908,7 @@
{
_listArray.Add(key);
}
+ SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
_GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
}
void FamilyActionInfo()
@@ -982,6 +996,41 @@
}
return _DicConditions;
}
+
+ private void SetItemID()//鑾峰彇鐗╁搧ID
+ {
+ DicHighlight.Clear();//闇�瑕佷寒鐨勪粨搴撶墿鍝佷笅鏍�
+ int Order = 0;//闃舵暟
+ int Color = 0;//棰滆壊
+ int Star = 0;//棰滆壊
+ if (playerFairyAuTreasureData.JumpItemID == 0)
+ {
+ return;
+ }
+ int ItemId = playerFairyAuTreasureData.JumpItemID;
+ var itemconfig = Config.Instance.Get<ItemConfig>(ItemId);
+ if (itemconfig.EquipPlace == 0 && itemconfig.EquipPlace > 10)
+ {
+ return;
+ }
+ Order = itemconfig.LV;
+ Color = itemconfig.ItemColor;
+ Star = itemconfig.StarLevel;
+ foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
+ {
+ var item_config = Config.Instance.Get<ItemConfig>(key);
+ if (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)
+ {
+ DicHighlight.Add(key,1);
+ }
+ }
+
+ }
}
}
--
Gitblit v1.8.0