diff --git a/src/HttpServer/jsonconf/DailyTask.json b/src/HttpServer/jsonconf/DailyTask.json
index 083c40c..2ccdd70 100644
--- a/src/HttpServer/jsonconf/DailyTask.json
+++ b/src/HttpServer/jsonconf/DailyTask.json
@@ -1,352 +1,72 @@
 [
   {
     "id": 1,
-    "task": "领取%d%个红包",
-    "num": 2,
-    "reward": [8,1],
-    "type": 5
+    "type": 1,
+    "parameter": 5,
+    "desc": "在线%d分钟",
+    "reward": "[1,500]"
   },
   {
     "id": 2,
-    "task": "领取%d%个红包",
-    "num": 5,
-    "reward": [8,1],
-    "type": 5
+    "type": 1,
+    "parameter": 10,
+    "desc": "在线%d分钟",
+    "reward": "[1,1000]"
   },
   {
     "id": 3,
-    "task": "领取%d%个红包",
-    "num": 7,
-    "reward": [8,1],
-    "type": 5
+    "type": 1,
+    "parameter": 30,
+    "desc": "在线%d分钟",
+    "reward": "[1,2000]"
   },
   {
     "id": 4,
-    "task": "领取%d%个红包",
-    "num": 10,
-    "reward": [8,1],
-    "type": 5
+    "type": 1,
+    "parameter": 60,
+    "desc": "在线%d分钟",
+    "reward": "[1,5000]"
   },
   {
     "id": 5,
-    "task": "领取%d%个红包",
-    "num": 15,
-    "reward": [8,1],
-    "type": 5
+    "type": 2,
+    "parameter": 512,
+    "desc": "合成%d分的球",
+    "reward": "[1,500]"
   },
   {
     "id": 6,
-    "task": "领取%d%个红包",
-    "num": 20,
-    "reward": [8,1],
-    "type": 5
+    "type": 2,
+    "parameter": 1024,
+    "desc": "合成%d分的球",
+    "reward": "[1,1000]"
   },
   {
     "id": 7,
-    "task": "领取%d%个红包",
-    "num": 25,
-    "reward": [8,1],
-    "type": 5
+    "type": 2,
+    "parameter": 2048,
+    "desc": "合成%d分的球",
+    "reward": "[1,2000]"
   },
   {
     "id": 8,
-    "task": "领取%d%个红包",
-    "num": 30,
-    "reward": [8,1],
-    "type": 5
+    "type": 2,
+    "parameter": 4096,
+    "desc": "合成%d分的球",
+    "reward": "[1,5000]"
   },
   {
     "id": 9,
-    "task": "领取%d%个红包",
-    "num": 35,
-    "reward": [8,1],
-    "type": 5
+    "type": 3,
+    "parameter": 5,
+    "desc": "观看广告%d次",
+    "reward": "[1,1000]"
   },
   {
     "id": 10,
-    "task": "领取%d%个红包",
-    "num": 40,
-    "reward": [8,1],
-    "type": 5
-  },
-  {
-    "id": 11,
-    "task": "领取%d%个红包",
-    "num": 45,
-    "reward": [8,1],
-    "type": 5
-  },
-  {
-    "id": 12,
-    "task": "领取%d%个红包",
-    "num": 50,
-    "reward": [8,1],
-    "type": 5
-  },
-  {
-    "id": 13,
-    "task": "今日通过%d%关",
-    "num": 2,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 14,
-    "task": "今日通过%d%关",
-    "num": 4,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 15,
-    "task": "今日通过%d%关",
-    "num": 6,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 16,
-    "task": "今日通过%d%关",
-    "num": 8,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 17,
-    "task": "今日通过%d%关",
-    "num": 10,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 18,
-    "task": "今日通过%d%关",
-    "num": 15,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 19,
-    "task": "今日通过%d%关",
-    "num": 20,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 20,
-    "task": "今日通过%d%关",
-    "num": 25,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 21,
-    "task": "今日通过%d%关",
-    "num": 30,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 22,
-    "task": "今日通过%d%关",
-    "num": 40,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 23,
-    "task": "今日通过%d%关",
-    "num": 50,
-    "reward": [8,1],
-    "type": 3
-  },
-  {
-    "id": 24,
-    "task": "使用%d%次道具",
-    "num": 2,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 25,
-    "task": "使用%d%次道具",
-    "num": 4,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 26,
-    "task": "使用%d%次道具",
-    "num": 6,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 27,
-    "task": "使用%d%次道具",
-    "num": 8,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 28,
-    "task": "使用%d%次道具",
-    "num": 10,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 29,
-    "task": "使用%d%次道具",
-    "num": 15,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 30,
-    "task": "使用%d%次道具",
-    "num": 20,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 31,
-    "task": "使用%d%次道具",
-    "num": 25,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 32,
-    "task": "使用%d%次道具",
-    "num": 30,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 33,
-    "task": "使用%d%次道具",
-    "num": 40,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 34,
-    "task": "使用%d%次道具",
-    "num": 50,
-    "reward": [8,1],
-    "type": 4
-  },
-  {
-    "id": 35,
-    "task": "累计在线%d%分钟",
-    "num": 5,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 36,
-    "task": "累计在线%d%分钟",
-    "num": 10,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 37,
-    "task": "累计在线%d%分钟",
-    "num": 15,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 38,
-    "task": "累计在线%d%分钟",
-    "num": 20,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 39,
-    "task": "累计在线%d%分钟",
-    "num": 25,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 40,
-    "task": "累计在线%d%分钟",
-    "num": 30,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 41,
-    "task": "累计在线%d%分钟",
-    "num": 35,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 42,
-    "task": "累计在线%d%分钟",
-    "num": 40,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 43,
-    "task": "累计在线%d%分钟",
-    "num": 45,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 44,
-    "task": "累计在线%d%分钟",
-    "num": 50,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 45,
-    "task": "累计在线%d%分钟",
-    "num": 55,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 46,
-    "task": "累计在线%d%分钟",
-    "num": 60,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 47,
-    "task": "累计在线%d%分钟",
-    "num": 70,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 48,
-    "task": "累计在线%d%分钟",
-    "num": 80,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 49,
-    "task": "累计在线%d%分钟",
-    "num": 90,
-    "reward": [8,1],
-    "type": 7
-  },
-  {
-    "id": 50,
-    "task": "每日登录",
-    "num": 1,
-    "reward": [8,1],
-    "type": 1
+    "type": 3,
+    "parameter": 10,
+    "desc": "观看广告%d次",
+    "reward": "[1,5000]"
   }
 ]
\ No newline at end of file
diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go
index 44571de..873a066 100644
--- a/src/HttpServer/logic/constdef.go
+++ b/src/HttpServer/logic/constdef.go
@@ -2,7 +2,7 @@ package logic
 
 //任务成就类型枚举 协议上报用
 const (
-	TASKTYPE_PASSLEVEL      = 1 //表示通过x关卡
+	TASKTYPE_HENUM      = 1 //合道多少分
 	TASKTYPE_GETREDBAG      = 3 //3表示观看x次广告
 	TASKTYPE_WATCHADS       = 2 //领取x次红包
 	TASKTYPE_KILLSTAR       = 4 //4表示消除x颗星星
@@ -10,17 +10,18 @@ const (
 	TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏
 	TASKTYPE_SHAKETIME      = 7 //摇一摇次数
 
+
 )
 
 //任务类型 对应表
 const (
-	DAILY_TASKTYPE_LOGIN         = 1 //1 每日登录
-	DAILY_TASKTYPE_GETGUANCNT    = 2 //提取存钱罐
-	DAILY_TASKTYPE_PASSLEVEL     = 3 //近日通过关
+	DAILY_TASKTYPE_LOGIN         = 7 //1 每日登录
+	DAILY_TASKTYPE_GETGUANCNT    = 2 //合成多少分的球
+	DAILY_TASKTYPE_PASSLEVEL     = 3 //观看广告
 	DAILY_TASKTYPE_USEITEM       = 4 //使用道具数
 	DAILY_TASKTYPE_GETREDBAG     = 5 //领取红包次数
 	DAILY_TASKTYPE_GETGUANGOLD   = 6 //收取金币x枚
-	DAILY_TASKTYPE_ONLINEMIN     = 7 //在线分钟数
+	DAILY_TASKTYPE_ONLINEMIN     = 1 //在线分钟数
 	DAILY_TASKTYPE_PLAYSMALLGAME = 8 //试玩小游戏15s
 )
 
@@ -36,13 +37,13 @@ const (
 
 //奖励类型枚举
 const (
-	REWARDTYPE_STAR       = 1 //星星
+	REWARDTYPE_STAR       = 7 //星星
 	REWARDTYPE_CHUI       = 2
 	REWARDTYPE_SHUA       = 3
 	REWARDTYPE_SWAP       = 4
 	REWARDTYPE_ELIMITE    = 5
 	REWARDTYPE_EXP        = 6
-	REWARDTYPE_GOLD       = 7
+	REWARDTYPE_GOLD       = 1
 	REWARDTYPE_REDPACKAGE = 8 //新版红包
 )
 
diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 2f1f29e..dff8660 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -328,6 +328,7 @@ type UsersignReq struct {
 
 type UsersignData struct {
 	Goldnum int `json:"goldnum"`
+	Addgold int `json:"addgold"`
 }
 type UsersignResp struct {
 	Code    int          `json:"code"`
@@ -369,6 +370,8 @@ type TaskInfo struct {
 	GetRedbagCnt int //领取红包次数
 	GetGuanGold  int //收集金币数
 	PlaySmall    int //当日是否试玩小游戏15s 次数
+	CaiNum		int	//合道的球的分数
+	Watchads int	//管看广告次数
 }
 
 type UploadhigestscoreReq struct {
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 5110981..ce083d5 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -118,14 +118,14 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList {
 				list.Taskdata[k].Taskstatus = 2
 			}
 		} else if cfg.TaskType == DAILY_TASKTYPE_GETGUANCNT {
-			list.Taskdata[k].Taskprogress = uinfo.GetFromGuanCnt
+			list.Taskdata[k].Taskprogress = uinfo.Task.CaiNum
 			//当日提取存钱罐次数
-			if uinfo.GetFromGuanCnt >= cfg.Num {
+			if uinfo.Task.CaiNum >= cfg.Num {
 				list.Taskdata[k].Taskstatus = 2
 			}
 		} else if cfg.TaskType == DAILY_TASKTYPE_PASSLEVEL {
-			list.Taskdata[k].Taskprogress = uinfo.Task.PassLevel
-			if uinfo.Task.PassLevel >= cfg.Num {
+			list.Taskdata[k].Taskprogress = uinfo.Task.Watchads
+			if uinfo.Task.Watchads >= cfg.Num {
 				list.Taskdata[k].Taskstatus = 2
 			}
 		} else if cfg.TaskType == DAILY_TASKTYPE_USEITEM {
@@ -904,6 +904,8 @@ func (u *UserData) HandlePassDay(uuid int, channel string) {
 		u.Task.PassLevel = 0
 		u.Task.UseItemCnt = 0
 		u.Task.PlaySmall = 0
+		u.Task.CaiNum = 0
+		u.Task.Watchads = 0
 		u.ShakeTime = SHAKELIMIT
 		u.FetchRdBagNum = 0
 
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 9f42d5f..49ca390 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -877,6 +877,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) {
 		//uinfo.RealGold += cfg.Num
 
 		resp.Data.Goldnum = uinfo.RealGold
+		resp.Data.Addgold = cfg.Num
 
 		//保存数据
 		err = SaveUserInfo(uinfo, uniqueuuid)
@@ -1042,8 +1043,6 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
 		}
 
 		switch rdata.Tasktype {
-		case TASKTYPE_PASSLEVEL:
-			uinfo.Task.PassLevel += rdata.Value
 		case TASKTYPE_GETREDBAG:
 			uinfo.Task.GetRedbagCnt += rdata.Value
 			if uinfo.LeftFreeRB > 0 {
@@ -1054,6 +1053,7 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
 			}
 		case TASKTYPE_WATCHADS:
 			uinfo.Achieve.WatchAdsCnt += rdata.Value
+			uinfo.Task.Watchads += rdata.Value
 		/*case TASKTYPE_GETREDBAG:
 			uinfo.Task.GetRedbagCnt += rdata.Value
 		case TASKTYPE_WATCHADS:
@@ -1076,6 +1076,11 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
 			if uinfo.ShakeTime < 0 {
 				uinfo.ShakeTime = 0
 			}
+		case TASKTYPE_HENUM:
+			if uinfo.Task.CaiNum < rdata.Value{
+				uinfo.Task.CaiNum = rdata.Value
+			}
+
 		}
 		logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
 		SaveUserInfo(uinfo, uniqueuuid)
--
libgit2 0.21.0