dy
|
000de548c0
|
fix userpin
|
2023-12-29 16:26:10 +08:00 |
|
dy
|
d5d5d72bad
|
元旦活动
|
2023-12-29 16:21:40 +08:00 |
|
dy
|
7676fc3142
|
Revert "回滚公用方法"
This reverts commit 89af066d12.
|
2023-12-29 01:19:47 +08:00 |
|
dy
|
2af3bf426b
|
Merge branch 'master' into bugfix
|
2023-12-29 01:19:16 +08:00 |
|
dy
|
89af066d12
|
回滚公用方法
|
2023-12-29 01:07:27 +08:00 |
|
dy
|
9d9c37714b
|
Merge branch 'bugfix' into release
|
2023-12-28 16:13:54 +08:00 |
|
dy
|
4e19dc21a1
|
fix聊天禁言，英雄阵形战力计算
|
2023-12-28 14:18:26 +08:00 |
|
dy
|
07fa117614
|
fix公共方法 random
|
2023-12-28 13:39:28 +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 |
|
dy
|
7c83a8bbe8
|
娃娃机改为掉落组
|
2023-12-27 16:41:22 +08:00 |
|
dy
|
0df09e0f9e
|
娃娃机改为掉落组
|
2023-12-27 16:33:31 +08:00 |
|
dy
|
bdb83f9da7
|
英雄爆伤限制为最大值1000%
|
2023-12-27 16:00:43 +08:00 |
|
dy
|
b821afc6b0
|
修复配件套装战力计算
|
2023-12-27 15:47:44 +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
|
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
|
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
|
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
|
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
|
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
|
e269b1412a
|
类型报错
|
2023-12-22 21:27:44 +08:00 |
|
|
|
c304a6d8cc
|
fix: 已领取的玩家添加gotAmount 字段
|
2023-12-22 21:23:13 +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 |
|
|
|
02dccd18a7
|
fix: 修复细节问题
|
2023-12-22 19:00:11 +08:00 |
|
|
|
40774138d2
|
fix: 将活动改为跨服活动
|
2023-12-22 18:27:46 +08:00 |
|
dy
|
7f60477a86
|
游戏内打点
|
2023-12-22 18:18:10 +08:00 |
|
xcy
|
4c9ad23bc1
|
fix:
添加接口
|
2023-12-22 18:04:56 +08:00 |
|
|
|
eed6dd1b8f
|
fix: 添加红点及玩家发奖
|
2023-12-22 17:06:19 +08:00 |
|
|
|
36b15af077
|
fix: 添加 price 回参表示领取门槛
|
2023-12-22 16:34:54 +08:00 |
|
