提交

陆恒
1 parent 6fe4edfb
Showing 4 changed files with 25 additions and 13 deletions Show diff stats
src/HttpServer/logic/constdef.go
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -2,15 +2,17 @@ package logic
 //任务成就类型枚举 协议上报用
 const (
-	TASKTYPE_COSTTILI     = 1 //消耗体力
-	TASKTYPE_REACH2000    = 2 //表示单句达到2000
-	TASKTYPE_WATCHADS     = 3 //表示观看视频次数
-	TASKTYPE_TURNTABLE    = 4 //4抽奖次数
-	TASKTYPE_LUCKYBAG     = 5 //5表示福袋次数
-	TASKTYPE_ROCKETTIMES  = 6 //6表示火箭次数
-	TASKTYPE_RELIVECNT    = 7 //表示重生
-	TASKTYPE_USEITEMTIMES = 8 //8表示使用道具次数
-	ACHIEVE_KILLLINE      = 9 //表示消除行数
+	TASKTYPE_COSTTILI     = 1  //消耗体力
+	TASKTYPE_REACH2000    = 2  //表示单句达到2000
+	TASKTYPE_WATCHADS     = 3  //表示观看视频次数
+	TASKTYPE_TURNTABLE    = 4  //4抽奖次数
+	TASKTYPE_LUCKYBAG     = 5  //5表示福袋次数
+	TASKTYPE_ROCKETTIMES  = 6  //6表示火箭次数
+	TASKTYPE_RELIVECNT    = 7  //表示重生
+	TASKTYPE_USEITEMTIMES = 8  //8表示使用道具次数
+	ACHIEVE_KILLLINE      = 9  //表示消除行数
+	ACHIEVE_KILLLINELIE   = 10 //表示消除列数
+
 )
 //任务类型 对应表
@@ -28,10 +30,11 @@ const (
 //成就类型 对应表
 const (
-	ACHIEVETYPE_GETSCORE  = 1 //累计达到分数
-	ACHIEVETYPE_LOGINDAY  = 2 //累计登录天数
-	ACHIEVETYPE_WATCHADDS = 3 //累计观看广告次数
-	ACHIEVETYPE_KILLLINE  = 4 //累计消除行数
+	ACHIEVETYPE_GETSCORE    = 1 //累计达到分数
+	ACHIEVETYPE_LOGINDAY    = 2 //累计登录天数
+	ACHIEVETYPE_WATCHADDS   = 3 //累计观看广告次数
+	ACHIEVETYPE_KILLLINE    = 4 //累计消除行数
+	ACHIEVETYPE_KILLLINELIE = 5 //累计消除行数
 )
@@ -452,6 +452,7 @@ type TaskInfo struct {
 type AchieveMentInfo struct {
 	WatchAdsCnt int //观看视频数
 	KillStar    int //消除行数
+	KillStarLie int //消除列数
 	//SumGetGuan    int //存钱罐累计提取
 	//SumUseItemCnt int //使用道具次数累计
 }
@@ -69,6 +69,8 @@ func (uinfo *UserData) CalcAchieveProgress(ttype int) int {
 		rtval = uinfo.Achieve.WatchAdsCnt
 	case ACHIEVETYPE_KILLLINE:
 		rtval = uinfo.Achieve.KillStar
+	case ACHIEVETYPE_KILLLINELIE:
+		rtval = uinfo.Achieve.KillStarLie
 	default:
 		logger.Error("CalcAchieveProgress type wrong ttype=%v", ttype)
 	}
@@ -103,6 +105,10 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList, uniqueid string) *TaskLis
 				if uinfo.Achieve.KillStar >= cfg.Aim {
 					list.Taskdata[k].Taskstatus = 2
 				}
+			case ACHIEVETYPE_KILLLINELIE:
+				if uinfo.Achieve.KillStarLie >= cfg.Aim {
+					list.Taskdata[k].Taskstatus = 2
+				}
 			case ACHIEVETYPE_WATCHADDS:
 				if uinfo.Achieve.WatchAdsCnt >= cfg.Aim {
 					list.Taskdata[k].Taskstatus = 2
@@ -280,6 +280,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uniqueuuid,
 			uinfo.Task.UseItemCnt += rdata.Value
 		case ACHIEVE_KILLLINE:
 			uinfo.Achieve.KillStar += rdata.Value
+		case ACHIEVE_KILLLINELIE:
+			uinfo.Achieve.KillStarLie += rdata.Value
 		}
 		logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
 		SaveUserInfo(uinfo, uniqueuuid)