Commit Graph

589 Commits

Author SHA1 Message Date
dy
f2b9f12390 huodong.json 2023-12-28 17:33:47 +08:00
dy
6a0a158fba fix 脚本 2023-12-28 17:33:08 +08:00
dy
9d9c37714b Merge branch 'bugfix' into release 2023-12-28 16:13:54 +08:00
dy
37f2472f5d 修复脚本模板,刷新活动内容脚本 2023-12-28 16:10:56 +08:00
xcy
bf4f22d092 fix:
修复终身卡邮件没有type
2023-12-28 15:18:47 +08:00
dy
4343d50f7c Merge branch 'feature/yuandan' into release 2023-12-28 15:17:35 +08:00
dy
5512bf3422 Merge branch 'feature/json' into release 2023-12-28 15:17:24 +08:00
dy
86595c68b3 cehua json 2023-12-28 15:17:06 +08:00
dy
847a1d03e9 注释 2023-12-28 15:14:42 +08:00
xcy
96729c719a fix:
终身卡发放奖励bug修复
2023-12-28 14:48:52 +08:00
xcy
075c60a9f8 fix:
终身卡定时器log
2023-12-28 14:42:45 +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
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
d6e41758f9 fix:
修复终身卡每周奖励未发放bug
2023-12-28 11:49:21 +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
47b1fe4d22 fix:修复悬赏任务一键领取特权问题 2023-12-28 10:08:19 +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
7b5c470f52 fix 红点 2023-12-27 22:31:09 +08:00
dy
b9a556ea30 fix pay 2023-12-27 22:09:53 +08:00
dy
757f1ba4b8 Merge branch 'feature/xiaofeijingsai' into release 2023-12-27 21:06:44 +08:00
dy
722e92a54b 消费竞赛 2023-12-27 21:05:53 +08:00
dy
2309ff4a9c Merge branch 'feature/json' into release 2023-12-27 20:50:05 +08:00
dy
c0e6f6516c cehua json 2023-12-27 20:49:23 +08:00
dy
d6d8b39afe Merge branch 'feature/json' into release
# Conflicts:
#	src/json/attr.json
#	src/json/huodong.json5
2023-12-27 20:21:51 +08:00
dy
27ec272347 cehua json 2023-12-27 20:21:13 +08:00
dy
47f16b583a Merge branch 'feature/xiaofeijingsai' into release 2023-12-27 20:20:23 +08:00
dy
82d323d5c8 Merge branch 'feature/yuandan' into release
# Conflicts:
#	src/public/pay.ts
2023-12-27 20:20:01 +08:00
dy
dced990c89 Merge remote-tracking branch 'origin/fix_rank' into release 2023-12-27 20:19:25 +08:00
dy
12300703b5 每日刷新付费礼包 2023-12-27 20:09:59 +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
dbb012675a fix 自选支付 2023-12-27 19:30:49 +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
7af728b68c fix 自选购买 2023-12-27 19:13:17 +08:00
dy
837e9b58c8 fix 元旦红点 2023-12-27 18:50:36 +08:00
dy
5e476fa5c6 fix 探险 2023-12-27 18:34:04 +08:00
dy
3c034fb296 每10分钟刷新排行榜前一千名玩家的用户数据 2023-12-27 17:53:32 +08:00
dy
53a2becac5 娃娃机改为掉落组 2023-12-27 16:53:33 +08:00
dy
7c83a8bbe8 娃娃机改为掉落组 2023-12-27 16:41:22 +08:00
dy
0df09e0f9e 娃娃机改为掉落组 2023-12-27 16:33:31 +08:00
dy
bdb83f9da7 英雄爆伤限制为最大值1000% 2023-12-27 16:00:43 +08:00
dy
b821afc6b0 修复配件套装战力计算 2023-12-27 15:47:44 +08:00
dy
6089ad5dd2 增加抓娃娃的任务类型,userPing同步玩家钻石金币 2023-12-27 15:06:22 +08:00