陆恒 / XIAO_XINGXING

Download as
Browse Code »

Commit f9817ec49872d31c44169924e940ca0f6abd38ea

Authored by 陆恒
1 parent 7a88e983
Exists in master and in 4 other branches test, ver2.2.7, ver2.2.8, ver2.3.0

修复bug

Showing 1 changed file with 13 additions and 12 deletions   Show diff stats
src/HttpServer/logic/function.go
  Diff comments   View file @f9817ec
... ... @@ -359,7 +359,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr
359 359 for i := 0; i < sub; i++ {
360 360 rtype := cfg.Reward[i*2]
361 361 rnum := cfg.Reward[i*2+1]
362   - r1, r2, r3, r4, r5, r6 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel)
  362 + r1, r2, r3, r4, r5, r6, r7 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel)
363 363 if resp.Data.Lv != r1 {
364 364 resp.Data.Lv = r1
365 365 }
... ... @@ -368,30 +368,30 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr
368 368 resp.Data.Shuaitem += r4
369 369 resp.Data.Swapitem += r5
370 370 resp.Data.Eliminitem += r6
371   -
  371 + resp.Data.Goldnum = r7
372 372 }
373 373  
374 374 return nil
375 375 }
376 376  
377   -func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel string) (int, int, int, int, int, int) {
  377 +func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel string) (int, int, int, int, int, int, int) {
378 378 switch rtype {
379 379 case REWARDTYPE_STAR:
380   - return 0, num, 0, 0, 0, 0
  380 + return 0, num, 0, 0, 0, 0, 0
381 381 case REWARDTYPE_CHUI:
382   - return 0, 0, num, 0, 0, 0
  382 + return 0, 0, num, 0, 0, 0, 0
383 383 case REWARDTYPE_SHUA:
384   - return 0, 0, 0, num, 0, 0
  384 + return 0, 0, 0, num, 0, 0, 0
385 385 case REWARDTYPE_SWAP:
386   - return 0, 0, 0, 0, num, 0
  386 + return 0, 0, 0, 0, num, 0, 0
387 387 case REWARDTYPE_ELIMITE:
388   - return 0, 0, 0, 0, 0, num
  388 + return 0, 0, 0, 0, 0, num, 0
389 389 case REWARDTYPE_EXP:
390 390 isup := uinfo.AddUserExp(num)
391 391 if isup {
392   - return uinfo.Lv, 0, 0, 0, 0, 0
  392 + return uinfo.Lv, 0, 0, 0, 0, 0, 0
393 393 } else {
394   - return 0, 0, 0, 0, 0, 0
  394 + return 0, 0, 0, 0, 0, 0, 0
395 395 }
396 396 case REWARDTYPE_GOLD:
397 397 _, err := AddCoinToSdk(uinfo.Userid, num, gameid, channel, 100)
... ... @@ -400,10 +400,11 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str
400 400 }
401 401 //uinfo.RealGold =
402 402 uinfo.RealGold += num
  403 + return 0, 0, 0, 0, 0, 0, uinfo.RealGold
403 404 default:
404   - return 0, 0, 0, 0, 0, 0
  405 + return 0, 0, 0, 0, 0, 0, 0
405 406 }
406   - return 0, 0, 0, 0, 0, 0
  407 + return 0, 0, 0, 0, 0, 0, 0
407 408 }
408 409  
409 410 func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int) error {
... ...