Commit 6fd72068e454386a1f85d94d6215da7602d801e2
1 parent
8b6b07de
Exists in
master
提交
Showing
3 changed files
with
14 additions
and
7 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -723,6 +723,7 @@ type UserData struct { | @@ -723,6 +723,7 @@ type UserData struct { | ||
| 723 | LastTimingRewardHour int //上次领取整点奖励的时刻 | 723 | LastTimingRewardHour int //上次领取整点奖励的时刻 |
| 724 | FlopCardCnt int //翻牌次数计数 | 724 | FlopCardCnt int //翻牌次数计数 |
| 725 | FlopCardLefCnt int //剩余翻拍次数 | 725 | FlopCardLefCnt int //剩余翻拍次数 |
| 726 | + TodayZhaocai float32 //当天招财猫收益 | ||
| 726 | CatShopInfo CatShopData //猫咖门店数据 | 727 | CatShopInfo CatShopData //猫咖门店数据 |
| 727 | Taskinfo TaskData //任务数据 | 728 | Taskinfo TaskData //任务数据 |
| 728 | AchieveMent AchieveMentData //成就数据 | 729 | AchieveMent AchieveMentData //成就数据 |
src/HttpServer/logic/httpserver.go
| @@ -139,7 +139,7 @@ func startServerHttpServe() { | @@ -139,7 +139,7 @@ func startServerHttpServe() { | ||
| 139 | http.HandleFunc("/api/gambling/removeCat", RemoveCat) //清除猫 | 139 | http.HandleFunc("/api/gambling/removeCat", RemoveCat) //清除猫 |
| 140 | 140 | ||
| 141 | /////---------------------------------------------------------------------old | 141 | /////---------------------------------------------------------------------old |
| 142 | - http.HandleFunc("/happycat/exchangetwoPos", ExchangePos) //交换位置 | 142 | + //http.HandleFunc("/happycat/exchangetwoPos", ExchangePos) //交换位置 |
| 143 | http.HandleFunc("/happycat/clickcatbox", ClickCatBox) //请求点击猫箱子 | 143 | http.HandleFunc("/happycat/clickcatbox", ClickCatBox) //请求点击猫箱子 |
| 144 | http.HandleFunc("/happycat/upgradecatbox", UpgradeCatBox) //请求点击猫箱子 | 144 | http.HandleFunc("/happycat/upgradecatbox", UpgradeCatBox) //请求点击猫箱子 |
| 145 | //http.HandleFunc("/happycat/acclecte", AcclecteGold) //请求点击猫箱子 | 145 | //http.HandleFunc("/happycat/acclecte", AcclecteGold) //请求点击猫箱子 |
src/HttpServer/logic/logic.go
| @@ -792,14 +792,19 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) { | @@ -792,14 +792,19 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) { | ||
| 792 | 792 | ||
| 793 | poslist := uinfo.GetLimitCatList() | 793 | poslist := uinfo.GetLimitCatList() |
| 794 | 794 | ||
| 795 | + nowtime := int(time.Now().Unix()) | ||
| 795 | for _, pos := range poslist { | 796 | for _, pos := range poslist { |
| 796 | if pos > 0 && pos < len(uinfo.PosInfo) { | 797 | if pos > 0 && pos < len(uinfo.PosInfo) { |
| 797 | - var tmp LimitCatListData | ||
| 798 | - tmp.CatId = uinfo.PosInfo[pos].Cat | ||
| 799 | - tmp.Status = 0 | ||
| 800 | - tmp.Cash = uinfo.PosInfo[pos].RedPacket | ||
| 801 | - tmp.Date = time.Now().Format("2006-01-02T 15:04:05") | ||
| 802 | - resp.Data = append(resp.Data, tmp) | 798 | + //如果可领取了再加入列表 |
| 799 | + if nowtime > uinfo.PosInfo[pos].StartTime+uinfo.PosInfo[pos].Time { | ||
| 800 | + var tmp LimitCatListData | ||
| 801 | + tmp.CatId = uinfo.PosInfo[pos].Cat | ||
| 802 | + tmp.Status = 0 | ||
| 803 | + tmp.Cash = uinfo.PosInfo[pos].RedPacket | ||
| 804 | + tmp.Date = time.Now().Format("2006-01-02T 15:04:05") | ||
| 805 | + resp.Data = append(resp.Data, tmp) | ||
| 806 | + } | ||
| 807 | + | ||
| 803 | } | 808 | } |
| 804 | } | 809 | } |
| 805 | 810 | ||
| @@ -868,6 +873,7 @@ func HandlerRecvRedCat(w http.ResponseWriter, data string, uuid int) { | @@ -868,6 +873,7 @@ func HandlerRecvRedCat(w http.ResponseWriter, data string, uuid int) { | ||
| 868 | uinfo.CleadPos(cpos) | 873 | uinfo.CleadPos(cpos) |
| 869 | 874 | ||
| 870 | uinfo.CalcGoldRate() | 875 | uinfo.CalcGoldRate() |
| 876 | + uinfo.TodayZhaocai += addredpack | ||
| 871 | 877 | ||
| 872 | resp.Data.Num = addredpack | 878 | resp.Data.Num = addredpack |
| 873 | resp.Code = 0 | 879 | resp.Code = 0 |