提交

陆恒
1 parent 506f7882
Showing 5 changed files with 10 additions and 6 deletions Show diff stats
src/HttpServer/jsonconf/AchievementConfig.json
src/HttpServer/logic/constdef.go
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -224,7 +224,7 @@
     "is_video": 1
   },
   {
-    "type": 4,
+    "type": 3,
     "id": 29,
     "desc": "累计观看视频360次",
     "aim": 360,
@@ -232,7 +232,7 @@
     "is_video": 1
   },
   {
-    "type": 4,
+    "type": 3,
     "id": 30,
     "desc": "累计观看视频400次",
     "aim": 400,
@@ -12,6 +12,7 @@ const (
 	TASKTYPE_USEITEMTIMES = 8  //8表示使用道具次数
 	ACHIEVE_KILLLINE      = 9  //表示消除行数
 	ACHIEVE_KILLLINELIE   = 10 //表示消除列数
+	ACHIEVE_GETSCORE      = 11 //表示累计得到分数
  
 )
  
@@ -452,9 +452,10 @@ type TaskInfo struct {
  
 //
 type AchieveMentInfo struct {
-	WatchAdsCnt int //观看视频数
-	KillStar    int //消除行数
-	KillStarLie int //消除列数
+	WatchAdsCnt int   //观看视频数
+	KillStar    int   //消除行数
+	KillStarLie int   //消除列数
+	SumGetScore int64 //累计获得分数
 	//SumGetGuan    int //存钱罐累计提取
 	//SumUseItemCnt int //使用道具次数累计
 }
@@ -94,7 +94,7 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList, uniqueid string) *TaskLis
 		if val.Taskstatus == 1 {
 			switch cfg.Type {
 			case ACHIEVETYPE_GETSCORE:
-				if uinfo.HighScore >= int64(cfg.Aim) {
+				if uinfo.Achieve.SumGetScore >= int64(cfg.Aim) {
 					list.Taskdata[k].Taskstatus = 2
 				}
 			case ACHIEVETYPE_LOGINDAY:
@@ -282,6 +282,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uniqueuuid,
 			uinfo.Achieve.KillStar += rdata.Value
 		case ACHIEVE_KILLLINELIE:
 			uinfo.Achieve.KillStarLie += rdata.Value
+		case ACHIEVE_GETSCORE:
+			uinfo.Achieve.SumGetScore += int64(rdata.Value)
 		}
 		logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
 		SaveUserInfo(uinfo, uniqueuuid)
...	...	@@ -224,7 +224,7 @@
224	224	"is_video": 1
225	225	},
226	226	{
227		- "type": 4,
	227	+ "type": 3,
228	228	"id": 29,
229	229	"desc": "累计观看视频360次",
230	230	"aim": 360,
...	...	@@ -232,7 +232,7 @@
232	232	"is_video": 1
233	233	},
234	234	{
235		- "type": 4,
	235	+ "type": 3,
236	236	"id": 30,
237	237	"desc": "累计观看视频400次",
238	238	"aim": 400,
...	...
...	...	@@ -12,6 +12,7 @@ const (
12	12	TASKTYPE_USEITEMTIMES = 8 //8表示使用道具次数
13	13	ACHIEVE_KILLLINE = 9 //表示消除行数
14	14	ACHIEVE_KILLLINELIE = 10 //表示消除列数
	15	+ ACHIEVE_GETSCORE = 11 //表示累计得到分数
15	16
16	17	)
17	18
...	...
...	...	@@ -452,9 +452,10 @@ type TaskInfo struct {
452	452
453	453	//
454	454	type AchieveMentInfo struct {
455		- WatchAdsCnt int //观看视频数
456		- KillStar int //消除行数
457		- KillStarLie int //消除列数
	455	+ WatchAdsCnt int //观看视频数
	456	+ KillStar int //消除行数
	457	+ KillStarLie int //消除列数
	458	+ SumGetScore int64 //累计获得分数
458	459	//SumGetGuan int //存钱罐累计提取
459	460	//SumUseItemCnt int //使用道具次数累计
460	461	}
...	...
...	...	@@ -94,7 +94,7 @@ func (uinfo UserData) CalcAchieveList(list TaskList, uniqueid string) *TaskLis
94	94	if val.Taskstatus == 1 {
95	95	switch cfg.Type {
96	96	case ACHIEVETYPE_GETSCORE:
97		- if uinfo.HighScore >= int64(cfg.Aim) {
	97	+ if uinfo.Achieve.SumGetScore >= int64(cfg.Aim) {
98	98	list.Taskdata[k].Taskstatus = 2
99	99	}
100	100	case ACHIEVETYPE_LOGINDAY:
...	...
...	...	@@ -282,6 +282,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uniqueuuid,
282	282	uinfo.Achieve.KillStar += rdata.Value
283	283	case ACHIEVE_KILLLINELIE:
284	284	uinfo.Achieve.KillStarLie += rdata.Value
	285	+ case ACHIEVE_GETSCORE:
	286	+ uinfo.Achieve.SumGetScore += int64(rdata.Value)
285	287	}
286	288	logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
287	289	SaveUserInfo(uinfo, uniqueuuid)
...	...