Commit Graph

64 Commits

Author SHA1 Message Date
xichaoyin
3b3d61795e Merge remote-tracking branch 'origin/feature/weiwang' into release 2024-01-04 22:30:14 +08:00
xichaoyin
42601c29fd fix:
修改gud中weiwang字段为weiwangbuff
2024-01-04 17:17:10 +08:00
dy
65d306227b 领奖,红点 2024-01-04 16:56:33 +08:00
xichaoyin
2e054daa65 fix:
修复威望系统属性在探险战斗中没有生效
2024-01-04 16:12:55 +08:00
dy
f1dacd19b6 破冰礼包增加轮次,修复bug 2024-01-04 16:05:52 +08:00
xichaoyin
77e06ba769 feat:
威望系统
2024-01-02 15:23:39 +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
dy
6fd4e79fbe 累计充值 2023-12-30 16:32:26 +08:00
dy
000de548c0 fix userpin 2023-12-29 16:26:10 +08:00
dy
9d9c37714b Merge branch 'bugfix' into release 2023-12-28 16:13:54 +08:00
dy
e098e41885 paylog增加args记录 2023-12-28 10:05:52 +08:00
dy
82d323d5c8 Merge branch 'feature/yuandan' into release
# Conflicts:
#	src/public/pay.ts
2023-12-27 20:20:01 +08:00
dy
53a2becac5 娃娃机改为掉落组 2023-12-27 16:53:33 +08:00
xcy
686f1fafc6 fix:
丛林猎手优化
2023-12-31 14:18:57 +08:00
dy
7c83a8bbe8 娃娃机改为掉落组 2023-12-27 16:41:22 +08:00
dy
0df09e0f9e 娃娃机改为掉落组 2023-12-27 16:33:31 +08:00
dy
d4bd776b48 proto 2023-12-27 11:09:00 +08:00
dy
34ace42872 proto 2023-12-27 11:03:10 +08:00
dy
1cf4784d42 元旦红点,破冰红点 2023-12-27 11:02:53 +08:00
dy
f9989cf002 自选礼包 2023-12-27 10:17:38 +08:00
dy
f50f6de933 yuandan 2023-12-26 19:49:46 +08:00
dy
08d0bed291 元旦活动 2023-12-26 17:33:48 +08:00
dy
bfc9ff369c fix元旦 2023-12-26 16:20:59 +08:00
dy
72ff17ba0b 元旦活动 2023-12-26 15:26:58 +08:00
dy
fd035faf86 元旦活动 2023-12-26 14:04:19 +08:00
dy
d5ef0b3187 yuandan 2023-12-26 09:40:15 +08:00
dy
5486c2adf7 json 2023-12-25 18:03:15 +08:00
dy
1d6143794c 元旦活动 2023-12-25 17:13:59 +08:00
dy
00804fa8c1 init 元旦活动 2023-12-25 13:48:18 +08:00
xcy
7354ad9ae8 Merge remote-tracking branch 'origin/release' into bugfix 2023-12-23 00:40:20 +08:00
dy
34b3f84418 proto 2023-12-22 22:58:49 +08:00
dy
e269b1412a 类型报错 2023-12-22 21:27:44 +08:00
xcy
bafed44a56 feat:
proto
2023-12-22 11:57:39 +08:00
2fc85853dc feat: 充值抢钻石活动 2023-12-21 21:14:13 +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
d3ebfdcc02 Merge branch 'feature/xiaofeijingsai' into dev 2023-12-20 20:07:20 +08:00
dy
fd3c13d2b5 消耗竞赛 2023-12-20 20:05:40 +08:00
dy
88aa94bc09 proto 2023-12-20 16:08:52 +08:00
dy
4631cba0b3 消费竞赛 2023-12-20 16:07:59 +08:00
dy
8247613c27 proto 2023-12-20 14:52:02 +08:00
dy
105af9bbc7 revert 推送礼包 2023-12-20 13:59:38 +08:00
dy
1a703f1ecd 首充改为直购 2023-12-19 14:59:28 +08:00
xcy
91f14c69ce fix:红点 2023-12-18 21:31:51 +08:00
xcy
7e063ef72b fix:
协议
2023-12-18 21:22:00 +08:00
xcy
50087cd543 fix:
十五天累计充值
2023-12-18 21:21:35 +08:00
xcy
79fcc6ec85 Revert "feat: 1.推送礼包"
This reverts commit 5d9ece05
2023-12-18 20:09:56 +08:00
xcy
893008c1e7 Revert "fix:"
This reverts commit d060004609.
2023-12-18 20:06:33 +08:00
xcy
10c54fce47 Revert "fix:"
This reverts commit 00f829c48c.
2023-12-18 20:05:40 +08:00