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

client_Hale

2018-09-14 079ecd71b24f5bf9aac653f18f76d4670bcd169e

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

                int type = LocalSave.GetInt(strKey);

@@ -248,11 +252,15 @@
                if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.FrameLevel && type == 0)

                {

                    LocalSave.SetInt(strKey, functionForecastConfig.FrameLevel);

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

                    if (!IsOpenFeatureNotice)

                    {

                    WindowCenter.Instance.Open<FeatureNoticeWin>();

                }

            }

        }

    }

    }

    private bool IsDungeon()

    {

        var mapId = PlayerDatas.Instance.baseData.MapID;