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 |
|
|
|
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 |
|
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 |
|
|
|
bcca0ebbab
|
fix: 修复最大总额计算错误的 bug
|
2023-12-22 20:13:18 +08:00 |
|
|
|
7eb34f872d
|
fix: 调整可领取红包的判断逻辑
|
2023-12-22 19:26:18 +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 |
|
xcy
|
753dd8decb
|
fix:
异步查库改为同步插库
|
2023-12-22 16:06:57 +08:00 |
|
xcy
|
791dbc5472
|
fix:
异步查库改为同步插库
|
2023-12-22 16:00:23 +08:00 |
|
|
|
2a492a8919
|
fix: 修复玩家可以重复领取的 bug
|
2023-12-22 14:59:33 +08:00 |
|
|
|
86910e7ad7
|
debug: 添加玩家领取记录的日志输出
|
2023-12-22 14:05:15 +08:00 |
|
|
|
c5817b4acf
|
fix: 添加玩家领取记录的 upsert 选项
|
2023-12-22 13:57:02 +08:00 |
|
|
|
06062716ef
|
fix: 调整领取时查询的条件表达式
|
2023-12-22 13:40:13 +08:00 |
|
|
|
e0a624adba
|
fix: 添加领取日志信息
|
2023-12-22 12:11:20 +08:00 |
|
|
|
76a04a34d5
|
fix: 修复 groups 配置取值错误的问题
|
2023-12-22 11:30:54 +08:00 |
|
|
|
4b190272b1
|
fix: 调整 remaining 计算规则
|
2023-12-22 10:11:24 +08:00 |
|
dy
|
ba2c49868f
|
fix pay
|
2023-12-22 00:22:54 +08:00 |
|
dy
|
c695388208
|
fix pay
|
2023-12-21 23:51:03 +08:00 |
|
dy
|
50c52556e0
|
fix pay
|
2023-12-21 23:40:41 +08:00 |
|
dy
|
be5d421393
|
Merge branch 'master' into bugfix
|
2023-12-21 22:14:30 +08:00 |
|
|
|
ba8653dca9
|
fix: 添加领取数额的最大值配置
|
2023-12-21 21:08:22 +08:00 |
|
|
|
6808b53dd4
|
fix: 允许玩家领取到的钻石数小于配置的最低档位额度
|
2023-12-21 20:33:47 +08:00 |
|
|
|
2ae2a1362d
|
feat: 添加炫耀逻辑
|
2023-12-21 20:16:29 +08:00 |
|
|
|
82b4b61725
|
feat: 抢红包分钻石接口 初版
|
2023-12-21 19:52:19 +08:00 |
|
dy
|
720d89e988
|
主角皮肤计算属性
|
2023-12-21 17:33:31 +08:00 |
|
yushunrui
|
4690254453
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:43 +08:00 |
|
yushunrui
|
f1a4daece3
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
05368fc0de
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
48038d1b07
|
fix:圣诞活动新增vip经验任务157
|
2023-12-21 16:42:41 +08:00 |
|
yushunrui
|
ad439d0b14
|
fix:圣诞活动礼包改成每日重置
|
2023-12-21 16:42:40 +08:00 |
|
yushunrui
|
1d7b1a4f58
|
fix:圣诞活动红点报错处理
|
2023-12-21 16:42:40 +08:00 |
|
yushunrui
|
5ec8b60e99
|
fix:新增圣诞活动签到也加上经验
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
4e74b001b5
|
fix:新增圣诞活动每日消耗钻石任务类型
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
ec3d872390
|
fix:圣诞活动红点
|
2023-12-21 16:42:38 +08:00 |
|
yushunrui
|
1b222a9fc6
|
fix:圣诞活动充值不到账
|
2023-12-21 16:41:32 +08:00 |
|
yushunrui
|
80908e5a46
|
fix:圣诞任务增加圣诞经验字段
|
2023-12-21 16:41:31 +08:00 |
|
dy
|
0cc3d1c031
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 16:29:11 +08:00 |
|
dy
|
b38fc4f21f
|
fix use item model
|
2023-12-21 16:10:37 +08:00 |
|
