Commit 8bc95d1e979cd19a6176067e65105db4dfdccd27
1 parent
b71bf2ea
Exists in
master
提交
Showing
2 changed files
with
12 additions
and
4 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -438,12 +438,12 @@ func (u *UserData) DoFlopCardd(resp *DoFlopResp) { | @@ -438,12 +438,12 @@ func (u *UserData) DoFlopCardd(resp *DoFlopResp) { | ||
| 438 | addgold = u.Goldrate * 45 * 60 | 438 | addgold = u.Goldrate * 45 * 60 |
| 439 | case FLOPTYPE_FENCAT15MIN: | 439 | case FLOPTYPE_FENCAT15MIN: |
| 440 | catid = 14 + REDCATIDEXTRA | 440 | catid = 14 + REDCATIDEXTRA |
| 441 | - ctime = 15 * 60 | 441 | + ctime = 40 //15 * 60 |
| 442 | catfg = jsonconf.GetRedCatConfig(catid) | 442 | catfg = jsonconf.GetRedCatConfig(catid) |
| 443 | u.SetRedCatPos(catid, ctime, catfg.Money, nowt) | 443 | u.SetRedCatPos(catid, ctime, catfg.Money, nowt) |
| 444 | case FLOPTYPE_FENCAT10MIN: | 444 | case FLOPTYPE_FENCAT10MIN: |
| 445 | catid = 13 + REDCATIDEXTRA | 445 | catid = 13 + REDCATIDEXTRA |
| 446 | - ctime = 10 * 60 | 446 | + ctime = 20 //10 * 60 |
| 447 | catfg = jsonconf.GetRedCatConfig(catid) | 447 | catfg = jsonconf.GetRedCatConfig(catid) |
| 448 | u.SetRedCatPos(catid, ctime, catfg.Money, nowt) | 448 | u.SetRedCatPos(catid, ctime, catfg.Money, nowt) |
| 449 | case FLOPTYPE_REDCAT: | 449 | case FLOPTYPE_REDCAT: |
src/HttpServer/logic/logic.go
| @@ -1745,9 +1745,9 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) { | @@ -1745,9 +1745,9 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) { | ||
| 1745 | break | 1745 | break |
| 1746 | } | 1746 | } |
| 1747 | 1747 | ||
| 1748 | - poslist := uinfo.GetLimitCatList() | 1748 | + poslist := uinfo.GetRedCatIdList() |
| 1749 | logger.Info("HandlerLimitCatList poslist=%+v", poslist) | 1749 | logger.Info("HandlerLimitCatList poslist=%+v", poslist) |
| 1750 | - nowtime := int(time.Now().Unix()) | 1750 | + /*nowtime := int(time.Now().Unix()) |
| 1751 | for _, pos := range poslist { | 1751 | for _, pos := range poslist { |
| 1752 | if pos >= 0 && pos < len(uinfo.PosInfo) { | 1752 | if pos >= 0 && pos < len(uinfo.PosInfo) { |
| 1753 | //如果可领取了再加入列表 | 1753 | //如果可领取了再加入列表 |
| @@ -1766,6 +1766,14 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) { | @@ -1766,6 +1766,14 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) { | ||
| 1766 | } | 1766 | } |
| 1767 | 1767 | ||
| 1768 | } | 1768 | } |
| 1769 | + }*/ | ||
| 1770 | + for _, v := range poslist { | ||
| 1771 | + var tmp LimitCatListData | ||
| 1772 | + tmp.CatId = v.Cat | ||
| 1773 | + tmp.Status = 0 | ||
| 1774 | + tmp.Cash = v.Money | ||
| 1775 | + tmp.Date = time.Now().Format("2006-01-02T 15:04:05") | ||
| 1776 | + resp.Data = append(resp.Data, tmp) | ||
| 1769 | } | 1777 | } |
| 1770 | 1778 | ||
| 1771 | resp.Code = 0 | 1779 | resp.Code = 0 |