Commit Graph

741 Commits

Author SHA1 Message Date
dy
7676fc3142 Revert "回滚公用方法"
This reverts commit 89af066d12.
2023-12-29 01:19:47 +08:00
dy
2af3bf426b Merge branch 'master' into bugfix 2023-12-29 01:19:16 +08:00
dy
89af066d12 回滚公用方法 2023-12-29 01:07:27 +08:00
dy
8dfe0b4ce8 fix 脚本 2023-12-28 23:55:07 +08:00
dy
55fae245e9 fix 脚本模板 2023-12-28 19:49:06 +08:00
dy
ad9e3cca46 Merge branch 'bugfix' into release
# Conflicts:
#	src/public/rank/rank.ts
2023-12-28 19:17:09 +08:00
xcy
cedce860c5 fix:
排行榜bug
2023-12-28 18:46:38 +08:00
dy
cc6aad7223 Merge remote-tracking branch 'origin/bugfix' into bugfix 2023-12-28 18:19:52 +08:00
dy
566c3aeb7b fix 公共方法 2023-12-28 18:19:40 +08:00
xcy
8a69a4fc1e 修复排行榜 2023-12-28 18:13:50 +08:00
dy
63877a2664 Merge branch 'bugfix' into release 2023-12-28 17:34:02 +08:00
dy
1a88ed0784 Merge branch 'feature/json' into release 2023-12-28 17:33:54 +08:00
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
xcy
36a82d135b Merge branch 'fix/conglinshoulie' into dev 2023-12-28 00:02:35 +08:00
dy
f0fc5a5901 Merge branch 'bugfix' into dev 2023-12-31 17:52:22 +08:00
dy
9e032536f0 Merge branch 'bugfix' into dev 2023-12-31 17:22:26 +08:00
dy
b46260f4a2 Merge remote-tracking branch 'origin/dev' into dev 2023-12-31 17:05:25 +08:00
dy
22dd6644a3 Merge branch 'bugfix' into dev 2023-12-31 17:05:15 +08:00
dy
76f9dd1f98 Merge branch 'bugfix' into dev 2023-12-31 15:23:06 +08:00
xcy
60bcf1d794 Merge branch 'fix/conglinshoulie' into dev 2023-12-31 14:20:08 +08:00
xcy
686f1fafc6 fix:
丛林猎手优化
2023-12-31 14:18:57 +08:00
dy
3f2daecfef Merge branch 'bugfix' into dev 2023-12-31 13:43:53 +08:00
dy
dbd1e72657 Merge branch 'bugfix' into dev 2023-12-31 13:37:06 +08:00
dy
4128508a4c Merge branch 'feature/leichong' into dev 2023-12-31 11:45:57 +08:00
dy
6f17e77f14 Merge branch 'bugfix' into dev 2023-12-31 11:24:45 +08:00
dy
eafa42880a Merge remote-tracking branch 'origin/dev' into dev 2023-12-31 09:48:45 +08:00
dy
da4a53d071 Merge branch 'feature/leichong' into dev 2023-12-31 09:48:33 +08:00
xcy
a7d11fe54e Merge branch 'bugfix' into dev 2023-12-30 18:04:20 +08:00
dy
86866e9233 Merge branch 'bugfix' into dev 2023-12-30 16:32:49 +08:00