Commit Graph

661 Commits

Author SHA1 Message Date
a5e726e811 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-04 15:51:52 +08:00
8afa624f44 跨服聊天分组 2024-01-04 15:51:40 +08:00
dy
6ec6de4d56 破冰礼包拦截前端空字符串请求 2024-01-04 15:37:09 +08:00
52ab7e9979 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-04 14:30:47 +08:00
a1dbacd7fe 积分赛只刷出本服对手 2024-01-04 14:30:37 +08:00
dy
04533c80f4 fix pata/saodang 2024-01-04 11:20:00 +08:00
dy
98a3927966 fix lingzhulaixi 2024-01-04 11:05:05 +08:00
dy
eb73af1dd2 数据监测改为查半小时内在线用户 2024-01-03 22:40:24 +08:00
dy
1dd7bc2175 api pay 2024-01-03 22:10:35 +08:00
dy
ecc17a22a9 api 锁修改,一键接取悬赏 2024-01-03 21:57:12 +08:00
dy
826840455c api 锁修改 2024-01-03 20:19:58 +08:00
dy
60d0e04e33 fix 探险 gamelog 2024-01-03 19:36:28 +08:00
dy
6233a6672e Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-03 19:28:34 +08:00
dy
afd856af30 fix 探险 2024-01-03 19:28:22 +08:00
xichaoyin
698c7bd3f6 fix:
修复讨伐海盗挑战boss胜利不扣除战斗次数bug
2024-01-03 18:42:36 +08:00
dy
7dd83e06ef watchdog.json 2024-01-03 17:35:08 +08:00
xichaoyin
20f0f41c22 fix:
王者荣耀发奖定时器容错修改
2024-01-03 15:47:02 +08:00
dy
6cc58ffd94 还原 2024-01-03 15:22:36 +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
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
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
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
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