From f4f07847775c12b338d8bccedbbabc067dc1ae2c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 14:34:26 +0800
Subject: [PATCH] Merge branch '法宝、法宝魂修改'
---
System/Treasure/TreasureNewStageWin.cs | 52 +++++++++++-----------------------------------------
1 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/System/Treasure/TreasureNewStageWin.cs b/System/Treasure/TreasureNewStageWin.cs
index 1e3ee19..71e7ae4 100644
--- a/System/Treasure/TreasureNewStageWin.cs
+++ b/System/Treasure/TreasureNewStageWin.cs
@@ -19,13 +19,9 @@
[SerializeField] PropertyCompareBehaviour m_Property;
[SerializeField] Button m_PropertyConfirmBtn;
- [SerializeField] RectTransform m_ContainerPrivilege;
- [SerializeField] Text m_PrivilegeName;
- [SerializeField] Text m_Description;
- [SerializeField] RectTransform m_ContainerProgress;
- [SerializeField] Text m_Progress1;
- [SerializeField] Text m_Progress2;
- [SerializeField] Button m_PrivilegeConfirmBtn;
+ [SerializeField] RectTransform m_ContainerItem;
+ [SerializeField] ItemCell m_Item;
+ [SerializeField] Button m_ItemConfirm;
Treasure treasure;
@@ -45,7 +41,7 @@
protected override void AddListeners()
{
m_PropertyConfirmBtn.onClick.AddListener(CloseClick);
- m_PrivilegeConfirmBtn.onClick.AddListener(CloseClick);
+ m_ItemConfirm.onClick.AddListener(CloseClick);
}
protected override void OnPreOpen()
@@ -69,7 +65,7 @@
private void Display()
{
m_ContainerProperty.gameObject.SetActive(false);
- m_ContainerPrivilege.gameObject.SetActive(false);
+ m_ContainerItem.gameObject.SetActive(false);
model.TryGetTreasure(model.selectedTreasure, out treasure);
if (treasure == null)
{
@@ -81,8 +77,8 @@
case TreasureStageUnlock.Property:
DisplayProperty(stage);
break;
- case TreasureStageUnlock.Privilege:
- DisplayPrivilege(stage);
+ case TreasureStageUnlock.Item:
+ DisplayItem(stage);
break;
}
}
@@ -95,38 +91,12 @@
m_Property.Display(_keyValue.Key, _beforeValue, UIHelper.GetPropertyMapPlayerData((AttrEnum)_keyValue.Key));
}
- private void DisplayPrivilege(TreasureStage _stage)
+ private void DisplayItem(TreasureStage _stage)
{
- m_ContainerPrivilege.gameObject.SetActive(true);
- m_ContainerProgress.gameObject.SetActive(false);
- m_Progress1.gameObject.SetActive(false);
- m_Progress2.gameObject.SetActive(false);
- var config = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(_stage.privilege);
- m_PrivilegeName.text = config.Name;
- m_Description.text = config.Description;
- switch (_stage.specialData.type)
- {
- case TreasurePrivilege.Property:
- break;
- case TreasurePrivilege.DemonJarAtk:
- break;
- case TreasurePrivilege.StrengthenAdd:
- break;
- case TreasurePrivilege.Suit:
- case TreasurePrivilege.RuneBreakExpAdd:
- case TreasurePrivilege.Boss:
- break;
- case TreasurePrivilege.MountAtk:
- break;
- case TreasurePrivilege.PetHp:
- break;
- case TreasurePrivilege.Wing:
- break;
- case TreasurePrivilege.Wash:
- break;
- }
+ m_ContainerItem.gameObject.SetActive(true);
+ ItemCellModel itemCell = new ItemCellModel(_stage.item.id, true, (ulong)_stage.item.count, _stage.item.bind ? 1 : 0);
+ m_Item.Init(itemCell);
}
-
}
}
--
Gitblit v1.8.0