Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/OpenServerActivity/OSGiftBehaviour.cs

@@ -166,7 +166,7 @@
                    return;

                case StoreFunc.OSGift:

                    {

                        if (giftModel.IsGiftOverdue(_storeConfig.ID))

                        if (!giftModel.IsGiftExist(_storeConfig.ID))

                        {

                            SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

                            return;