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 |
|
dy
|
14effac507
|
Merge branch 'feature/json' into dev
|
2023-12-22 20:33:45 +08:00 |
|
dy
|
30a02fbd36
|
json
|
2023-12-22 20:33:34 +08:00 |
|
dy
|
0850a729ed
|
Merge branch 'dev-meirilibao' into dev
|
2023-12-22 20:26:44 +08:00 |
|
dy
|
7fc9b0564f
|
每日礼包领取免费
|
2023-12-22 20:26:25 +08:00 |
|
|
|
df6927b8ff
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 20:13:43 +08:00 |
|
|
|
bcca0ebbab
|
fix: 修复最大总额计算错误的 bug
|
2023-12-22 20:13:18 +08:00 |
|
xcy
|
76626120c4
|
feat:
累充礼包
|
2023-12-22 20:02:14 +08:00 |
|
xcy
|
372c84fd05
|
feat:
proto
|
2023-12-22 20:00:13 +08:00 |
|
xcy
|
9490faa364
|
fix:
累充礼包
|
2023-12-22 19:52:58 +08:00 |
|
dy
|
9df6e2f19f
|
Merge branch 'feature/json' into dev
|
2023-12-22 19:47:24 +08:00 |
|
dy
|
d00cb7895e
|
json
|
2023-12-22 19:47:15 +08:00 |
|
|
|
243265a49c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 19:27:30 +08:00 |
|
|
|
7eb34f872d
|
fix: 调整可领取红包的判断逻辑
|
2023-12-22 19:26:18 +08:00 |
|
xcy
|
27f2ac75c5
|
fix:
添加接口
|
2023-12-22 19:21:23 +08:00 |
|
xcy
|
506785f360
|
fix:
添加接口
|
2023-12-22 19:20:28 +08:00 |
|
|
|
9d5b36b223
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 19:00:34 +08:00 |
|
|
|
02dccd18a7
|
fix: 修复细节问题
|
2023-12-22 19:00:11 +08:00 |
|
|
|
26a04a778b
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 18:28:45 +08:00 |
|
dy
|
82fd7da144
|
proto
|
2023-12-22 18:27:57 +08:00 |
|
|
|
40774138d2
|
fix: 将活动改为跨服活动
|
2023-12-22 18:27:46 +08:00 |
|
dy
|
511a663e6b
|
Merge branch 'feature/dadian' into dev
|
2023-12-22 18:18:29 +08:00 |
|
dy
|
7f60477a86
|
游戏内打点
|
2023-12-22 18:18:10 +08:00 |
|
xcy
|
4c9ad23bc1
|
fix:
添加接口
|
2023-12-22 18:04:56 +08:00 |
|
dy
|
2d9d577f8b
|
Merge branch 'feature/json' into dev
|
2023-12-22 18:01:45 +08:00 |
|
dy
|
acbf8a6ec6
|
json
|
2023-12-22 17:57:50 +08:00 |
|
