dy
|
89ea1a47af
|
Merge branch 'bugfix' into dev
|
2024-01-03 14:46:58 +08:00 |
|
dy
|
22b577036f
|
watchdog
|
2024-01-03 14:29:22 +08:00 |
|
dy
|
1a9f942297
|
还原
|
2024-01-03 11:38:06 +08:00 |
|
dy
|
8f0c24bc87
|
Merge branch 'feature/warning' into bugfix
|
2024-01-03 11:09:56 +08:00 |
|
dy
|
1fcedaff59
|
还原
|
2024-01-03 11:09:39 +08:00 |
|
dy
|
a1c7f2e4d0
|
监控init
|
2024-01-03 11:01:12 +08:00 |
|
|
|
78c306ce5e
|
数据监控
|
2024-01-03 10:58:09 +08:00 |
|
|
|
ad15cf73bf
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 10:36:35 +08:00 |
|
|
|
3c380f1e55
|
数据监控
|
2024-01-03 10:36:17 +08:00 |
|
dy
|
049f1599bf
|
Merge branch 'bugfix' into release
|
2024-01-02 20:09:32 +08:00 |
|
dy
|
499acf3684
|
Merge branch 'bugfix' into dev
|
2024-01-02 19:55:57 +08:00 |
|
dy
|
46401b90ee
|
fix 悬赏任务上限限制
|
2024-01-02 19:55:36 +08:00 |
|
|
|
ea1be8cff2
|
残余redis代码
|
2024-01-02 18:17:43 +08:00 |
|
|
|
2425ca07d0
|
删除残余redis代码
|
2024-01-02 17:38:07 +08:00 |
|
xichaoyin
|
abf47d251f
|
Merge branch 'feature/weiwang' into dev
|
2024-01-02 15:23:56 +08:00 |
|
xichaoyin
|
77e06ba769
|
feat:
威望系统
|
2024-01-02 15:23:39 +08:00 |
|
dy
|
c927d3b7bc
|
Merge branch 'fix/conglinshoulie' into release
# Conflicts:
# src/public/rank/rank.ts
|
2024-01-02 09:53:11 +08:00 |
|
xichaoyin
|
8d9002b1a5
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-31 21:36:32 +08:00 |
|
xichaoyin
|
dc45a38f4e
|
Merge branch 'fix/conglinshoulie' into dev
|
2024-01-04 20:08:01 +08:00 |
|
xichaoyin
|
c8f9d0c7d7
|
fix:
修复定时器数据
|
2024-01-04 20:07:42 +08:00 |
|
xichaoyin
|
a69ca2312a
|
Merge branch 'fix/conglinshoulie' into dev
# Conflicts:
# src/public/rank/rank.ts
|
2024-01-01 09:22:18 +08:00 |
|
xcy
|
381aeb1792
|
fix:
丛林猎手优化
|
2024-01-01 09:04:08 +08:00 |
|
xichaoyin
|
b45eec43f9
|
fix:
丛林猎手优化
|
2023-12-31 21:35:11 +08:00 |
|
dy
|
7aaa0699f9
|
fix 竞技场头像激活
|
2023-12-31 17:42:56 +08:00 |
|
dy
|
42daf348b9
|
消费竞赛定时器
|
2023-12-31 13:35:38 +08:00 |
|
dy
|
f3ec6df093
|
消费竞赛
|
2023-12-31 11:24:38 +08:00 |
|
xcy
|
a177c18efe
|
fix:
修复排名数据问题
|
2023-12-30 18:04:01 +08:00 |
|
xcy
|
d034105a62
|
fix:
修复排名数据不对
|
2023-12-30 17:02:25 +08:00 |
|
dy
|
8f3cb3e091
|
fix 开服竞赛排行榜
|
2023-12-29 19:42:35 +08:00 |
|
xcy
|
e496b3fefb
|
fix:
开服竞赛排行榜问题
|
2023-12-29 18:43:25 +08:00 |
|
dy
|
b9be0901fa
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-29 17:25:40 +08:00 |
|
dy
|
ecc116bfa1
|
fix 消费竞赛
|
2023-12-29 17:25:34 +08:00 |
|
xcy
|
d71ecf13f9
|
fix:
开服竞赛排行榜修复
|
2023-12-29 17:06:59 +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 |
|
xcy
|
8a69a4fc1e
|
修复排行榜
|
2023-12-28 18:13:50 +08:00 |
|
dy
|
9d9c37714b
|
Merge branch 'bugfix' into release
|
2023-12-28 16:13:54 +08:00 |
|
xcy
|
bf4f22d092
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:18:47 +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 |
|
xcy
|
d6e41758f9
|
fix:
修复终身卡每周奖励未发放bug
|
2023-12-28 11:49:21 +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 |
|
xcy
|
0e93358e74
|
fix:
丛林猎手优化
|
2023-12-28 00:02:12 +08:00 |
|
dy
|
57c5a8a5e7
|
Revert "fix pay"
This reverts commit b9a556ea30.
|
2023-12-27 22:56:55 +08:00 |
|
dy
|
b9a556ea30
|
fix pay
|
2023-12-27 22:09:53 +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 |
|
