From 8bed4e5c0f46fa48bcc53adfe2ab4767cd711c5b Mon Sep 17 00:00:00 2001 From: 陆恒 Date: Wed, 23 Sep 2020 10:19:01 +0800 Subject: [PATCH] 提交 --- src/HttpServer/logic/constdef.go | 2 +- src/HttpServer/logic/logic.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go index b94d4d6..7934ae4 100644 --- a/src/HttpServer/logic/constdef.go +++ b/src/HttpServer/logic/constdef.go @@ -7,7 +7,7 @@ const ( TASKTYPE_WATCHADS = 3 //表示观看视频次数 TASKTYPE_TURNTABLE = 4 //4抽奖次数 TASKTYPE_LUCKYBAG = 5 //5表示福袋次数 - TASKTYPE_ROCKETTIMES = 6 //6表示打开红包一次 + TASKTYPE_ROCKETTIMES = 6 //6放飞火箭 TASKTYPE_RELIVECNT = 7 //表示重生 TASKTYPE_USEITEMTIMES = 8 //8表示使用道具次数 ACHIEVE_KILLLINE = 9 //表示消除行数 diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 640bc37..00acd37 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -128,8 +128,8 @@ func HandlerUploaduserbasicinfo(w http.ResponseWriter, data string, uniqueuuid s func HandlerFetchredbag(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) { SetHeader(w) - llock.Lock() - defer llock.Unlock() + uptasklock.Lock() + defer uptasklock.Unlock() var resp FetchredbagResp resp.Code = 0 var rdata FetchredbagReq @@ -175,8 +175,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uniqueuuid, gameid, func HandlerGettaskreward(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) { SetHeader(w) - gettasklock.Lock() - defer gettasklock.Unlock() + uptasklock.Lock() + defer uptasklock.Unlock() var resp GettaskrewardResp resp.Code = 0 var rdata GettaskrewardReq @@ -233,8 +233,8 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uniqueuuid, gameid func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) { SetHeader(w) - querytasklock.Lock() - defer querytasklock.Unlock() + uptasklock.Lock() + defer uptasklock.Unlock() var resp QuerytaskinfoResp resp.Code = 0 var rdata QuerytaskinfoReq -- libgit2 0.21.0