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

client_linchunjie

2018-09-14 7c9193e3fdba98c8a22c25993b3bbf21ee7c397c

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

 System/MainInterfacePanel/FeatureNoticeModel.cs

@@ -99,6 +99,7 @@
                }

                if (OpenFuncId != FunctionList[i].FuncId || !RedPointChange)

                {

                    OpenFuncId = FunctionList[i].FuncId;

                    IsRedPoint = false;

                    TrailerClassification(FunctionList[i].FuncId);

                }

@@ -223,15 +224,18 @@
        }

    }



    public void WhetherToPlayTheBox()

    public IEnumerator WhetherToPlayTheBox()

    {

        yield return new WaitForSeconds(0.7f);

        var inDungeon = IsDungeon();

        var IsOpenMaininterface = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        var IsOpenOffLineOnHook = WindowCenter.Instance.CheckOpen<OffLineOnHookWin>();

        var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();

        if (NewBieCenter.Instance.inGuiding || treasureModel.newGotShowing || inDungeon || !IsOpenMaininterface

            || treasureModel.treasureStageUpShow || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

            || treasureModel.treasureStageUpShow || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() ||

            IsOpenOffLineOnHook)

        {

            return;

            yield break;

        }

        for (int i = 0; i < FunctionList.Count; i++)

        {

@@ -240,15 +244,19 @@
                var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(FunctionList[i].FuncId);

                if (functionForecastConfig.FrameLevel <= 0)

                {

                    return;

                    yield break;

                }

                string strKey = "FeatureNotice" + functionForecastConfig.FrameLevel+PlayerDatas.Instance.baseData.PlayerID;

                string strKey = "FeatureNotice" + functionForecastConfig.FrameLevel + PlayerDatas.Instance.baseData.PlayerID;

                int type = LocalSave.GetInt(strKey);

                bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

                if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.FrameLevel && type == 0)

                {

                    LocalSave.SetInt(strKey, functionForecastConfig.FrameLevel);

                    WindowCenter.Instance.Open<FeatureNoticeWin>();

                   var IsOpenFeatureNotice = WindowCenter.Instance.CheckOpen<FeatureNoticeWin>();

                    if (!IsOpenFeatureNotice)

                    {

                        WindowCenter.Instance.Open<FeatureNoticeWin>();

                    }              
                }

            }

        }


 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -370,7 +370,8 @@
                        }

                        else

                        {

                            string str = ((float)treasure.exp / treasure.treasureStages[funcStage].exp) * 100 + "%";

                            double dou=Math.Round((double)treasure.exp / treasure.treasureStages[funcStage].exp,2);

                            string str = dou * 100 + "%";

                            m_Textschedule.text = string.Format(Language.Get("YGYouFB"), str);

                        }                       

                    }


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -343,7 +343,7 @@
            m_HighSettingTip.AfterOpen();

            m_ChatTip.OnAfterOpen();

            HandleAchievement();

            featureNoticeModel.WhetherToPlayTheBox();

            StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告

        }



        protected override void OnPreClose()

@@ -892,7 +892,7 @@
            ArticleExperience();//关于经验条

            if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)

            {

                featureNoticeModel.WhetherToPlayTheBox();

                StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告

            }

        }