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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/WindowJump/WindowJumpMgr.cs

@@ -9,7 +9,7 @@
    public WindowJumpMgr()

    {

        IsJumpState = false;

        funcOpenBagItem = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OpenBagItem");

        funcOpenBagItem = Config.Instance.Get<FuncConfigConfig>("OpenBagItem");

        StageManager.Instance.onStartStageLoadingEvent += ClearCurRecord;

        GlobalTimeEvent.Instance.secondEvent += SecondRefresh;

    }

@@ -82,7 +82,7 @@


    public void WindowJumpTo(JumpUIType jumpType)

    {

        _tagWinSearchModel = ConfigManager.Instance.GetTemplate<WindowSearchConfig>((int)jumpType);

        _tagWinSearchModel = Config.Instance.Get<WindowSearchConfig>((int)jumpType);

      

        if (_tagWinSearchModel == null)

        {

@@ -176,7 +176,7 @@
            case JumpUIType.AncientBattle:

            case JumpUIType.IceCrystal:

            case JumpUIType.FairyLand:

                DailyQuestConfig dailyConfig = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_tagWinSearchModel.SelectActive);

                DailyQuestConfig dailyConfig = Config.Instance.Get<DailyQuestConfig>(_tagWinSearchModel.SelectActive);

                if (dailyQuestModel.GetQuestState(dailyConfig.ID) != DailyQuestModel.DailyQuestState.Normal)

                {

                    SysNotifyMgr.Instance.ShowTip("FBIsNotOpen");

@@ -733,26 +733,26 @@


    private void GotoNormalDungeon(int _dailyQuestId, int _lineId = 0)

    {

        var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_dailyQuestId);

        var config = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

        dungeonModel.currentDungeon = new Dungeon(config.RelatedID, _lineId);

        SetJumpLogic<NormalDungeonEntranceWin>();

    }

    private void GotoHeavenBattleDungeon(int _dailyQuestId, int _lineId = 0)

    {

        var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_dailyQuestId);

        var config = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

        dungeonModel.currentDungeon = new Dungeon(config.RelatedID, _lineId);

        SetJumpLogic<HeavenBattleWin>();

    }

    private void GotoTrialDungeon(int _dailyQuestId, int _lineId = 0)

    {

        var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_dailyQuestId);

        var config = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

        dungeonModel.currentDungeon = new Dungeon(config.RelatedID, _lineId);

        SetJumpLogic<TrialDungeonSelectWin>();

    }



    private void GotoMultipleDifficultyDungeon(int _dailyQuestId)

    {

        var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(_dailyQuestId);

        var config = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

        dungeonModel.currentDungeon = new Dungeon(config.RelatedID, 0);

        dungeonModel.selectedKylinDungeon = default(Dungeon);

        SetJumpLogic<MultipleDifficultyDungeonWin>();