From 9314d5f018931b558b775931b80ff23eb674df94 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Thu, 18 Jun 2020 11:04:49 +0800
Subject: [PATCH] 修复问题

---
 src/HttpServer/logic/constdef.go | 4 ++--
 src/HttpServer/logic/logic.go    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go
index 1ad1953..97de617 100644
--- a/src/HttpServer/logic/constdef.go
+++ b/src/HttpServer/logic/constdef.go
@@ -3,8 +3,8 @@ package logic
 //任务成就类型枚举 协议上报用
 const (
 	TASKTYPE_PASSLEVEL      = 1 //表示通过x关卡
-	TASKTYPE_GETREDBAG      = 2 //领取x次红包
-	TASKTYPE_WATCHADS       = 3 //3表示观看x次广告
+	TASKTYPE_GETREDBAG      = 2 //3表示观看x次广告
+	TASKTYPE_WATCHADS       = 3 //领取x次红包
 	TASKTYPE_KILLSTAR       = 4 //4表示消除x颗星星
 	TASKTYPE_USEITEM        = 5 //5表示使用x次道具
 	TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index cef2988..e1b81d3 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -737,14 +737,14 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
 			uinfo.Task.PassLevel += rdata.Value
 		case TASKTYPE_GETREDBAG:
 			uinfo.Task.GetRedbagCnt += rdata.Value
+		case TASKTYPE_WATCHADS:
+			uinfo.Achieve.WatchAdsCnt += rdata.Value
 			if uinfo.LeftFreeRB > 0 {
 				uinfo.LeftFreeRB--
 			}
 			if uinfo.WatchAddsTime > 0 {
 				uinfo.WatchAddsTime--
 			}
-		case TASKTYPE_WATCHADS:
-			uinfo.Achieve.WatchAdsCnt += rdata.Value
 		case TASKTYPE_KILLSTAR:
 			uinfo.Achieve.KillStar += rdata.Value
 		case TASKTYPE_USEITEM:
--
libgit2 0.21.0