Merge branch 'master' into yujie

* master:
  活动类型

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -37,7 +37,7 @@ namespace GFGGame
         /// 抽奖总次数
         /// </summary>
         /// <value></value>
-        public int allPlayTimes { get; set; }
+        public long allPlayTimes { get; set; }
         /// <summary>
         /// 限时抽奖必掉次数
         /// </summary>