Commit Graph

731 Commits

Author SHA1 Message Date
dy
f0fc5a5901 Merge branch 'bugfix' into dev 2023-12-31 17:52:22 +08:00
dy
7aaa0699f9 fix 竞技场头像激活 2023-12-31 17:42:56 +08:00
dy
9e032536f0 Merge branch 'bugfix' into dev 2023-12-31 17:22:26 +08:00
dy
64a9ea7360 fix 黑帮争霸用户为空时协议报错 2023-12-31 17:22:07 +08:00
dy
b46260f4a2 Merge remote-tracking branch 'origin/dev' into dev 2023-12-31 17:05:25 +08:00
dy
22dd6644a3 Merge branch 'bugfix' into dev 2023-12-31 17:05:15 +08:00
dy
61a8ae0fc9 fix 黑帮争霸取参错误 2023-12-31 17:04:59 +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
76f9dd1f98 Merge branch 'bugfix' into dev 2023-12-31 15:23:06 +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
xcy
60bcf1d794 Merge branch 'fix/conglinshoulie' into dev 2023-12-31 14:20:08 +08:00
xcy
686f1fafc6 fix:
丛林猎手优化
2023-12-31 14:18:57 +08:00
dy
3f2daecfef Merge branch 'bugfix' into dev 2023-12-31 13:43:53 +08:00
dy
ec1b76ed5f 竞技场检测头像框是否激活 2023-12-31 13:43:47 +08:00
dy
dbd1e72657 Merge branch 'bugfix' into dev 2023-12-31 13:37:06 +08:00
dy
42daf348b9 消费竞赛定时器 2023-12-31 13:35:38 +08:00
dy
4128508a4c Merge branch 'feature/leichong' into dev 2023-12-31 11:45:57 +08:00
dy
a84f20361f 累充 2023-12-31 11:45:44 +08:00
dy
6f17e77f14 Merge branch 'bugfix' into dev 2023-12-31 11:24:45 +08:00
dy
f3ec6df093 消费竞赛 2023-12-31 11:24:38 +08:00
dy
eafa42880a Merge remote-tracking branch 'origin/dev' into dev 2023-12-31 09:48:45 +08:00
dy
da4a53d071 Merge branch 'feature/leichong' into dev 2023-12-31 09:48:33 +08:00
dy
96675a9ff1 累计充值 2023-12-31 09:48:26 +08:00
xcy
a7d11fe54e Merge branch 'bugfix' into dev 2023-12-30 18:04:20 +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
86866e9233 Merge branch 'bugfix' into dev 2023-12-30 16:32:49 +08:00
dy
611898b501 Merge branch 'feature/leichong' into dev 2023-12-30 16:32:38 +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
dy
f6df6fd8bc Merge branch 'bugfix' into dev 2023-12-30 10:43:31 +08:00
dy
a5da9e1522 Merge remote-tracking branch 'origin/bugfix' into bugfix 2023-12-30 10:42:29 +08:00
dy
d03d8a8399 增加字段 2023-12-30 10:42:24 +08:00
dy
ca4616e4de 增加自动 2023-12-30 10:41:57 +08:00
dy
005a086ea1 Merge branch 'master' into dev 2023-12-30 10:28:00 +08:00
dy
35ea01f3aa Merge branch 'master' into bugfix 2023-12-30 10:27:48 +08:00
dy
65417fb8bd fix数据刷新 2023-12-30 10:26:24 +08:00
dy
6be02bee61 Merge branch 'bugfix' into release 2023-12-29 19:42:58 +08:00
dy
9d14aea6b8 Merge branch 'bugfix' into dev 2023-12-29 19:42:43 +08:00
dy
8f3cb3e091 fix 开服竞赛排行榜 2023-12-29 19:42:35 +08:00
dy
fc426a283b Merge branch 'feature/json' into release 2023-12-29 19:01:28 +08:00
dy
1f3adac088 json 2023-12-29 19:01:18 +08:00
xcy
59a07175e6 Merge branch 'bugfix' into dev 2023-12-29 18:43:58 +08:00
xcy
e496b3fefb fix:
开服竞赛排行榜问题
2023-12-29 18:43:25 +08:00