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

client_Wu Xijin

2018-09-17 3c3b4e0878ee25a4705af75cdd4b8562be3d477c

 System/OpenServerActivity/FlashSaleModel.cs

@@ -114,7 +114,8 @@
                OperationFlashSale operation = operationBase as OperationFlashSale;

                if (operation.InAdvanceTime(TimeUtility.ServerNow))

                {

                    SysNotifyMgr.Instance.ShowTip("InOperationTimeError");

                    var seconds = operation.GetSecondsBeforeStart(TimeUtility.ServerNow);

                    SysNotifyMgr.Instance.ShowTip("FlashSaleAdvanceLimit", TimeUtility.SecondsToHMS(seconds));

                    return;

                }

                if (!operation.InTime(TimeUtility.ServerNow))