From 1b73fc2e145f62bf0686dbbc00d407f7e6e29512 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 16 八月 2018 21:31:53 +0800
Subject: [PATCH] 法宝魂修改
---
System/Treasure/TreasureMeridianBehaviour.cs | 73 +++++++++++-------------------------
1 files changed, 22 insertions(+), 51 deletions(-)
diff --git a/System/Treasure/TreasureMeridianBehaviour.cs b/System/Treasure/TreasureMeridianBehaviour.cs
index 7cc9117..72330e9 100644
--- a/System/Treasure/TreasureMeridianBehaviour.cs
+++ b/System/Treasure/TreasureMeridianBehaviour.cs
@@ -84,22 +84,20 @@
{
m_TreasureLevelUpWin.OnLineStepComplete -= OnLineStepComplete;
}
- FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
}
private void OnStageClick()
{
- if (m_TreasureStage != null
+ if (m_TreasureStage != null&& m_TreasureStage.unlockType != TreasureStageUnlock.Treasure
&& m_TreasureStage.unlockType != TreasureStageUnlock.Property)
{
- //if (m_TreasureStage.unlockType == TreasureStageUnlock.Privilege)
- //{
- // if (!FuncOpen.Instance.IsFuncOpen(126))
- // {
- // FuncOpen.Instance.ProcessorFuncErrorTip(126);
- // return;
- // }
- //}
+ if (m_TreasureStage.unlockType == TreasureStageUnlock.Item)
+ {
+ var item = m_TreasureStage.item;
+ ItemAttrData itemAttrData = new ItemAttrData(item.id, true, (ulong)item.count, -1, item.bind ? 1 : 0);
+ ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData);
+ return;
+ }
model.selectedStage = m_TreasureStage.stage;
if (!WindowCenter.Instance.CheckOpen<TreasureStageTipWin>())
{
@@ -120,8 +118,6 @@
m_TreasureLevelUpWin = _win;
m_TreasureLevelUpWin.OnLineStepComplete -= OnLineStepComplete;
m_TreasureLevelUpWin.OnLineStepComplete += OnLineStepComplete;
- FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
- FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
stageIndex = _stageIndex;
if (model.TryGetTreasure(model.selectedTreasure, out m_Treasure))
{
@@ -174,48 +170,23 @@
m_Descs[0].gameObject.SetActive(true);
m_Icon.SetSprite(_funcCfg.Icon);
break;
- //case TreasureStageUnlock.Privilege:
- // m_Descs[0].gameObject.SetActive(true);
- // m_Descs[0].color = UIHelper.s_LightYellow;
- // var _privilegeCfg = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(m_TreasureStage.privilege);
- // if (FuncOpen.Instance.IsFuncOpen(126))
- // {
- // m_Icon.SetSprite(_privilegeCfg.Icon);
- // m_Descs[0].text = _privilegeCfg.Name;
- // }
- // else
- // {
- // m_Icon.SetSprite("UnKnowIcon");
- // m_Descs[0].text = string.Empty;
- // }
- // break;
+ case TreasureStageUnlock.Item:
+ m_Descs[0].gameObject.SetActive(true);
+ m_Descs[0].color = UIHelper.s_LightYellow;
+ var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(m_TreasureStage.item.id);
+ m_Icon.SetSprite(itemConfig.IconKey);
+ m_Descs[0].text = itemConfig.ItemName;
+ break;
+ case TreasureStageUnlock.Treasure:
+ m_Descs[0].gameObject.SetActive(true);
+ m_Descs[0].color = UIHelper.s_LightYellow;
+ var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(m_TreasureStage.treasure);
+ m_Icon.SetSprite(treasureConfig.Icon);
+ m_Descs[0].text = treasureConfig.Name;
+ break;
}
m_Icon.SetNativeSize();
}
- }
-
- private void OnFuncStateChangeEvent(int _id)
- {
- if (_id != 126)
- {
- return;
- }
- //if (m_TreasureStage != null && m_TreasureStage.unlockType == TreasureStageUnlock.Privilege)
- //{
- // var _privilegeCfg = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(m_TreasureStage.privilege);
- // if (FuncOpen.Instance.IsFuncOpen(126))
- // {
- // m_Icon.SetSprite(_privilegeCfg.Icon);
- // m_Icon.SetNativeSize();
- // m_Descs[0].text = _privilegeCfg.Name;
- // }
- // else
- // {
- // m_Icon.SetSprite("UnKnowIcon");
- // m_Icon.SetNativeSize();
- // m_Descs[0].text = string.Empty;
- // }
- //}
}
private void OnLineStepComplete()
--
Gitblit v1.8.0