Commit Graph

697 Commits

Author SHA1 Message Date
xichaoyin
b354c61358 fix:
养成目标
2024-01-06 17:51:24 +08:00
xichaoyin
35d51a3811 fix:
养成目标
2024-01-06 17:39:32 +08:00
xichaoyin
29f7133f10 fix:
活动刷新脚本
2024-01-06 17:30:57 +08:00
xichaoyin
2d62a387b6 fix:
养成目标礼包重置
2024-01-06 17:30:41 +08:00
xichaoyin
f61b59123b fix:
zhanling重置问题
2024-01-06 00:07:27 +08:00
xichaoyin
ef80c8b984 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-05 15:05:17 +08:00
xichaoyin
8560986246 fix:
修复丛林猎手段位奖励漏发问题
2024-01-05 15:05:14 +08:00
fa25e745eb 次数调整 2024-01-05 10:36:50 +08:00
dcb83e9520 次数调整 2024-01-05 10:00:59 +08:00
xichaoyin
a04394149d fix:
修复破冰bug
2024-01-05 00:37:40 +08:00
xichaoyin
da37b162d9 fix:
破冰礼包一键领取
2024-01-04 22:25:17 +08:00
xichaoyin
8e1c5412d6 fix:
破冰礼包一键领取
2024-01-04 22:20:30 +08:00
xichaoyin
b04ce950cd fix:
充值之后推一次活动红点change
2024-01-04 21:41:21 +08:00
xichaoyin
8ec4a46837 fix:
修复礼包在最后一天可以一键领取所有奖励
2024-01-04 21:36:45 +08:00
xichaoyin
d7f0f22df7 fix:
伙伴招募红点修改
2024-01-04 21:05:11 +08:00
xichaoyin
779709a32f fix:
伙伴招募红点修改
2024-01-04 20:32:31 +08:00
dy
01f57b347f 新增活动脚本 2024-01-04 18:25:27 +08:00
dy
28adc88ff0 新增活动脚本 2024-01-04 18:04:39 +08:00
dy
a50b2624ac 累计充值红点 2024-01-04 17:04:01 +08:00
dy
65d306227b 领奖,红点 2024-01-04 16:56:33 +08:00
dy
38b2f9a99e 破冰礼包增加最后一天可领取所有奖励 2024-01-04 16:50:16 +08:00
dy
3e1c45aaf9 Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-04 16:05:59 +08:00
dy
f1dacd19b6 破冰礼包增加轮次,修复bug 2024-01-04 16:05:52 +08:00
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
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
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
b45eec43f9 fix:
丛林猎手优化
2023-12-31 21:35:11 +08:00
xichaoyin
c8f9d0c7d7 fix:
修复定时器数据
2024-01-04 20:07:42 +08:00
xichaoyin
a82e9c560e fix:
从林狩猎open添加week
2024-01-03 10:04:27 +08:00
xichaoyin
2b5be18ea5 fix:
丛林猎手优化
2024-01-03 09:42:13 +08:00
xcy
381aeb1792 fix:
丛林猎手优化
2024-01-01 09:04:08 +08:00
dy
b466826d94 修复第一次打开没有round报错 2023-12-31 18:56:42 +08:00
dy
428033b26f Merge branch 'bugfix' into release 2023-12-31 17:43:30 +08:00
dy
7aaa0699f9 fix 竞技场头像激活 2023-12-31 17:42:56 +08:00
dy
64a9ea7360 fix 黑帮争霸用户为空时协议报错 2023-12-31 17:22:07 +08:00
dy
61a8ae0fc9 fix 黑帮争霸取参错误 2023-12-31 17:04:59 +08:00
dy
4448b2dfa8 Merge branch 'bugfix' into release 2023-12-31 16:30:16 +08:00
17ae62472e Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-31 16:29:22 +08:00
b75e7155b8 增加错误捕获 2023-12-31 16:24:07 +08:00
dy
087b8ff146 Merge branch 'feature/json' into release 2023-12-31 16:01:52 +08:00
dy
3ba27f5180 cehua public json 2023-12-31 16:01:41 +08:00
dy
d8a7fa14d0 Merge remote-tracking branch 'origin/bugfix' into release 2023-12-31 15:59:30 +08:00
dy
71c0506a72 修复玩家出现的饰品和配件数据错误导致的进不去游戏 2023-12-31 15:22:51 +08:00
dy
1090852522 修复玩家出现的饰品和配件数据错误导致的进不去游戏 2023-12-31 15:21:41 +08:00
dy
09b74e3490 黑帮争霸刷新玩家数据 2023-12-31 14:26:40 +08:00
dy
ec1b76ed5f 竞技场检测头像框是否激活 2023-12-31 13:43:47 +08:00
dy
42daf348b9 消费竞赛定时器 2023-12-31 13:35:38 +08:00
dy
a84f20361f 累充 2023-12-31 11:45:44 +08:00
dy
f3ec6df093 消费竞赛 2023-12-31 11:24:38 +08:00