|
|
dd2962a80e
|
清理redis
|
2023-12-25 14:32:52 +08:00 |
|
dy
|
cba4f4563d
|
json
|
2023-12-25 14:00:30 +08:00 |
|
dy
|
bb15e64d6d
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-25 13:51:09 +08:00 |
|
|
|
a0d4c911d8
|
设置允许装饰器
|
2023-12-25 13:51:05 +08:00 |
|
dy
|
a4d7fb7909
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-25 13:50:53 +08:00 |
|
dy
|
88c39187a0
|
商店加入version，当版本不一致时刷新商店内容
|
2023-12-25 13:50:43 +08:00 |
|
|
|
43f640595b
|
脚本模板
|
2023-12-25 13:50:28 +08:00 |
|
dy
|
00804fa8c1
|
init 元旦活动
|
2023-12-25 13:48:18 +08:00 |
|
|
|
3346957b5a
|
Merge branch 'bugfix' into dev
|
2023-12-25 11:23:03 +08:00 |
|
|
|
c323a9e255
|
fix: 修复抢红包日志列表长度限制未生效的问题
|
2023-12-25 11:06:45 +08:00 |
|
dy
|
14daa94dba
|
fix 黑帮争霸分组定时器
|
2023-12-23 12:30:11 +08:00 |
|
dy
|
6fd4f83882
|
proto
|
2023-12-23 11:49:30 +08:00 |
|
dy
|
8c3907c370
|
Merge branch 'master' into dev
# Conflicts:
# src/shared/protocols/hongdian/PtlGet.ts
# src/shared/protocols/pushgift/PtlItemNoEnough.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-23 11:48:20 +08:00 |
|
dy
|
077f7a488e
|
Merge branch 'release' into bugfix
# Conflicts:
# src/api_s2c/email/ApiAllRemove.ts
|
2023-12-23 11:46:49 +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 |
|
xcy
|
ef6498c0d6
|
fix:
修复邮件
|
2023-12-23 00:44:04 +08:00 |
|
xcy
|
7354ad9ae8
|
Merge remote-tracking branch 'origin/release' into bugfix
|
2023-12-23 00:40:20 +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
|
712c85ff64
|
Merge branch 'feature/json' into dev
|
2023-12-22 21:58:20 +08:00 |
|
dy
|
2c3219918a
|
json
|
2023-12-22 21:57:22 +08:00 |
|
dy
|
5eee059c1e
|
Merge branch 'bugfix' into dev
|
2023-12-22 21:28:08 +08:00 |
|
dy
|
e269b1412a
|
类型报错
|
2023-12-22 21:27:44 +08:00 |
|
|
|
976f4b7f36
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 21:23:48 +08:00 |
|
|
|
c304a6d8cc
|
fix: 已领取的玩家添加gotAmount 字段
|
2023-12-22 21:23:13 +08:00 |
|
dy
|
aaf133d37f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 20:59:37 +08:00 |
|
dy
|
9579cb2b4d
|
Merge branch 'feature/json' into dev
|
2023-12-22 20:59:28 +08:00 |
|
dy
|
287db25686
|
json
|
2023-12-22 20:59:18 +08:00 |
|
|
|
fff54f4097
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 20:48:21 +08:00 |
|
|
|
4a6a40403d
|
fix: canReceive 接口添加玩家领取到的数额
|
2023-12-22 20:47:52 +08:00 |
|
xcy
|
7babb93e10
|
fix:
推送礼包
|
2023-12-22 20:39:37 +08:00 |
|
xcy
|
159e5578d7
|
fix:
推送礼包
|
2023-12-22 20:39:36 +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 |
|
