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 |
|
dy
|
611898b501
|
Merge branch 'feature/leichong' into dev
|
2023-12-30 16:32:38 +08:00 |
|
dy
|
f6df6fd8bc
|
Merge branch 'bugfix' into dev
|
2023-12-30 10:43:31 +08:00 |
|
dy
|
005a086ea1
|
Merge branch 'master' into dev
|
2023-12-30 10:28:00 +08:00 |
|
dy
|
9d14aea6b8
|
Merge branch 'bugfix' into dev
|
2023-12-29 19:42:43 +08:00 |
|
xcy
|
59a07175e6
|
Merge branch 'bugfix' into dev
|
2023-12-29 18:43:58 +08:00 |
|
dy
|
718add173f
|
Merge branch 'feature/json' into dev
|
2023-12-29 16:52:17 +08:00 |
|
dy
|
94cf1f9c4f
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:26:22 +08:00 |
|
dy
|
be8691ce6d
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:21:55 +08:00 |
|
dy
|
f7cf497ded
|
Merge branch 'bugfix' into dev
|
2023-12-29 14:22:17 +08:00 |
|
dy
|
3462540159
|
Merge branch 'bugfix' into dev
# Conflicts:
# src/public/pay.ts
|
2023-12-29 13:53:02 +08:00 |
|
xcy
|
52a112085b
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2023-12-28 18:46:58 +08:00 |
|
xcy
|
2894f384b9
|
Merge remote-tracking branch 'origin/bugfix' into dev
# Conflicts:
# src/public/rank/rank.ts
|
2023-12-28 18:22:20 +08:00 |
|
xcy
|
2739774842
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 18:20:15 +08:00 |
|
dy
|
17aa676fa9
|
Merge branch 'bugfix' into dev
|
2023-12-28 16:16:09 +08:00 |
|
xcy
|
34ce5c01aa
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:19:06 +08:00 |
|
xcy
|
4fa797f93d
|
fix:
终身卡发放奖励bug修复
|
2023-12-28 14:49:17 +08:00 |
|
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 |
|