xichaoyin
|
bc078b9c95
|
feat:
探险新增声望掉落
|
2024-01-03 14:48:58 +08:00 |
|
dy
|
d3f272f1e4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-03 14:47:03 +08:00 |
|
dy
|
89ea1a47af
|
Merge branch 'bugfix' into dev
|
2024-01-03 14:46:58 +08:00 |
|
dy
|
8d9ecf30b6
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
# Conflicts:
# src/api_s2c/event/leijichongzhi/ApiRec.ts
|
2024-01-03 14:46:30 +08:00 |
|
dy
|
ec85961633
|
累计充值轮次加校验
|
2024-01-03 14:45:51 +08:00 |
|
|
|
d490550abf
|
容错
|
2024-01-03 14:44:50 +08:00 |
|
xichaoyin
|
08c59b522b
|
Merge branch 'feature/weiwang' into dev
|
2024-01-03 14:35:58 +08:00 |
|
xichaoyin
|
c65aea9ae2
|
fix:
威望配置提交
|
2024-01-03 14:35:19 +08:00 |
|
|
|
38dca3a653
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 14:32:40 +08:00 |
|
|
|
7e589e23b3
|
容错
|
2024-01-03 14:31:47 +08:00 |
|
dy
|
22b577036f
|
watchdog
|
2024-01-03 14:29:22 +08:00 |
|
|
|
6e9d65241e
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 14:00:29 +08:00 |
|
|
|
43aeef2501
|
容错
|
2024-01-03 13:44:51 +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
|
953303d9a4
|
Merge branch 'master' into feature/warning
|
2024-01-03 10:18:20 +08:00 |
|
dy
|
8f92372471
|
Merge branch 'master' into dev
|
2024-01-03 10:18:06 +08:00 |
|
dy
|
c839d844ec
|
Merge branch 'bugfix' into release
|
2024-01-02 20:42:33 +08:00 |
|
dy
|
ee99de169d
|
Revert "fix 悬赏任务上限限制"
This reverts commit bfe48a54f4.
|
2024-01-02 20:42:23 +08:00 |
|
dy
|
4f5a1492a6
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-02 20:30:20 +08:00 |
|
dy
|
bfe48a54f4
|
fix 悬赏任务上限限制
|
2024-01-02 20:30:11 +08:00 |
|
|
|
5750b83dc6
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-02 20:26:16 +08:00 |
|
|
|
5a7d2b2d55
|
错误log
|
2024-01-02 20:26:04 +08:00 |
|
dy
|
ef60b3ba26
|
Merge branch 'bugfix' into release
|
2024-01-02 20:15:54 +08:00 |
|
dy
|
1006826bfe
|
fix 悬赏任务上限限制
|
2024-01-02 20:15:34 +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 |
|
|
|
4b30eaab04
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-02 17:38:18 +08:00 |
|
|
|
2425ca07d0
|
删除残余redis代码
|
2024-01-02 17:38:07 +08:00 |
|
dy
|
d2ddc62752
|
fix round
|
2024-01-02 15:49:24 +08:00 |
|
xichaoyin
|
57faacbe9b
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-02 15:24:01 +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
|
dec416a158
|
Merge branch 'master' into dev
|
2024-01-02 11:11:47 +08:00 |
|
dy
|
3899b9157c
|
Merge branch 'bugfix' into release
|
2024-01-02 11:11:03 +08:00 |
|
dy
|
76c96b7abb
|
暂时屏蔽矿洞延时
|
2024-01-02 11:10:27 +08:00 |
|
dy
|
2c625416a8
|
proto
|
2024-01-02 09:53:42 +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
|
9955c4db93
|
fix:
提交测试
|
2024-01-02 09:50:35 +08:00 |
|
dy
|
ab872cf185
|
cehua json
|
2024-01-02 09:50:33 +08:00 |
|
|
|
fc7c7ceaad
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-02 09:45:51 +08:00 |
|
|
|
51a31e4b91
|
容错
|
2024-01-02 09:45:38 +08:00 |
|
xichaoyin
|
8d9002b1a5
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-31 21:36:32 +08:00 |
|
