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

client_linchunjie

2018-09-21 9915a07c9c8e2918673bd422307d44d16ab09877

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

 System/MainInterfacePanel/SkillTaskWin.cs

@@ -99,7 +99,7 @@
                        if (Gold >= NeedMoney)

                        {

                            taskmodel.CompletionOfTask(mainModel.TaskSkillID);

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2Type2);

                        }

                        else

                        {


 System/MainInterfacePanel/TaskAllocation.cs

@@ -137,7 +137,7 @@
                            {

                                return;

                            }

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2Type2);

                        }

                        else

                        {


 System/WindowJump/WindowJumpMgr.cs

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

            case JumpUIType.SkillFunc2:

            case JumpUIType.SkillFunc3:

            case JumpUIType.SkillFunc2Type2:

                SetJumpLogic<SkillPanel>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.StrengthFunc1:

@@ -1109,6 +1110,7 @@
    KnapSackFunc4 = 8,

    SkillFunc1 = 9,

    SkillFunc2 = 10,

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

    SkillFunc3 = 11,

    StrengthFunc1 = 12,

    StrengthFunc2 = 13,