Commit Graph

763 Commits

Author SHA1 Message Date
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
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
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
ab12f52e2e Merge branch 'fix/conglinshoulie' into dev 2024-01-03 10:04:46 +08:00
xichaoyin
a82e9c560e fix:
从林狩猎open添加week
2024-01-03 10:04:27 +08:00
xichaoyin
9bf6e3e724 fix:
week添加
2024-01-03 09:50:21 +08:00
xichaoyin
06540083ab Merge branch 'fix/conglinshoulie' into dev 2024-01-03 09:43:10 +08:00
xichaoyin
2b5be18ea5 fix:
丛林猎手优化
2024-01-03 09:42:13 +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
afe6ddc20b Merge branch 'bugfix' into dev 2023-12-31 18:56:47 +08:00
dy
b466826d94 修复第一次打开没有round报错 2023-12-31 18:56:42 +08:00
dy
e95928b060 Merge branch 'master' into dev 2023-12-31 18:48: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
dy
96675a9ff1 累计充值 2023-12-31 09:48:26 +08:00
xcy
a177c18efe fix:
修复排名数据问题
2023-12-30 18:04:01 +08:00
xcy
18b380f620 fix:
脚本冲突解决
2023-12-30 17:04:56 +08:00
xcy
f99d556736 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-30 17:04:25 +08:00
xcy
d034105a62 fix:
修复排名数据不对
2023-12-30 17:02:25 +08:00
dy
6fd4e79fbe 累计充值 2023-12-30 16:32:26 +08:00
dy
6fae6cd61e 破冰礼包 2023-12-30 16:07:54 +08:00
xcy
45cec85960 patch:
修复元旦活动任务脚本
2023-12-30 15:10:35 +08:00