|
|
dec4ce2cc4
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 16:35:25 +08:00 |
|
|
|
36b15af077
|
fix: 添加 price 回参表示领取门槛
|
2023-12-22 16:34:54 +08:00 |
|
xcy
|
efe5bd3216
|
fix:
email 过滤 prizelist
|
2023-12-22 16:15:22 +08:00 |
|
xcy
|
32c779a5a4
|
fix:
异步查库改为同步插库
|
2023-12-22 16:07:15 +08:00 |
|
xcy
|
2720d5e59a
|
fix:
异步查库改为同步插库
|
2023-12-22 16:02:11 +08:00 |
|
dy
|
1ed15d2b5c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 15:01:40 +08:00 |
|
dy
|
7c3da937a5
|
Merge branch 'feature/json' into dev
|
2023-12-22 15:01:30 +08:00 |
|
dy
|
6b80b07cfe
|
json
|
2023-12-22 15:01:23 +08:00 |
|
dy
|
a135acbc93
|
Merge branch 'master' into feature/json
|
2023-12-22 15:00:23 +08:00 |
|
|
|
304a67e56f
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 15:00:20 +08:00 |
|
|
|
2a492a8919
|
fix: 修复玩家可以重复领取的 bug
|
2023-12-22 14:59:33 +08:00 |
|
dy
|
ffbb2b3af3
|
Merge branch 'bugfix' into dev
|
2023-12-22 14:39:25 +08:00 |
|
|
|
7ca6fe75e3
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-22 14:34:18 +08:00 |
|
dy
|
a0bdc11a05
|
Merge remote-tracking branch 'origin/dev-leijichongzhi' into dev
|
2023-12-22 14:34:08 +08:00 |
|
|
|
dda11bb122
|
事件容错处理
|
2023-12-22 14:33:49 +08:00 |
|
dy
|
8710d7d04f
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-22 14:11:02 +08:00 |
|
dy
|
4e435c4ed9
|
Merge branch 'bugfix' into dev
|
2023-12-22 14:08:19 +08:00 |
|
dy
|
445cd60548
|
fix bug 支付、英雄上阵bug
|
2023-12-22 14:07:55 +08:00 |
|
|
|
77f8380080
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 14:05:49 +08:00 |
|
|
|
86910e7ad7
|
debug: 添加玩家领取记录的日志输出
|
2023-12-22 14:05:15 +08:00 |
|
|
|
6154ddbe61
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 13:57:23 +08:00 |
|
|
|
c5817b4acf
|
fix: 添加玩家领取记录的 upsert 选项
|
2023-12-22 13:57:02 +08:00 |
|
|
|
5801423fb7
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 13:40:30 +08:00 |
|
|
|
06062716ef
|
fix: 调整领取时查询的条件表达式
|
2023-12-22 13:40:13 +08:00 |
|
|
|
093de3350f
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 12:13:21 +08:00 |
|
|
|
e0a624adba
|
fix: 添加领取日志信息
|
2023-12-22 12:11:20 +08:00 |
|
xcy
|
bafed44a56
|
feat:
proto
|
2023-12-22 11:57:39 +08:00 |
|
xcy
|
377b7553e2
|
Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 11:51:18 +08:00 |
|
xcy
|
1184b0b6de
|
feat:
脚本
|
2023-12-22 11:50:45 +08:00 |
|
xcy
|
a326ef7d39
|
feat:
脚本
|
2023-12-22 11:49:14 +08:00 |
|
dy
|
6e67ae6441
|
Merge branch 'master' into feature/xiaofeijingsai
|
2023-12-22 11:39:29 +08:00 |
|
dy
|
f17f4182a9
|
消费竞赛定时器
|
2023-12-22 11:39:17 +08:00 |
|
|
|
ce9238ccdb
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 11:31:31 +08:00 |
|
|
|
76a04a34d5
|
fix: 修复 groups 配置取值错误的问题
|
2023-12-22 11:30:54 +08:00 |
|
dy
|
e34a5a635f
|
Merge branch 'master' into dev
|
2023-12-22 11:04:11 +08:00 |
|
|
|
e660adb95c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 10:15:44 +08:00 |
|
|
|
bb60b00d93
|
Merge branch 'feature/json' into dev
|
2023-12-22 10:12:43 +08:00 |
|
|
|
4b190272b1
|
fix: 调整 remaining 计算规则
|
2023-12-22 10:11:24 +08:00 |
|
|
|
3d43fa1a34
|
fix: 更新抢钻石活动的数据结构
|
2023-12-22 10:07:23 +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
|
4a28a86fe2
|
Merge branch 'master' into dev
# Conflicts:
# src/api_s2c/hongdian/fun.ts
|
2023-12-21 22:15:40 +08:00 |
|
dy
|
be5d421393
|
Merge branch 'master' into bugfix
|
2023-12-21 22:14:30 +08:00 |
|
|
|
607d590f2f
|
Merge branch 'feature/json' into dev
|
2023-12-21 21:41:18 +08:00 |
|
|
|
bfb6e4ff4e
|
build: 更新活动配置
|
2023-12-21 21:40:49 +08:00 |
|
xcy
|
c70c154099
|
feat:
累充礼包
|
2023-12-21 21:38:53 +08:00 |
|
|
|
2fc85853dc
|
feat: 充值抢钻石活动
|
2023-12-21 21:14:13 +08:00 |
|
|
|
ba8653dca9
|
fix: 添加领取数额的最大值配置
|
2023-12-21 21:08:22 +08:00 |
|
|
|
6808b53dd4
|
fix: 允许玩家领取到的钻石数小于配置的最低档位额度
|
2023-12-21 20:33:47 +08:00 |
|
