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

client_Hale

2018-09-21 06bac38d743f3f99a294f20e5b02af6d53676b0b

 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;

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

                openWindows.Clear();

                jumpWinNameDict.Clear();

                jumpType = 0;

                jumpPhase = 0;

                break;

        }

@@ -876,9 +878,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 +923,7 @@
        }

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

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;



        jumpType = _tagWinSearchModel.Type;

        int i = 0;

        List<string> openWinlist = null;

        switch (_tagWinSearchModel.Type)