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

client_linchunjie

2018-08-15 6a7e18e67423da68c7fc452243a2706e35a19e93

 System/MainInterfacePanel/HighSettingTip.cs

@@ -317,7 +317,7 @@
        void OnCliCkLimitedTimePBtn()//限时礼包

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<LimitedTimePackageWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false,7);

        }



        void OnClickElfFestivalBtn()