Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-19 aecb6a5a62d8a4cfc7b924ce957a9c7ea90c235d

 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -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,7 +362,15 @@
            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;

@@ -358,7 +382,7 @@
                    }                   

                }

                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)