陆恒 / russiaxiaoxiao

Download as
Browse Code »

Commit 8bed4e5c0f46fa48bcc53adfe2ab4767cd711c5b

Authored by 陆恒
1 parent b0fd7763
Exists in master

提交

Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
src/HttpServer/logic/constdef.go
  Diff comments   View file @8bed4e5
@@ -7,7 +7,7 @@ const ( @@ -7,7 +7,7 @@ const (
7 TASKTYPE_WATCHADS = 3 //表示观看视频次数 7 TASKTYPE_WATCHADS = 3 //表示观看视频次数
8 TASKTYPE_TURNTABLE = 4 //4抽奖次数 8 TASKTYPE_TURNTABLE = 4 //4抽奖次数
9 TASKTYPE_LUCKYBAG = 5 //5表示福袋次数 9 TASKTYPE_LUCKYBAG = 5 //5表示福袋次数
10 - TASKTYPE_ROCKETTIMES = 6 //6表示打开红包一次 10 + TASKTYPE_ROCKETTIMES = 6 //6放飞火箭
11 TASKTYPE_RELIVECNT = 7 //表示重生 11 TASKTYPE_RELIVECNT = 7 //表示重生
12 TASKTYPE_USEITEMTIMES = 8 //8表示使用道具次数 12 TASKTYPE_USEITEMTIMES = 8 //8表示使用道具次数
13 ACHIEVE_KILLLINE = 9 //表示消除行数 13 ACHIEVE_KILLLINE = 9 //表示消除行数
src/HttpServer/logic/logic.go
  Diff comments   View file @8bed4e5
@@ -128,8 +128,8 @@ func HandlerUploaduserbasicinfo(w http.ResponseWriter, data string, uniqueuuid s @@ -128,8 +128,8 @@ func HandlerUploaduserbasicinfo(w http.ResponseWriter, data string, uniqueuuid s
128 128
129 func HandlerFetchredbag(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) { 129 func HandlerFetchredbag(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) {
130 SetHeader(w) 130 SetHeader(w)
131 - llock.Lock()  
132 - defer llock.Unlock() 131 + uptasklock.Lock()
  132 + defer uptasklock.Unlock()
133 var resp FetchredbagResp 133 var resp FetchredbagResp
134 resp.Code = 0 134 resp.Code = 0
135 var rdata FetchredbagReq 135 var rdata FetchredbagReq
@@ -175,8 +175,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uniqueuuid, gameid, @@ -175,8 +175,8 @@ func HandlerFetchredbag(w http.ResponseWriter, data string, uniqueuuid, gameid,
175 175
176 func HandlerGettaskreward(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) { 176 func HandlerGettaskreward(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) {
177 SetHeader(w) 177 SetHeader(w)
178 - gettasklock.Lock()  
179 - defer gettasklock.Unlock() 178 + uptasklock.Lock()
  179 + defer uptasklock.Unlock()
180 var resp GettaskrewardResp 180 var resp GettaskrewardResp
181 resp.Code = 0 181 resp.Code = 0
182 var rdata GettaskrewardReq 182 var rdata GettaskrewardReq
@@ -233,8 +233,8 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uniqueuuid, gameid @@ -233,8 +233,8 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uniqueuuid, gameid
233 233
234 func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) { 234 func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uniqueuuid, gameid, channel string, uuid int) {
235 SetHeader(w) 235 SetHeader(w)
236 - querytasklock.Lock()  
237 - defer querytasklock.Unlock() 236 + uptasklock.Lock()
  237 + defer uptasklock.Unlock()
238 var resp QuerytaskinfoResp 238 var resp QuerytaskinfoResp
239 resp.Code = 0 239 resp.Code = 0
240 var rdata QuerytaskinfoReq 240 var rdata QuerytaskinfoReq