diff --git a/initdatas/activity_info.json b/initdatas/activity_info.json index 2f80c2f..7d709ea 100644 --- a/initdatas/activity_info.json +++ b/initdatas/activity_info.json @@ -65,7 +65,7 @@ "params": {"time": 6, "failRate": 0} } ], - "startTime": 1711036800000, - "endTime": 1713628799999 + "startTime": 1710979200000, + "endTime": 1713571199999 } ] \ No newline at end of file diff --git a/src/controllers/game.controller.ts b/src/controllers/game.controller.ts index 8a8dbc9..4ecf4c5 100644 --- a/src/controllers/game.controller.ts +++ b/src/controllers/game.controller.ts @@ -11,6 +11,7 @@ import { updateRankScore } from 'services/rank.svr' import { ExploreRecord } from 'models/ExploreRecord' import { isObjectId } from 'zutils/utils/string.util' import { GeneralScription } from 'models/chain/GeneralScription' +import { CheckIn } from 'models/chain/CheckIn' /** * 探索游戏相关接口 @@ -214,7 +215,6 @@ class GameController extends BaseController { // 检查是否已领取 todayStat = 9 } - const scoreBonus = seqSignScore(checkRecord?.count || 0) const ticketRecords = await TicketRecord.find({ user: user.id, activity: user.activity, @@ -234,9 +234,10 @@ class GameController extends BaseController { }) const totalStat = [] + const lastRecord = await CheckIn.findOne({ from: user.address.toLowerCase() }).sort({ _id: -1 }) for (let cfg of totalSignCfg) { let state = 0 - if (cfg.days <= checkRecord?.total || 0) { + if (cfg.days <= lastRecord?.total || 0) { state = 1 } if (claimedSet.has(cfg.days)) { @@ -252,7 +253,7 @@ class GameController extends BaseController { const seqStat = [] for (let cfg of seqSignCfg) { let state = 0 - if (cfg.days <= checkRecord?.maxSeq || 0) { + if (cfg.days <= lastRecord?.maxSeq || 0) { state = 1 } if (seqSet.has(cfg.days)) { @@ -270,7 +271,7 @@ class GameController extends BaseController { totalUsed: Math.abs(totalUsed), signCfg, todayStat, - todayTickets: 1 + scoreBonus, + todayTickets: 1, daysTotal: checkRecord?.total || 0, daysSeq: checkRecord?.count || 0, seqStat,