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 |
|
xcy
|
df641aa69f
|
feat:
1.推送礼包
(cherry picked from commit ef90c131f3)
|
2023-12-22 20:34:42 +08:00 |
|
yushunrui
|
48038d1b07
|
fix:圣诞活动新增vip经验任务157
|
2023-12-21 16:42:41 +08:00 |
|
yushunrui
|
4e74b001b5
|
fix:新增圣诞活动每日消耗钻石任务类型
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
1b222a9fc6
|
fix:圣诞活动充值不到账
|
2023-12-21 16:41:32 +08:00 |
|
xcy
|
ce5836be83
|
Revert "feat:"
This reverts commit ef90c131f3.
|
2023-12-18 20:08:30 +08:00 |
|
yushunrui
|
25a8e15ed3
|
task增加新的任务类型，154是圣诞小游戏挑战 155是每日任务最终宝箱奖励
|
2023-12-18 15:29:48 +08:00 |
|
xcy
|
ef90c131f3
|
feat:
1.推送礼包
|
2023-12-14 20:57:15 +08:00 |
|
yushunrui
|
582ac4f7e3
|
更新圣诞活动相关代码
|
2023-12-16 19:05:37 +08:00 |
|
dy
|
ab8404ef62
|
周末礼包
|
2023-12-14 17:01:39 +08:00 |
|
dy
|
aefd1d0052
|
init
|
2023-12-13 20:51:17 +08:00 |
|
DESKTOP-15R5JU0\legu
|
97e070ea81
|
init
|
2023-11-17 12:02:12 +08:00 |
|