diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go
index 421ae30..2d37120 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_SHAKETIME      = 7 //摇一摇次数
 
 )
 
@@ -61,4 +62,5 @@ const (
 	FREE_REDBAG_NUM     = 3   //玩家免费红包次数
 	READGOLDMULTI       = 700 //阅读量到金币转化倍数
 	SDKOPGOLD_TYPEWE    = 302 //微转发金币类型
+	SHAKELIMIT          = 20  //摇一摇限制次数
 )
diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 80e0db8..16f2f01 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 {
@@ -43,6 +44,7 @@ type GetuserdataData struct {
 	Userexp        int `json:"userexp"`
 	Leftfreeredbag int `json:"leftfreeredbag"`
 	Sumloginday    int `json:"sumloginday"`
+	Shakeleftcnt   int `json:"shakeleftcnt"`
 }
 
 type GetuserdataResp struct {
@@ -375,6 +377,7 @@ type UserData struct {
 	UpLvCostTimeSec  int          //上一个等级升级的时间点时刻
 	ReadNum          int          //玩家微转发阅读量
 	GetCashCnt       int          //当天提现次数
+	ShakeTime        int          //摇一摇
 	WithDraw         WithDrawInfo //提现记录信息
 	//SpecialWithDraw  WithDrawInfo    //活跃提现记录信息
 	Task    TaskInfo        //玩家任务完成相关信息
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index b1142dd..49783bc 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -588,6 +588,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 = SHAKELIMIT
 
 	for _, val := range jsonconf.GetJsonConf().WithDrawConfig {
 		var tmp WithDrawDesc
@@ -631,6 +632,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)
 	logger.Info("InitUserInfoddddd uinfo=%+v", initdata)
@@ -818,6 +820,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {
 		u.Task.PassLevel = 0
 		u.Task.UseItemCnt = 0
 		u.Task.PlaySmall = 0
+		u.ShakeTime = SHAKELIMIT
 
 		//任务也需要处理
 		/*tasklist, err := GetTaskInfo(u.Userid, 1)
@@ -909,6 +912,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 fe19342..8745aff 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -772,6 +772,11 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
 			uinfo.Achieve.SumUseItemCnt += rdata.Value
 		case TASKTYPE_PLAYSMALLGAMES:
 			uinfo.Task.PlaySmall += 1
+		case TASKTYPE_SHAKETIME:
+			uinfo.ShakeTime -= rdata.Value
+			if uinfo.ShakeTime < 0 {
+				uinfo.ShakeTime = 0
+			}
 		}
 		logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
 		SaveUserInfo(uinfo, uniqueuuid)
@@ -1080,6 +1085,7 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) {
 		resp.Data.Userlv = data.Lv
 		resp.Data.Leftfreeredbag = data.LeftFreeRB
 		resp.Data.Sumloginday = data.SumLoginDay
+		resp.Data.Shakeleftcnt = data.ShakeTime
 		SaveUserInfo(data, uniqueuuid)
 
 		resp.Code = ERROR_OK
--
libgit2 0.21.0