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

client_Wu Xijin

2018-09-17 3c3b4e0878ee25a4705af75cdd4b8562be3d477c

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -458,6 +458,16 @@
                        WindowCenter.Instance.Open<FairyJadeInvestmentWin>();

                    }

                    break;

                case 11:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<VipInvestWin>();

                    }

                    else

                    {

                        WindowCenter.Instance.Open<VipInvestWin>();

                    }

                    break;



            }

        }

@@ -491,6 +501,7 @@
            WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>();

            WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();

            WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            WindowCenter.Instance.CloseImmediately<VipInvestWin>();

        }



        private int Compare(int x, int y)