diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go
index c23d55a..4ae40d5 100644
--- a/src/HttpServer/logic/constdef.go
+++ b/src/HttpServer/logic/constdef.go
@@ -8,6 +8,7 @@ const (
 	TASKTYPE_KILLSTAR       = 4 //4表示消除x颗星星
 	TASKTYPE_USEITEM        = 5 //5表示使用x次道具
 	TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏
+	TASKTYPE_SHAKE          = 7 //表示摇一摇
 
 )
 
@@ -57,4 +58,5 @@ const (
 	FREE_REDBAG_NUM     = 3   //玩家免费红包次数
 	READGOLDMULTI       = 10  //阅读量到金币转化倍数
 	SDKOPGOLD_TYPEWE    = 302 //微转发金币类型
+	SHAKETIMELIMIT      = 20  //每日摇一摇上限
 )
diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 6cd91e9..3b8411e 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -22,6 +22,7 @@ type UserLoginData struct {
 	Userlv        int `json:"userlv"`
 	Userexp       int `json:"userexp"`
 	Sumloginday   int `json:"sumloginday"`
+	Shakeleftcnt  int `json:"shakeleftcnt"`
 }
 
 type UserLoginResp struct {
@@ -347,6 +348,7 @@ type UserData struct {
 	LastLoginTime    int             //上次登陆时间
 	ContinueLoginDay int             //连续登录天数
 	SumLoginDay      int             //累计登陆天数
+	ShakeTime        int             //剩余抽奖次数
 	GetFromGuanCnt   int             //当天从存钱款提取金币次数
 	SignRound        int             //签到轮数
 	SignSum          int             //累计签到天数
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 7409eb8..6c06f27 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -487,6 +487,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s
 	initdata.LeftFreeRB = FREE_REDBAG_NUM
 	initdata.UpLvCostTime = 0
 	initdata.UpLvCostTimeSec = int(time.Now().Unix())
+	initdata.ShakeTime = SHAKETIMELIMIT
 
 	for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
 		var tmp WithDrawDesc
@@ -512,6 +513,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s
 	resp.Data.Userlv = initdata.Lv
 	resp.Data.Userexp = initdata.Exp
 	resp.Data.Sumloginday = initdata.SumLoginDay
+	resp.Data.Shakeleftcnt = initdata.ShakeTime
 
 	err := SaveUserInfo(&initdata, uniqueuid)
 	if err != nil {
@@ -670,6 +672,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {
 		//跨天了
 		u.SumLoginDay++
 		u.WatchAddsTime = WATCH_ADD_DAY_LIMIT
+		u.ShakeTime = SHAKETIMELIMIT
 		//todo 重置任务相关的数据
 		u.GetFromGuanCnt = 0
 		u.GetCashCnt = 0
@@ -765,6 +768,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR
 	resp.Data.Userlv = data.Lv
 	resp.Data.Userexp = data.Exp
 	resp.Data.Sumloginday = data.SumLoginDay
+	resp.Data.Shakeleftcnt = data.ShakeTime
 	return nil
 }
 
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 8282bb1..187547a 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -738,6 +738,14 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
 			uinfo.Achieve.SumUseItemCnt += rdata.Value
 		case TASKTYPE_PLAYSMALLGAMES:
 			uinfo.Task.PlaySmall += 1
+		case TASKTYPE_SHAKE:
+			if uinfo.ShakeTime > 0 {
+				uinfo.ShakeTime -= rdata.Value
+				if uinfo.ShakeTime < 0 {
+					uinfo.ShakeTime = 0
+				}
+			}
+
 		}
 		logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
 		SaveUserInfo(uinfo, uniqueuuid)
--
libgit2 0.21.0