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

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/WindowJump/WindowJumpMgr.cs

@@ -286,7 +286,7 @@
                break;

        }



        DesignDebug.Log("WindowJumpTo" + jumpType);

        DebugEx.Log("WindowJumpTo" + jumpType);



        GetPreAllOpenWin();



@@ -722,7 +722,7 @@
                SetJumpLogic<FirstRechargeWin>(_tagWinSearchModel.TABID, true);

                break;

            default:

                DesignDebug.Log("未添加此跳转界面："+ jumpType);

                DebugEx.Log("未添加此跳转界面："+ jumpType);

                IsJumpState = false;

                openWindows.Clear();

                jumpWinNameDict.Clear();

@@ -792,20 +792,20 @@
                WindowCenter.Instance.jumpWindowCloseEvent += CloseWindow;

                break;

            default:

                DesignDebug.LogError("不存在此界面跳转类型" + _tagWinSearchModel.Type);

                DebugEx.LogError("不存在此界面跳转类型" + _tagWinSearchModel.Type);

                break;

        }

    }



    private void CloseWindow(Window obj)

    {

        DesignDebug.Log("CloseWindow:" + obj + "跳转阶段：" + jumpPhase);

        DebugEx.Log("CloseWindow:" + obj + "跳转阶段：" + jumpPhase);

        if (!jumpWinNameDict.ContainsKey(jumpPhase)) return;

        if (jumpWinNameDict[jumpPhase] != obj.name)

        {

            return;

        }

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

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

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;

      

        int i = 0;

@@ -924,7 +924,7 @@
                jumpPhase -= 1;

                break;

            default:

                DesignDebug.LogError("不存在此界面跳转类型" + _tagWinSearchModel.Type);

                DebugEx.LogError("不存在此界面跳转类型" + _tagWinSearchModel.Type);

                break;

        }