From aecb6a5a62d8a4cfc7b924ce957a9c7ea90c235d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 19 九月 2018 15:58:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FeatureNoticeWin.cs | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeWin.cs b/System/MainInterfacePanel/FeatureNoticeWin.cs
index 2b338f6..a8599fd 100644
--- a/System/MainInterfacePanel/FeatureNoticeWin.cs
+++ b/System/MainInterfacePanel/FeatureNoticeWin.cs
@@ -71,8 +71,8 @@
m_FeatureNoticeTip.Init();
OnCreateGridLineCell(m_ScrollerController);
ContentDisplay();
-
-
+
+
}
protected override void OnActived()
{
@@ -84,7 +84,7 @@
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnPlayersUpLV;
treasureModel.treasureStateChangeEvent += treasureStateChangeEvent;
- treasureModel.treasureStageUpEvent += treasureStageUpEvent;
+ treasureModel.treasureStageUpEvent += treasureStageUpEvent;
if (!IsJump)//鏄惁缁忓巻璺宠浆鎵撳紑
{
m_ScaleTween.Play(false, IsOpen);
@@ -241,7 +241,15 @@
{
return;
}
- if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber-1 > featureNoticeModel.FunctionForecastIndex)
+ bool Type = false;
+ int NeedLv = 0;
+ int playerLv = PlayerDatas.Instance.baseData.LV;
+ if (functionForecastConfig.OpenNumber - 2 >= featureNoticeModel.FunctionForecastIndex)
+ {
+ Type = true;
+ NeedLv = featureNoticeModel.GetOpenLv(functionForecastConfig.OpenNumber - 2);
+ }
+ if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && Type && NeedLv > playerLv)
{
m_Text_ShowA.gameObject.SetActive(false);
m_TextShowB.gameObject.SetActive(false);
@@ -290,7 +298,15 @@
UI3DModelExhibition.Instance.StopShowWing();
UI3DTreasureExhibition.Instance.StopShow();
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);
- if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber-1 > featureNoticeModel.FunctionForecastIndex)
+ bool Type = false;
+ int NeedLv = 0;
+ int playerLv = PlayerDatas.Instance.baseData.LV;
+ if (functionForecastConfig.OpenNumber - 2 >= featureNoticeModel.FunctionForecastIndex)
+ {
+ Type = true;
+ NeedLv = featureNoticeModel.GetOpenLv(functionForecastConfig.OpenNumber - 2);
+ }
+ if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && Type && NeedLv > playerLv)
{
m_FeaturesImage.gameObject.SetActive(true);
m_FeaturesImage.SetSprite("YGWENHAO");
@@ -346,22 +362,30 @@
m_ButtonGoto.gameObject.SetActive(false);
FuncOpenLVConfig funcoPenConfig = Config.Instance.Get<FuncOpenLVConfig>(funcID);
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);
- if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber-1 > featureNoticeModel.FunctionForecastIndex)
+ bool Type = false;
+ int NeedLv = 0;
+ int playerLv = PlayerDatas.Instance.baseData.LV;
+ if (functionForecastConfig.OpenNumber - 2 >= featureNoticeModel.FunctionForecastIndex)
+ {
+ Type = true;
+ NeedLv = featureNoticeModel.GetOpenLv(functionForecastConfig.OpenNumber - 2);
+ }
+ if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && Type && NeedLv > playerLv)
{
var functionForecastValue = Config.Instance.GetAllValues<FunctionForecastConfig>();
string StrNanme = string.Empty;
foreach (var value in functionForecastValue)
{
- if (value.OpenNumber == functionForecastConfig.OpenNumber -2)
+ if (value.OpenNumber == functionForecastConfig.OpenNumber - 2)
{
StrNanme = value.FuncName;
- }
+ }
}
m_TextUnopened.gameObject.SetActive(true);
- m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), StrNanme, functionForecastConfig.FuncName);
+ m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), NeedLv, functionForecastConfig.FuncName);
return;
}
- if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)
+ if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)
{
if (funcoPenConfig.LimitMagicWeapon != 0)//娉曞疂
{
--
Gitblit v1.8.0