From de9ad229afda48fff9451e9f9b950c895b3fae2f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 24 十二月 2018 17:51:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/GatheringSoul/GatherSoulComposeWin.cs | 12 ++++++++++++
System/GatheringSoul/GatherSoulItemBehaviour.cs | 19 +++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/System/GatheringSoul/GatherSoulComposeWin.cs b/System/GatheringSoul/GatherSoulComposeWin.cs
index 518f7f9..299ae27 100644
--- a/System/GatheringSoul/GatherSoulComposeWin.cs
+++ b/System/GatheringSoul/GatherSoulComposeWin.cs
@@ -62,6 +62,7 @@
soulModel.gatherSoulPackRefresh += GatherSoulPackRefresh;
soulModel.gatherSoulHolesRefresh += GatherSoulHolesRefresh;
DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;
}
protected override void OnAfterOpen()
@@ -76,6 +77,7 @@
soulModel.gatherSoulPackRefresh -= GatherSoulPackRefresh;
soulModel.gatherSoulHolesRefresh -= GatherSoulHolesRefresh;
DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;
}
protected override void OnAfterClose()
@@ -170,6 +172,14 @@
}
}
}
+ }
+ }
+
+ private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)
+ {
+ if (refreshType == PlayerDataRefresh.LV)
+ {
+ DisplayRequireLevel();
}
}
@@ -298,6 +308,8 @@
{
m_RequireLevel.gameObject.SetActive(true);
m_RequireLevel.text = Language.Get("GatherSoulComposeRequireLevel", compose.requireLevel);
+ m_RequireLevel.color = UIHelper.GetUIColor(PlayerDatas.Instance.baseData.LV >= compose.requireLevel ?
+ TextColType.NavyBrown : TextColType.Red, true);
}
else
{
diff --git a/System/GatheringSoul/GatherSoulItemBehaviour.cs b/System/GatheringSoul/GatherSoulItemBehaviour.cs
index 283c87d..67225fc 100644
--- a/System/GatheringSoul/GatherSoulItemBehaviour.cs
+++ b/System/GatheringSoul/GatherSoulItemBehaviour.cs
@@ -224,16 +224,19 @@
data.SetTipsFuncBtn(ItemWinBtnType.compose, OnTipFunc);
}
bool existSamePropertyHole = soulModel.IsSamePropertyCompareHoles(-1, item as GatherSoulItem) != -1;
- if (!existSamePropertyHole)
- {
- data.SetTipsFuncBtn(ItemWinBtnType.Wear, OnTipFunc);
- }
+ bool existCoreHoleItem = false;
GatherSoulItem holeItem;
- if (existSamePropertyHole ||
- (item.itemType == GatheringSoulModel.GATHERSOUL_CORE_TYPE
- && soulModel.TryGetItem(soulModel.coreHole, out holeItem)))
+ if (soulModel.TryGetItem(soulModel.coreHole, out holeItem))
{
- data.SetTipsFuncBtn(ItemWinBtnType.Replace, OnTipFunc);
+ existCoreHoleItem = true;
+ }
+ if (item.itemType == GatheringSoulModel.GATHERSOUL_CORE_TYPE)
+ {
+ data.SetTipsFuncBtn(existCoreHoleItem ? ItemWinBtnType.Replace : ItemWinBtnType.Wear, OnTipFunc);
+ }
+ else
+ {
+ data.SetTipsFuncBtn(existSamePropertyHole ? ItemWinBtnType.Replace : ItemWinBtnType.Wear, OnTipFunc);
}
}
itemTipsModel.SetItemTipsModel(data);
--
Gitblit v1.8.0