From dc052a4934a924124971e6fa51af42dfbe3ceb03 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 13 十月 2018 13:47:14 +0800
Subject: [PATCH] Merge branch 'master' into UserCenter
---
System/Role/RoleTitleCell.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/System/Role/RoleTitleCell.cs b/System/Role/RoleTitleCell.cs
index 91a2e58..640ce16 100644
--- a/System/Role/RoleTitleCell.cs
+++ b/System/Role/RoleTitleCell.cs
@@ -37,8 +37,8 @@
}
int _titleId = model.roleTitleList[_index];
TitleData titleData = model.GetGainTitle(_titleId);
- DienstgradConfig _dienstgradCfg = Config.Instance.Get<DienstgradConfig>(_titleId);
- m_TitleIcon.SetSprite(_dienstgradCfg.Image);
+ DienstgradConfig config = Config.Instance.Get<DienstgradConfig>(_titleId);
+ m_TitleIcon.SetSprite(config.Image);
m_TitleIcon.SetNativeSize();
if (model.presentSelectTitle == model.roleTitleList[_index])
{
@@ -48,7 +48,7 @@
{
m_BottomImg.SetSprite("Title_PopupWindow");
}
- m_TitleGetBtn.gameObject.SetActive(!model.IsTitleGain(_titleId));
+ m_TitleGetBtn.gameObject.SetActive(!model.IsTitleGain(_titleId) && config.gotoId > 0);
m_UseTitleBtn.gameObject.SetActive(model.IsTitleGain(_titleId));
m_ContainerNewGet.gameObject.SetActive(model.IsNewGet(_titleId));
m_UseTitleBtn.onClick.RemoveAllListeners();
@@ -61,16 +61,16 @@
m_TitleEquipImg.gameObject.SetActive(titleData.isEquiped);
}
m_TitleGetBtn.RemoveAllListeners();
- if (titleData == null)
+ if (titleData == null && config.gotoId > 0)
{
m_TitleGetBtn.AddListener(() =>
{
- if (_dienstgradCfg.gotoId > 0)
+ if (config.gotoId > 0)
{
- if (_dienstgradCfg.missionId > 0
- && task.GetQuestState(_dienstgradCfg.missionId) == -1)
+ if (config.missionId > 0
+ && task.GetQuestState(config.missionId) == -1)
{
- var taskConfig = Config.Instance.Get<PyTaskConfig>(_dienstgradCfg.missionId);
+ var taskConfig = Config.Instance.Get<PyTaskConfig>(config.missionId);
var taskName = string.Empty;
if (taskConfig != null)
{
@@ -83,7 +83,7 @@
SysNotifyMgr.Instance.ShowTip("RoleTitle_1", taskName);
return;
}
- WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)_dienstgradCfg.gotoId);
+ WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.gotoId);
}
});
}
--
Gitblit v1.8.0