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

client_linchunjie

2018-12-28 0b0ac3af3fb312e4eaa575797e0e5678e7c9f7cb

 System/CrossServerOneVsOne/CrossServerRewardModel.cs

@@ -128,6 +128,10 @@
    {

        if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面

        {

            if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())

            {

                WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneRoundWin>();

            }

            WindowCenter.Instance.Open<CrossServerSettlementWin>();

        }

    }