From c3a41b750d063ea2a32535807c00b44ccc979cb8 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Thu, 11 Apr 2024 11:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=AE=A1=E7=AE=97=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAutc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configs/chest.json                    | 12 ++++++++----
 initdatas/activity_info.json          |  4 ++--
 src/common/LotteryCache.ts            |  2 +-
 src/controllers/chest.controller.ts   |  2 +-
 src/controllers/game.controller.ts    |  2 +-
 src/controllers/lottery.controller.ts |  2 +-
 src/controllers/sign.controller.ts    |  2 +-
 src/controllers/tasks.controller.ts   |  2 +-
 src/models/chain/CheckIn.ts           |  2 +-
 src/services/chain.svr.ts             |  2 +-
 src/services/rank.svr.ts              |  2 +-
 src/tasks/base/ITask.ts               |  4 ++--
 12 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/configs/chest.json b/configs/chest.json
index 3caeee7..418c482 100644
--- a/configs/chest.json
+++ b/configs/chest.json
@@ -6,7 +6,8 @@
       "initScoreMin": 75,
       "initScoreMax": 125,
       "bounsCfg": [15, 15],
-      "maxBounsCount": 5
+      "maxBounsCount": 5,
+      "probability": 4564
     },
     {
       "level": 2,
@@ -14,7 +15,8 @@
       "initScoreMin": 175,
       "initScoreMax": 225,
       "bounsCfg": [13, 13],
-      "maxBounsCount": 8
+      "maxBounsCount": 8,
+      "probability": 3526
     },
     {
       "level": 3,
@@ -22,7 +24,8 @@
       "initScoreMin": 375,
       "initScoreMax": 425,
       "bounsCfg": [12,12],
-      "maxBounsCount": 12
+      "maxBounsCount": 12,
+      "probability": 1724
     },
     {
       "level": 4,
@@ -30,7 +33,8 @@
       "initScoreMin": 775,
       "initScoreMax": 825,
       "bounsCfg": [11, 11],
-      "maxBounsCount": 15
+      "maxBounsCount": 15,
+      "probability": 186
     }
   ]
 
diff --git a/initdatas/activity_info.json b/initdatas/activity_info.json
index 704ea55..2f80c2f 100644
--- a/initdatas/activity_info.json
+++ b/initdatas/activity_info.json
@@ -65,7 +65,7 @@
       "params": {"time": 6, "failRate": 0}
     }
     ],
-    "startTime": 1711086450119,
-    "endTime": 1713678477701
+    "startTime": 1711036800000,
+    "endTime": 1713628799999
   }
 ]
\ No newline at end of file
diff --git a/src/common/LotteryCache.ts b/src/common/LotteryCache.ts
index 2eab9dc..8b4ca8e 100644
--- a/src/common/LotteryCache.ts
+++ b/src/common/LotteryCache.ts
@@ -1,6 +1,6 @@
 import { LotteryStats, LotteryStatsClass } from 'models/LotteryStats'
 import { singleton } from 'zutils'
-import { formatDate } from 'zutils/utils/date.util'
+import { formatDate } from 'utils/utcdate.util'
 import { DocumentType } from '@typegoose/typegoose'
 
 const EXPIRE_TIME = 1000 * 60 * 60
diff --git a/src/controllers/chest.controller.ts b/src/controllers/chest.controller.ts
index 1ed9099..1669cd7 100644
--- a/src/controllers/chest.controller.ts
+++ b/src/controllers/chest.controller.ts
@@ -2,7 +2,7 @@ import { ZError, SyncLocker, ZRedisClient, BaseController, ROLE_ANON, role, rout
 import { ActivityChest, ChestStatusEnum } from 'models/ActivityChest'
 import { ActivityUser } from 'models/ActivityUser'
 import { rankKey, rankLevel, updateRankScore } from 'services/rank.svr'
-import { formatDate } from 'zutils/utils/date.util'
+import { formatDate } from 'utils/utcdate.util'
 import { ScoreRecord } from 'models/ScoreRecord'
 import { ChestRecord } from 'models/chain/ChestRecord'
 import { generateChestBonus, generateNewChest } from 'services/game.svr'
diff --git a/src/controllers/game.controller.ts b/src/controllers/game.controller.ts
index 6189498..8a8dbc9 100644
--- a/src/controllers/game.controller.ts
+++ b/src/controllers/game.controller.ts
@@ -4,7 +4,7 @@ import { DAILY_SIGN, SIGN_SEQ, SIGN_TOTAL, TicketRecord, USE_TICKET } from 'mode
 import { queryCheckInList } from 'services/chain.svr'
 import { checkInToday, seqSignCfg, seqSignScore, totalSignCfg, totalSignScore } from 'services/sign.svr'
 import { ZError, SyncLocker, BaseController, router } from 'zutils'
-import { formatDate } from 'zutils/utils/date.util'
+import { formatDate } from 'utils/utcdate.util'
 import { generateChestLevel, generateNewChest, generateStepReward } from 'services/game.svr'
 import { ChestStatusEnum } from 'models/ActivityChest'
 import { updateRankScore } from 'services/rank.svr'
diff --git a/src/controllers/lottery.controller.ts b/src/controllers/lottery.controller.ts
index 483402b..6cbfa69 100644
--- a/src/controllers/lottery.controller.ts
+++ b/src/controllers/lottery.controller.ts
@@ -7,7 +7,7 @@ import { LOTTERY_CFG } from 'configs/lottery'
 import { ActivityItem } from 'models/ActivityItem'
 import { LotteryRecord } from 'models/LotteryRecord'
 import { updateRankScore } from 'services/rank.svr'
-import { formatDate } from 'zutils/utils/date.util'
+import { formatDate } from 'utils/utcdate.util'
 
 const ROUND = 1000000
 
diff --git a/src/controllers/sign.controller.ts b/src/controllers/sign.controller.ts
index 5df06a5..6def209 100644
--- a/src/controllers/sign.controller.ts
+++ b/src/controllers/sign.controller.ts
@@ -6,7 +6,7 @@ import { ScoreRecord } from 'models/ScoreRecord'
 import { LoginRecordQueue } from 'queue/loginrecord.queue'
 import { rankKey } from 'services/rank.svr'
 import { SiweMessage } from 'siwe'
-import { formatDate, nextday } from 'zutils/utils/date.util'
+import { formatDate, nextday } from 'utils/utcdate.util'
 import { checkParamsNeeded } from 'zutils/utils/net.util'
 import { aesDecrypt } from 'zutils/utils/security.util'
 import { base58ToHex } from 'zutils/utils/string.util'
diff --git a/src/controllers/tasks.controller.ts b/src/controllers/tasks.controller.ts
index 74ab800..0f8e89a 100644
--- a/src/controllers/tasks.controller.ts
+++ b/src/controllers/tasks.controller.ts
@@ -2,7 +2,7 @@ import { ZError, SyncLocker, BaseController, router } from 'zutils'
 import { TaskCfg, TaskTypeEnum } from 'models/ActivityInfo'
 import { TaskStatus, TaskStatusEnum } from 'models/ActivityUser'
 import { join } from 'path'
-import { formatDate } from 'zutils/utils/date.util'
+import { formatDate } from 'utils/utcdate.util'
 import { GeneralScription } from 'models/chain/GeneralScription'
 const fs = require('fs')
 
diff --git a/src/models/chain/CheckIn.ts b/src/models/chain/CheckIn.ts
index b7bfebe..2c50e27 100644
--- a/src/models/chain/CheckIn.ts
+++ b/src/models/chain/CheckIn.ts
@@ -1,7 +1,7 @@
 import { getModelForClass, index, modelOptions, prop } from '@typegoose/typegoose'
 import { dbconn } from 'decorators/dbconn'
 import { BaseModule } from '../Base'
-import { formatDate, yesterday } from 'zutils/utils/date.util'
+import { formatDate, yesterday } from 'utils/utcdate.util'
 
 @dbconn('chain')
 @index({ from: 1 }, { unique: false })
diff --git a/src/services/chain.svr.ts b/src/services/chain.svr.ts
index 0ca5be4..a75d70b 100644
--- a/src/services/chain.svr.ts
+++ b/src/services/chain.svr.ts
@@ -1,7 +1,7 @@
 import { CheckIn } from 'models/chain/CheckIn'
 import { NftHolder } from 'models/chain/NftHolder'
 import { NftStake } from 'models/chain/NftStake'
-import { getMonthBegin, getNDayAgo } from 'zutils/utils/date.util'
+import { getMonthBegin, getNDayAgo } from 'utils/utcdate.util'
 
 export const queryCheckInList = async (address: string, days: string | number | string[], limit: number = 0) => {
   let query: any = { from: address.toLowerCase() }
diff --git a/src/services/rank.svr.ts b/src/services/rank.svr.ts
index d73640d..ed11340 100644
--- a/src/services/rank.svr.ts
+++ b/src/services/rank.svr.ts
@@ -2,7 +2,7 @@ import { INVITE_REBATE, INVITE_REBATE_LEVEL, SCORE_INVITE_REBATE } from 'common/
 import { ActivityUser } from 'models/ActivityUser'
 import { ScoreRecord } from 'models/ScoreRecord'
 import { ZRedisClient } from 'zutils'
-import { formatDate } from 'zutils/utils/date.util'
+import { formatDate } from 'utils/utcdate.util'
 const rankLevels = require('../../configs/uaw_rank_level.json')
 /**
  * 更新排行榜
diff --git a/src/tasks/base/ITask.ts b/src/tasks/base/ITask.ts
index 51e66ca..8305662 100644
--- a/src/tasks/base/ITask.ts
+++ b/src/tasks/base/ITask.ts
@@ -1,6 +1,6 @@
-import { ActivityInfo, ActivityInfoClass, TaskCfg } from 'models/ActivityInfo'
+import { ActivityInfoClass, TaskCfg } from 'models/ActivityInfo'
 import { ActivityItem } from 'models/ActivityItem'
-import { ActivityUser, ActivityUserClass, TaskStatus, TaskStatusEnum } from 'models/ActivityUser'
+import { ActivityUserClass, TaskStatusEnum } from 'models/ActivityUser'
 import { updateRankScore } from 'services/rank.svr'
 import { DocumentType } from '@typegoose/typegoose'