Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 System/WindowJump/WindowJumpMgr.cs

@@ -42,6 +42,7 @@
    FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

    DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

    TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }

    ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }



    public bool IsJumpState { get; private set;}

    private int jumpPhase = 0;

@@ -164,9 +165,20 @@
                }

                break;

            case JumpUIType.OpenServerMountRank:

                var type = int.Parse(_tagWinSearchModel.SelectActive);

                if (rankModel.IsLock(type))

                {

                    SysNotifyMgr.Instance.ShowTip("InOperationTimeError");

                    return;

                }

                if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)

                {

                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

                    return;

                }

                break;

            case JumpUIType.OpenServerRank:

                var _model = ModelCenter.Instance.GetModel<ImpactRankModel>();

                if (TimeUtility.OpenDay >= _model.openServerActivityDays)

                if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)

                {

                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

                    return;

@@ -618,7 +630,8 @@
                SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.OpenServerMountRank:

                ModelCenter.Instance.GetModel<ImpactRankModel>().gotoImpactRankType =int.Parse(_tagWinSearchModel.SelectActive);

                var type = int.Parse(_tagWinSearchModel.SelectActive);

                ModelCenter.Instance.GetModel<ImpactRankModel>().gotoImpactRankType = type;

                SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.OpenServerRank:

@@ -702,6 +715,15 @@
                treasureModel.selectedTreasure = int.Parse(_tagWinSearchModel.SelectActive);

                SetJumpLogic<TreasureLevelUpWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.FYZJTyp1:

            case JumpUIType.FYZJTyp2:

            case JumpUIType.SHLTyp1:

            case JumpUIType.SHLTyp2:

                treasureModel.currentCategory = TreasureCategory.Demon;

                treasureModel.selectedTreasure = int.Parse(_tagWinSearchModel.SelectActive);

                SetJumpLogic<TreasureLevelUpWin>(_tagWinSearchModel.TABID);

                break;



            case JumpUIType.DhszTs:

            case JumpUIType.HyqTs:

            case JumpUIType.GyzTs:

@@ -1188,4 +1210,8 @@
    TJYJS = 1017, //天机仪介绍界面

    Type1TreasureFunc3 = 1018, //仙族法宝

    LLBT = 1019, //玲珑宝塔界面

    FYZJTyp1 = 1020, //焚源之炬界面

    FYZJTyp2 = 1021, //焚源之炬界面

    SHLTyp1 = 1022, //摄魂铃界面

    SHLTyp2 = 1023, //摄魂铃界面

}