diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index ef53e9c..8cd7c9c 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -981,6 +981,7 @@ type UserData struct { FlyBoxNumTimes int //生意飞天宝箱次数 LeftOfflineTimes int //离线奖励剩余领取次数 EmptyBoxLeftTime int //空格宝箱生意领取次数 + IsResetToday int //当天中午十二点是否重置 0表示未 1表示已重置 WaitFetchList []LimitListDesc //待领取的分红猫列表 领取完删除 CatShopInfo CatShopData //猫咖门店数据 Taskinfo TaskData //任务数据 diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index b21d7de..eca21a7 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -465,14 +465,28 @@ func (u *UserData) HandlePassDay() { lasttimestamp := time.Date(lasttime.Year(), lasttime.Month(), lasttime.Day(), 0, 0, 0, 0, lasttime.Location()) logger.Info("HandlePassDay lasttime=%v,lasttimestamp=%v", lasttime, lasttimestamp) + + if u.IsResetToday == 0 && nowtimestamp.Hour() >= 12 { + u.DoubleLeftTimes = ACCGOLDRATELIMIT + u.GetWatchAdsGoldTime = WATCHADSGOLDLIMIT + u.DrawTicket = DRAWTICKETNUM + u.DrawTicketTimes = DRAWTICKETGETLIMIT + u.RandRedBagLeftTime = RANDGIFTLIMIT + u.FlyBoxNumTimes = FLYBOXNUMLIMIT + u.LeftTimingRewardTimes = TIMEINGREWARDLIMIT + u.LeftOfflineTimes = OFFLINETIMESLIMIT + u.EmptyBoxLeftTime = EMPTYBOXLIMIT + u.IsResetToday = 1 + } if nowdaynum == lastdaynum { + //同一天 if int64(u.LastLoginTime)-time.Now().Unix() > 86400 { //已经过了很多天了 u.ContinueLoginDay = 1 u.SumLoginDay++ - isdiffday = true + } else { //t同一天 不做处理 } @@ -499,6 +513,8 @@ func (u *UserData) HandlePassDay() { u.LeftTimingRewardTimes = TIMEINGREWARDLIMIT u.LeftOfflineTimes = OFFLINETIMESLIMIT u.EmptyBoxLeftTime = EMPTYBOXLIMIT + + u.IsResetToday = 0 /*randint := rand.Intn(100) floatval := float32(randint) / 100 u.TodayZhaocai = 180 + floatval*/ diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 8da31ad..2b161cd 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -29,7 +29,7 @@ func MyInit() { pc := GetCurCaiCatList() if pc == nil { //初始化彩池 - NewCaiPiaoRound(0, 200, 200, 1) + NewCaiPiaoRound(0, 150, 150, 1) } } @@ -164,7 +164,7 @@ func HandlerSettlement(w http.ResponseWriter, data string, uuid int) { redishandler.GetRedisClient().HSet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(tmp.CurRound), string(savestr)) } - NewCaiPiaoRound(0, 200, 200, curr.CurRound+1) + NewCaiPiaoRound(0, 150, 150, curr.CurRound+1) } else { logger.Error("HandlerSettlement paramfailed failed=%v", err) @@ -2308,6 +2308,7 @@ func HandlerQueryBuyCat(w http.ResponseWriter, data string, uuid int) { break } + //需要返回到当前最高等级猫的所有数据 for k, v := range uinfo.BuyCatInfo { var tmp BuyCatDesc tmp.CatId = k + 1 @@ -2577,7 +2578,7 @@ func HandlerAutoChoose(w http.ResponseWriter, data string, uuid int) { logger.Info("SetCurCaiCatList") SetCurCaiCatList(curpool) //需要处理一下奖池是否满了 - fullnum := 199 + fullnum := 149 if curpool.FakeNum == 0 { fullnum++ } @@ -2598,7 +2599,7 @@ func HandlerAutoChoose(w http.ResponseWriter, data string, uuid int) { } //生成新的彩池 - NewCaiPiaoRound(0, 200, 200, waits.CurRound+1) + NewCaiPiaoRound(0, 150, 150, waits.CurRound+1) } } @@ -2691,7 +2692,7 @@ func HandlerChooseNum(w http.ResponseWriter, data string, uuid int) { logger.Info("SetCurCaiCatList") SetCurCaiCatList(curpool) //需要处理一下奖池是否满了 - fullnum := 199 + fullnum := 149 if curpool.FakeNum == 0 { fullnum++ } @@ -2712,7 +2713,7 @@ func HandlerChooseNum(w http.ResponseWriter, data string, uuid int) { } //生成新的彩池 - NewCaiPiaoRound(0, 200, 200, waits.CurRound+1) + NewCaiPiaoRound(0, 150, 150, waits.CurRound+1) } } -- libgit2 0.21.0