Commit Graph

430 Commits

Author SHA1 Message Date
dy
0df09e0f9e 娃娃机改为掉落组 2023-12-27 16:33:31 +08:00
dy
d4bd776b48 proto 2023-12-27 11:09:00 +08:00
dy
c3fa18c9b1 proto 2023-12-27 11:08:42 +08:00
dy
34ace42872 proto 2023-12-27 11:03:10 +08:00
dy
1cf4784d42 元旦红点,破冰红点 2023-12-27 11:02:53 +08:00
dy
944ef41d5d 达摩献礼 2023-12-27 09:51:37 +08:00
dy
8503a65c1f yuandan fun 2023-12-26 20:04:05 +08:00
dy
f50f6de933 yuandan 2023-12-26 19:49:46 +08:00
dy
08d0bed291 元旦活动 2023-12-26 17:33:48 +08:00
dy
21994f214a 元旦fix 2023-12-26 16:53:43 +08:00
dy
ae0a5c6882 fix元旦 2023-12-26 16:33:31 +08:00
dy
bfc9ff369c fix元旦 2023-12-26 16:20:59 +08:00
dy
72ff17ba0b 元旦活动 2023-12-26 15:26:58 +08:00
dy
1e90b96c6c huodong json 2023-12-26 15:07:00 +08:00
dy
9b6d29ddf2 元旦活动,娃娃机 2023-12-26 14:30:10 +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
cba4f4563d json 2023-12-25 14:00:30 +08:00
dy
00804fa8c1 init 元旦活动 2023-12-25 13:48:18 +08:00
xcy
f8298f08e9 fix:
修复邮件
2023-12-23 01:35:48 +08:00
xcy
8c0487bd58 Merge remote-tracking branch 'origin/release' into release 2023-12-23 01:11:56 +08:00
xcy
862052e827 fix:
修复邮件
2023-12-23 01:11:45 +08:00
dy
d37774d54f fix:
json配置提交
2023-12-23 01:08:49 +08:00
xcy
e49861bcaf fix:
修复邮件
2023-12-23 00:46:08 +08:00
dy
a242d6a66a fix:
json同步
2023-12-22 23:33:02 +08:00
dy
34b3f84418 proto 2023-12-22 22:58:49 +08:00
dy
7fb7f952c7 Merge branch 'feature/json' into release 2023-12-22 22:56:38 +08:00
dy
4d3377fc3c json 2023-12-22 22:54:36 +08:00
dy
38c1b28f9c Merge remote-tracking branch 'origin/dev-leijichongzhi' into release
# Conflicts:
#	src/api_s2c/hongdian/ApiGet.ts
#	src/api_s2c/pushgift/ApiOpen.ts
#	src/globalListener.ts
#	src/module/collection_event.ts
#	src/public/pushgift.ts
#	src/shared/protocols/hongdian/PtlGet.ts
#	src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:50:59 +08:00
dy
eabcc57242 Merge remote-tracking branch 'origin/dev-meirilibao' into release 2023-12-22 22:43:24 +08:00
dy
5ed699a64a Merge remote-tracking branch 'origin/feature/xiaofeijingsai' into release
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:43:08 +08:00
dy
75e921dbc2 Merge remote-tracking branch 'origin/feature/planb' into release
# Conflicts:
#	src/api_s2c/hongdian/ApiGet.ts
#	src/module/collection_event.ts
#	src/shared/protocols/hongdian/PtlGet.ts
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:42:44 +08:00
dy
466d02221d Merge remote-tracking branch 'origin/feature/pay_for_diamond' into release
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:40:40 +08:00
dy
a4a84aba24 Merge remote-tracking branch 'origin/feature/dadian' into release 2023-12-22 22:40:03 +08:00
xcy
62d954c743 fix:
推送礼包
2023-12-22 22:20:56 +08:00
xcy
474246463c Merge remote-tracking branch 'origin/pushgift' into release
# Conflicts:
#	src/api_s2c/pushgift/ApiOpen.ts
#	src/public/fight.ts
#	src/public/pushgift.ts
#	src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:18:56 +08:00
dy
2c3219918a json 2023-12-22 21:57:22 +08:00
c304a6d8cc fix: 已领取的玩家添加gotAmount 字段 2023-12-22 21:23:13 +08:00
dy
287db25686 json 2023-12-22 20:59:18 +08:00
4a6a40403d fix: canReceive 接口添加玩家领取到的数额 2023-12-22 20:47:52 +08:00
xcy
5a7c645e0f fix:
推送礼包
2023-12-22 20:39:14 +08:00
xcy
ae8da996ae fix:
推送礼包
2023-12-22 20:38:43 +08:00
xcy
58ba7b489d feat:
1.推送礼包

(cherry picked from commit e99b5dad15)
2023-12-22 20:34:51 +08:00
xcy
df641aa69f feat:
1.推送礼包

(cherry picked from commit ef90c131f3)
2023-12-22 20:34:42 +08:00
dy
30a02fbd36 json 2023-12-22 20:33:34 +08:00
dy
7fc9b0564f 每日礼包领取免费 2023-12-22 20:26:25 +08:00
bcca0ebbab fix: 修复最大总额计算错误的 bug 2023-12-22 20:13:18 +08:00
dy
d00cb7895e json 2023-12-22 19:47:15 +08:00