dy
|
21994f214a
|
元旦fix
|
2023-12-26 16:53:43 +08:00 |
|
dy
|
ae0a5c6882
|
fix元旦
|
2023-12-26 16:33:31 +08:00 |
|
dy
|
bfc9ff369c
|
fix元旦
|
2023-12-26 16:20:59 +08:00 |
|
dy
|
72ff17ba0b
|
元旦活动
|
2023-12-26 15:26:58 +08:00 |
|
|
|
0511ce1727
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:38:44 +08:00 |
|
|
|
884c2570a0
|
fix: 调整锁超时时间
|
2023-12-26 14:34:30 +08:00 |
|
|
|
fb28f2d4e7
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:33:14 +08:00 |
|
|
|
cd2a54e431
|
更换地下擂台功能redis
|
2023-12-26 14:33:04 +08:00 |
|
dy
|
9b6d29ddf2
|
元旦活动,娃娃机
|
2023-12-26 14:30:10 +08:00 |
|
|
|
c0103565a7
|
fix: 调整地下擂台 fight 接口返回的多语言
|
2023-12-26 14:14:15 +08:00 |
|
dy
|
fd035faf86
|
元旦活动
|
2023-12-26 14:04:19 +08:00 |
|
|
|
4a9f5cb02e
|
fix: DldFight 接口添加玩家锁
|
2023-12-26 13:54:49 +08:00 |
|
|
|
2a78f515b1
|
fix: 大乱斗添加积分上限
|
2023-12-26 11:50:17 +08:00 |
|
dy
|
d5ef0b3187
|
yuandan
|
2023-12-26 09:40:15 +08:00 |
|
|
|
bb7495379e
|
去掉所有注释了的G.redis的代码，为全面弃用该redisJson做准备
|
2023-12-25 20:21:46 +08:00 |
|
dy
|
1d6143794c
|
元旦活动
|
2023-12-25 17:13:59 +08:00 |
|
dy
|
88c39187a0
|
商店加入version，当版本不一致时刷新商店内容
|
2023-12-25 13:50:43 +08:00 |
|
dy
|
00804fa8c1
|
init 元旦活动
|
2023-12-25 13:48:18 +08:00 |
|
|
|
c323a9e255
|
fix: 修复抢红包日志列表长度限制未生效的问题
|
2023-12-25 11:06:45 +08:00 |
|
dy
|
14daa94dba
|
fix 黑帮争霸分组定时器
|
2023-12-23 12:30:11 +08:00 |
|
dy
|
077f7a488e
|
Merge branch 'release' into bugfix
# Conflicts:
# src/api_s2c/email/ApiAllRemove.ts
|
2023-12-23 11:46:49 +08:00 |
|
xcy
|
f8298f08e9
|
fix:
修复邮件
|
2023-12-23 01:35:48 +08:00 |
|
xcy
|
862052e827
|
fix:
修复邮件
|
2023-12-23 01:11:45 +08:00 |
|
xcy
|
e49861bcaf
|
fix:
修复邮件
|
2023-12-23 00:46:08 +08:00 |
|
xcy
|
ef6498c0d6
|
fix:
修复邮件
|
2023-12-23 00:44:04 +08:00 |
|
xcy
|
7354ad9ae8
|
Merge remote-tracking branch 'origin/release' into bugfix
|
2023-12-23 00:40:20 +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
|
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
|
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 |
|
dy
|
7fc9b0564f
|
每日礼包领取免费
|
2023-12-22 20:26:25 +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 |
|
dy
|
c3ba3934d4
|
消费竞赛定时器发奖，每天0点5分检测活动 结束
|
2023-12-22 16:49:21 +08:00 |
|
|
|
36b15af077
|
fix: 添加 price 回参表示领取门槛
|
2023-12-22 16:34:54 +08:00 |
|
xcy
|
a2d16fb530
|
fix:
email 过滤 prizelist
|
2023-12-22 16:15:06 +08:00 |
|
xcy
|
753dd8decb
|
fix:
异步查库改为同步插库
|
2023-12-22 16:06:57 +08:00 |
|
|
|
2a492a8919
|
fix: 修复玩家可以重复领取的 bug
|
2023-12-22 14:59:33 +08:00 |
|
xcy
|
6526d386c4
|
feat:
累充礼包
|
2023-12-22 14:33:43 +08:00 |
|
dy
|
445cd60548
|
fix bug 支付、英雄上阵bug
|
2023-12-22 14:07:55 +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 |
|
xcy
|
377b7553e2
|
Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 11:51:18 +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 |
|
|
|
e660adb95c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 10:15:44 +08:00 |
|
|
|
4b190272b1
|
fix: 调整 remaining 计算规则
|
2023-12-22 10:11:24 +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 |
|
|
|
2ae2a1362d
|
feat: 添加炫耀逻辑
|
2023-12-21 20:16:29 +08:00 |
|
|
|
82b4b61725
|
feat: 抢红包分钻石接口 初版
|
2023-12-21 19:52:19 +08:00 |
|
dy
|
5bf5f59bfa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-21 17:49:19 +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
|
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
|
12f6729f4e
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 13:25:18 +08:00 |
|
dy
|
3dff056df6
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 12:37:55 +08:00 |
|
dy
|
3194dc6449
|
造型更换
|
2023-12-21 12:37:39 +08:00 |
|
dy
|
e477b14546
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 11:32:30 +08:00 |
|
dy
|
552da79951
|
用户头像造型修复bug
|
2023-12-21 11:32:15 +08:00 |
|
dy
|
3b3a322168
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 10:14:32 +08:00 |
|
dy
|
d633d52d80
|
造型
|
2023-12-21 10:14:21 +08:00 |
|
dy
|
f52e3ca55c
|
Merge branch 'feature/playerhead' into dev
# Conflicts:
# src/json/playerHead.json
# src/json/tuisonglibao.json
|
2023-12-21 09:53:14 +08:00 |
|
dy
|
dd60fe3bab
|
Merge branch 'bugfix' into dev
|
2023-12-21 09:52:15 +08:00 |
|
dy
|
715f564848
|
造型
|
2023-12-20 21:59:23 +08:00 |
|
dy
|
6cb39ad523
|
消费竞赛limit
|
2023-12-20 21:08:06 +08:00 |
|
dy
|
463c272089
|
Merge branch 'feature/planb' into dev
|
2023-12-20 20:07:22 +08:00 |
|
dy
|
d3ebfdcc02
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 20:07:20 +08:00 |
|
yushunrui
|
abed7be68f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-25 19:33:39 +08:00 |
|
yushunrui
|
772993260e
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-25 19:30:55 +08:00 |
|
dy
|
97d1ddb142
|
破冰
|
2023-12-20 20:06:52 +08:00 |
|
dy
|
fd3c13d2b5
|
消耗竞赛
|
2023-12-20 20:05:40 +08:00 |
|
dy
|
9429dacc63
|
公路狂飙性能优化
|
2023-12-20 19:22:51 +08:00 |
|
dy
|
5f0d645c08
|
Merge branch 'feature/playerhead' into dev
|
2023-12-20 19:18:10 +08:00 |
|
dy
|
48e656e652
|
玩家头像框，造型，头像，对话框增加model解锁配置
|
2023-12-20 19:17:17 +08:00 |
|
yushunrui
|
e1386c698a
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 19:03:41 +08:00 |
|
yushunrui
|
e71c562e08
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 18:56:40 +08:00 |
|
