|
|
2fc85853dc
|
feat: 充值抢钻石活动
|
2023-12-21 21:14:13 +08:00 |
|
dy
|
5bf5f59bfa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-21 17:49:19 +08:00 |
|
dy
|
3dff056df6
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 12:37:55 +08:00 |
|
dy
|
3194dc6449
|
造型更换
|
2023-12-21 12:37:39 +08:00 |
|
dy
|
e477b14546
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 11:32:30 +08:00 |
|
dy
|
552da79951
|
用户头像造型修复bug
|
2023-12-21 11:32:15 +08:00 |
|
dy
|
3b3a322168
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 10:14:32 +08:00 |
|
dy
|
d633d52d80
|
造型
|
2023-12-21 10:14:21 +08:00 |
|
dy
|
f52e3ca55c
|
Merge branch 'feature/playerhead' into dev
# Conflicts:
# src/json/playerHead.json
# src/json/tuisonglibao.json
|
2023-12-21 09:53:14 +08:00 |
|
dy
|
dd60fe3bab
|
Merge branch 'bugfix' into dev
|
2023-12-21 09:52:15 +08:00 |
|
dy
|
715f564848
|
造型
|
2023-12-20 21:59:23 +08:00 |
|
dy
|
6cb39ad523
|
消费竞赛limit
|
2023-12-20 21:08:06 +08:00 |
|
dy
|
463c272089
|
Merge branch 'feature/planb' into dev
|
2023-12-20 20:07:22 +08:00 |
|
dy
|
d3ebfdcc02
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 20:07:20 +08:00 |
|
yushunrui
|
abed7be68f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-25 19:33:39 +08:00 |
|
yushunrui
|
772993260e
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-25 19:30:55 +08:00 |
|
dy
|
97d1ddb142
|
破冰
|
2023-12-20 20:06:52 +08:00 |
|
dy
|
fd3c13d2b5
|
消耗竞赛
|
2023-12-20 20:05:40 +08:00 |
|
dy
|
9429dacc63
|
公路狂飙性能优化
|
2023-12-20 19:22:51 +08:00 |
|
dy
|
5f0d645c08
|
Merge branch 'feature/playerhead' into dev
|
2023-12-20 19:18:10 +08:00 |
|
dy
|
48e656e652
|
玩家头像框，造型，头像，对话框增加model解锁配置
|
2023-12-20 19:17:17 +08:00 |
|
yushunrui
|
e1386c698a
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 19:03:41 +08:00 |
|
yushunrui
|
e71c562e08
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 18:56:40 +08:00 |
|
dy
|
6953349058
|
消费竞赛
|
2023-12-20 18:21:43 +08:00 |
|
dy
|
1e46f70cd9
|
Merge branch 'feature/planb' into dev
|
2023-12-20 18:02:39 +08:00 |
|
dy
|
44be68a8ca
|
破冰礼包
|
2023-12-20 18:02:26 +08:00 |
|
dy
|
41799960e0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 17:49:15 +08:00 |
|
dy
|
56aa689a18
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 17:48:53 +08:00 |
|
dy
|
5b4e0cce65
|
消费竞赛
|
2023-12-20 17:48:42 +08:00 |
|
yushunrui
|
e09d057f32
|
fix:圣诞活动新增vip经验任务157
|
2023-12-20 17:47:37 +08:00 |
|
yushunrui
|
fcf79d7df0
|
fix:圣诞活动礼包改成每日重置
|
2023-12-20 17:32:31 +08:00 |
|
yushunrui
|
ec524e1ebd
|
fix:圣诞活动红点报错处理
|
2023-12-20 16:59:16 +08:00 |
|
dy
|
2932cf071b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 16:44:55 +08:00 |
|
dy
|
8df2ccf160
|
Merge branch 'feature/planb' into dev
|
2023-12-20 16:44:44 +08:00 |
|
dy
|
fa88c44593
|
破冰礼包fix
|
2023-12-20 16:44:30 +08:00 |
|
yushunrui
|
c22d471260
|
fix:新增圣诞活动签到也加上经验
|
2023-12-20 16:39:29 +08:00 |
|
yushunrui
|
8a10552203
|
fix:圣诞活动红点
|
2023-12-20 16:17:09 +08:00 |
|
dy
|
2ade418245
|
Merge branch 'feature/xiaofeijingsai' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-20 16:08:20 +08:00 |
|
dy
|
4631cba0b3
|
消费竞赛
|
2023-12-20 16:07:59 +08:00 |
|
xcy
|
d1750bb097
|
fix:
玩家退出公会时gud残留ghid，在登录时检测修复一下
|
2023-12-20 15:42:14 +08:00 |
|
xcy
|
7e24671983
|
fix:
1.下限保底，拉去英雄列表时，检测英雄穿戴的peijian是否存在，不存在就置空
|
2023-12-20 15:18:31 +08:00 |
|
dy
|
47ebe4fe14
|
Merge branch 'feature/pushgift' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-20 14:50:58 +08:00 |
|
dy
|
7488802fd0
|
revert 推送礼包
|
2023-12-20 13:56:20 +08:00 |
|
dy
|
b9db5098cc
|
Merge branch 'feature/planb' into dev
|
2023-12-20 11:28:35 +08:00 |
|
dy
|
1a6789b17b
|
破冰礼包
|
2023-12-20 11:27:25 +08:00 |
|
dy
|
cea27e9ea4
|
Merge branch 'master' into feature/planb
|
2023-12-19 22:31:20 +08:00 |
|
dy
|
5be46475f4
|
Merge branch 'bugfix' into dev
|
2023-12-19 22:20:07 +08:00 |
|
dy
|
6ffe4eba17
|
Merge branch 'master' into bugfix
|
2023-12-19 22:17:37 +08:00 |
|
dy
|
ec68b193a0
|
公路狂飙性能优化
|
2023-12-19 22:06:34 +08:00 |
|
yushunrui
|
b0cc406d43
|
fix:圣诞活动充值不到账
|
2023-12-19 19:35:45 +08:00 |
|
