Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/WindowJump/WindowJumpMgr.cs

@@ -49,7 +49,7 @@


    public bool IsJumpState { get; private set; }

    private int jumpPhase = 0;



    public int jumpType { get; private set; }

    public void GetPreAllOpenWin()

    {

        jumpPhase += 1;

@@ -79,6 +79,7 @@
    {

        IsJumpState = false;

        jumpPhase = 0;

        jumpType = 0;

        openWindows.Clear();

        jumpWinNameDict.Clear();

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;

@@ -363,6 +364,7 @@
            case JumpUIType.SkillFunc1:

            case JumpUIType.SkillFunc2:

            case JumpUIType.SkillFunc3:

            case JumpUIType.SkillFunc2Type2:

                SetJumpLogic<SkillPanel>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.StrengthFunc1:

@@ -557,6 +559,7 @@
                SetJumpLogic<FindPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LootPreciousFrameFunc1:

            case JumpUIType.DogzDungeon:

                SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LootPreciousFrameSpec:

@@ -702,6 +705,7 @@
                SetJumpLogic<TreasureLevelUpWin>(0);

                break;

            case JumpUIType.Kylin:

                dungeonModel.currentDungeon = new Dungeon(31190, 0);

                SetJumpLogic<MultipleDifficultyDungeonWin>(0);

                break;

            case JumpUIType.Kylin1:

@@ -833,6 +837,7 @@
                IsJumpState = false;

                openWindows.Clear();

                jumpWinNameDict.Clear();

                jumpType = 0;

                jumpPhase = 0;

                break;

        }

@@ -876,9 +881,9 @@


    private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window

    {



        string curOpenWin = typeof(T).Name;

        jumpWinNameDict.Add(jumpPhase, curOpenWin);

        jumpType = _tagWinSearchModel.Type;

        switch (_tagWinSearchModel.Type)

        {

            case 1:

@@ -921,7 +926,7 @@
        }

        DebugEx.Log("关闭界面类型：" + _tagWinSearchModel.Type);

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;



        jumpType = _tagWinSearchModel.Type;

        int i = 0;

        List<string> openWinlist = null;

        switch (_tagWinSearchModel.Type)

@@ -1106,6 +1111,7 @@
    KnapSackFunc4 = 8,

    SkillFunc1 = 9,

    SkillFunc2 = 10,

    SkillFunc2Type2 = 243, //被动技能界面

    SkillFunc3 = 11,

    StrengthFunc1 = 12,

    StrengthFunc2 = 13,

@@ -1178,6 +1184,7 @@
    WelfareFunc1 = 102, //签到

    WelfareFunc2 = 103,  //祈愿

    LootPreciousFrameFunc1 = 104, //封魔坛

    DogzDungeon = 242, //异兽之地

    SystemSettingFunc1 = 109,//挂机设置



    RebornOpenBag = 113,//死亡复活打开背包