From fc5d4318db0dbe68eb5e8d3e7bb7dacbf05bc3a7 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 06 十一月 2018 17:26:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeEquipWin.cs | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/System/Compose/New/ComposeEquipWin.cs b/System/Compose/New/ComposeEquipWin.cs
index 923f3f1..5c150d5 100644
--- a/System/Compose/New/ComposeEquipWin.cs
+++ b/System/Compose/New/ComposeEquipWin.cs
@@ -599,7 +599,7 @@
int increaseNeedNum = increases[1];
int increaseRate = increases[2] / 100;
increaseRateItem.SetActive(true);
- RefreshGridCellUI(increaseGridCell, false,increaseId,increaseNeedNum);
+ RefreshGridCellUI(increaseGridCell, false,increaseId,increaseNeedNum,NeedMatType.IncreaseItem);
increaseText.text = Language.Get("Compose109", StringUtility.Contact(increaseRate, "%"));
int haveIncreaseNum = playerPack.GetItemCountByID(PackType.rptItem, increaseId);
ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(increaseId);
@@ -661,51 +661,63 @@
itemCell.Init(cellModel);
itemCell.cellBtn.onClick.AddListener(() =>
{
- if (matType == NeedMatType.fixedItem)
+ ItemAttrData attrData = null;
+ switch (matType)
{
- if (itemConfig.GetWay != null && itemConfig.GetWay.Length > 0)
- {
- ItemPathModel.SetChinItemModel(itemId);
- }
- else
- {
- ItemAttrData attrData = new ItemAttrData(itemId, true);
+ case NeedMatType.IncreaseItem:
+ case NeedMatType.fixedItem:
+ if (itemConfig.GetWay != null && itemConfig.GetWay.Length > 0)
+ {
+ ItemPathModel.SetChinItemModel(itemId);
+ }
+ else
+ {
+ attrData = new ItemAttrData(itemId, true);
+ itemTipsModel.SetItemTipsModel(attrData);
+ }
+ break;
+ case NeedMatType.unfixedItem:
+ case NeedMatType.addItem:
+ case NeedMatType.Nothing:
+ case NeedMatType.MakeItem:
+ attrData = new ItemAttrData(itemId, true);
itemTipsModel.SetItemTipsModel(attrData);
- }
+ break;
+
}
- else
- {
- ItemAttrData attrData = new ItemAttrData(itemId, true);
- itemTipsModel.SetItemTipsModel(attrData);
- }
- }
- );
+ });
}
else
{
itemCell.gameObject.SetActive(false);
}
-
+
}
else
{
itemCell.Init(itemModel);
itemCell.cellBtn.onClick.AddListener(() =>
{
- if (matType == NeedMatType.fixedItem)
+ switch (matType)
{
- if (itemConfig.GetWay != null && itemConfig.GetWay.Length > 0)
- {
- ItemPathModel.SetChinItemModel(itemId);
- }
- else
- {
+ case NeedMatType.IncreaseItem:
+ case NeedMatType.fixedItem:
+ if (itemConfig.GetWay != null && itemConfig.GetWay.Length > 0)
+ {
+ ItemPathModel.SetChinItemModel(itemId);
+ }
+ else
+ {
+ itemTipsModel.SetItemTipsModel(PackType.rptItem, itemModel.itemInfo.ItemGUID);
+ }
+ break;
+ case NeedMatType.unfixedItem:
+ case NeedMatType.addItem:
+ case NeedMatType.Nothing:
+ case NeedMatType.MakeItem:
itemTipsModel.SetItemTipsModel(PackType.rptItem, itemModel.itemInfo.ItemGUID);
- }
- }
- else
- {
- itemTipsModel.SetItemTipsModel(PackType.rptItem, itemModel.itemInfo.ItemGUID);
+ break;
+
}
});
}
--
Gitblit v1.8.0