Commit Graph

626 Commits

Author SHA1 Message Date
xcy
be85366d04 fix:
终身卡定时器log
2023-12-28 14:43:00 +08:00
dy
e1430b6411 Merge branch 'bugfix' into dev 2023-12-28 14:18:58 +08:00
dy
1412da00ae Merge remote-tracking branch 'origin/bugfix' into bugfix 2023-12-28 14:18:33 +08:00
dy
4e19dc21a1 fix聊天禁言,英雄阵形战力计算 2023-12-28 14:18:26 +08:00
xcy
0b2a9f3dc7 累计充值累计金额修改为累计vip经验(金额*10) 2023-12-28 13:44:53 +08:00
xcy
27d7a56d10 累计充值累计金额修改为累计vip经验(金额*10) 2023-12-28 13:44:35 +08:00
dy
053ab1ab23 Merge remote-tracking branch 'origin/bugfix' into bugfix 2023-12-28 13:39:54 +08:00
dy
07fa117614 fix公共方法 random 2023-12-28 13:39:28 +08:00
xcy
b79d80beed fix:
修复终身卡每周奖励未发放bug
2023-12-28 11:49:44 +08:00
xcy
d6e41758f9 fix:
修复终身卡每周奖励未发放bug
2023-12-28 11:49:21 +08:00
Your Name
3898cee713 fix:
修复悬赏任务一键领取3倍奖励逻辑错误
2023-12-28 11:11:34 +08:00
Your Name
4fc0aa8576 fix:
修复悬赏任务一键领取3倍奖励逻辑错误
2023-12-28 11:11:13 +08:00
dy
ee991be3b9 弃用临时修复的tsbuffer-validator/index.js 2023-12-28 10:56:54 +08:00
dy
cae860a087 tsrpc版本升级 2023-12-28 10:47:38 +08:00
Your Name
dda879b037 Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2023-12-28 10:10:05 +08:00
Your Name
99e84d65a5 fix:修复悬赏任务一键领取特权问题 2023-12-28 10:09:58 +08:00
Your Name
47b1fe4d22 fix:修复悬赏任务一键领取特权问题 2023-12-28 10:08:19 +08:00
dy
2811d16323 Merge branch 'bugfix' into dev 2023-12-28 10:06:30 +08:00
dy
e098e41885 paylog增加args记录 2023-12-28 10:05:52 +08:00
dy
57c5a8a5e7 Revert "fix pay"
This reverts commit b9a556ea30.
2023-12-27 22:56:55 +08:00
dy
b013e9042c Merge branch 'bugfix' into dev 2023-12-27 22:10:19 +08:00
dy
b9a556ea30 fix pay 2023-12-27 22:09:53 +08:00
dy
1158f26eaa Merge branch 'feature/xiaofeijingsai' into dev 2023-12-27 21:06:10 +08:00
dy
722e92a54b 消费竞赛 2023-12-27 21:05:53 +08:00
dy
6efe04ed6d Merge branch 'feature/json' into dev 2023-12-27 20:49:47 +08:00
dy
c0e6f6516c cehua json 2023-12-27 20:49:23 +08:00
dy
27ec272347 cehua json 2023-12-27 20:21:13 +08:00
dy
968ce25e5f Merge branch 'feature/yuandan' into dev 2023-12-27 20:10:25 +08:00
dy
12300703b5 每日刷新付费礼包 2023-12-27 20:09:59 +08:00
dy
944a675af3 Merge branch 'feature/yuandan' into dev 2023-12-27 20:00:01 +08:00
dy
6fa3a8224c Merge branch 'bugfix' into dev 2023-12-27 19:59:57 +08:00
dy
2e84333776 fix 元旦任务计数 2023-12-27 19:59:50 +08:00
dy
add9c7c562 fix 元旦任务 2023-12-27 19:49:33 +08:00
dy
479c309481 Merge branch 'bugfix' into dev 2023-12-27 19:32:03 +08:00
dy
dbb012675a fix 自选支付 2023-12-27 19:30:49 +08:00
dy
b2eb783dc1 Merge branch 'feature/json' into dev
# Conflicts:
#	src/json/huodong.json5
2023-12-27 19:16:06 +08:00
dy
771c4a2ceb cehua json 2023-12-27 19:15:51 +08:00
dy
3e198b688e Merge branch 'master' into feature/json 2023-12-27 19:15:27 +08:00
dy
892717ca09 Merge branch 'bugfix' into dev 2023-12-27 19:13:24 +08:00
dy
7af728b68c fix 自选购买 2023-12-27 19:13:17 +08:00
dy
837e9b58c8 fix 元旦红点 2023-12-27 18:50:36 +08:00
dy
05ea2e4213 Merge remote-tracking branch 'origin/fix_rank' into dev 2023-12-27 18:34:29 +08:00
dy
3450796bb7 Merge branch 'bugfix' into dev 2023-12-27 18:34:16 +08:00
dy
5e476fa5c6 fix 探险 2023-12-27 18:34:04 +08:00
dy
4ebe8ae338 Merge branch 'bugfix' into dev 2023-12-27 17:55:29 +08:00
dy
3c034fb296 每10分钟刷新排行榜前一千名玩家的用户数据 2023-12-27 17:53:32 +08:00
dy
de90e27b3f Merge branch 'bugfix' into dev 2023-12-27 17:06:34 +08:00
dy
1292156a9d Merge branch 'feature/yuandan' into dev 2023-12-27 17:00:30 +08:00
dy
53a2becac5 娃娃机改为掉落组 2023-12-27 16:53:33 +08:00
dy
95a3e9d3fb Merge branch 'feature/yuandan' into dev 2023-12-27 16:41:54 +08:00