Commit Graph

324 Commits

Author SHA1 Message Date
dy
1090852522 修复玩家出现的饰品和配件数据错误导致的进不去游戏 2023-12-31 15:21:41 +08:00
dy
09b74e3490 黑帮争霸刷新玩家数据 2023-12-31 14:26:40 +08:00
dy
ec1b76ed5f 竞技场检测头像框是否激活 2023-12-31 13:43:47 +08:00
dy
a84f20361f 累充 2023-12-31 11:45:44 +08:00
dy
f3ec6df093 消费竞赛 2023-12-31 11:24:38 +08:00
dy
96675a9ff1 累计充值 2023-12-31 09:48:26 +08:00
dy
6fd4e79fbe 累计充值 2023-12-30 16:32:26 +08:00
dy
6fae6cd61e 破冰礼包 2023-12-30 16:07:54 +08:00
dy
d03d8a8399 增加字段 2023-12-30 10:42:24 +08:00
dy
65417fb8bd fix数据刷新 2023-12-30 10:26:24 +08:00
xcy
e496b3fefb fix:
开服竞赛排行榜问题
2023-12-29 18:43:25 +08:00
dy
ecc116bfa1 fix 消费竞赛 2023-12-29 17:25:34 +08:00
dy
000de548c0 fix userpin 2023-12-29 16:26:10 +08:00
dy
d5d5d72bad 元旦活动 2023-12-29 16:21:40 +08:00
dy
aa671a332b fix 配件 2023-12-29 15:24:44 +08:00
dy
b56a0c4591 fix 配件 2023-12-29 15:19:43 +08:00
dy
bf39147538 Revert "fix 红点"
This reverts commit e9a27e135e.
2023-12-29 15:19:19 +08:00
dy
e9a27e135e fix 红点 2023-12-29 14:22:08 +08:00
dy
f9deacd411 fix 重大bug 2023-12-29 13:51:55 +08:00
dy
9d9c37714b Merge branch 'bugfix' into release 2023-12-28 16:13:54 +08:00
dy
4343d50f7c Merge branch 'feature/yuandan' into release 2023-12-28 15:17:35 +08:00
dy
847a1d03e9 注释 2023-12-28 15:14:42 +08:00
dy
1412da00ae Merge remote-tracking branch 'origin/bugfix' into bugfix 2023-12-28 14:18:33 +08:00
dy
4e19dc21a1 fix聊天禁言,英雄阵形战力计算 2023-12-28 14:18:26 +08:00
xcy
27d7a56d10 累计充值累计金额修改为累计vip经验(金额*10) 2023-12-28 13:44:35 +08:00
Your Name
4fc0aa8576 fix:
修复悬赏任务一键领取3倍奖励逻辑错误
2023-12-28 11:11:13 +08:00
Your Name
47b1fe4d22 fix:修复悬赏任务一键领取特权问题 2023-12-28 10:08:19 +08:00
xcy
0e93358e74 fix:
丛林猎手优化
2023-12-28 00:02:12 +08:00
dy
7b5c470f52 fix 红点 2023-12-27 22:31:09 +08:00
dy
757f1ba4b8 Merge branch 'feature/xiaofeijingsai' into release 2023-12-27 21:06:44 +08:00
dy
722e92a54b 消费竞赛 2023-12-27 21:05:53 +08:00
dy
47f16b583a Merge branch 'feature/xiaofeijingsai' into release 2023-12-27 20:20:23 +08:00
dy
82d323d5c8 Merge branch 'feature/yuandan' into release
# Conflicts:
#	src/public/pay.ts
2023-12-27 20:20:01 +08:00
dy
12300703b5 每日刷新付费礼包 2023-12-27 20:09:59 +08:00
dy
add9c7c562 fix 元旦任务 2023-12-27 19:49:33 +08:00
dy
837e9b58c8 fix 元旦红点 2023-12-27 18:50:36 +08:00
dy
3c034fb296 每10分钟刷新排行榜前一千名玩家的用户数据 2023-12-27 17:53:32 +08:00
dy
53a2becac5 娃娃机改为掉落组 2023-12-27 16:53:33 +08:00
xcy
e00e9c4dfc fix:
丛林狩猎优化
2023-12-27 16:42:46 +08:00
xcy
686f1fafc6 fix:
丛林猎手优化
2023-12-31 14:18:57 +08:00
dy
7c83a8bbe8 娃娃机改为掉落组 2023-12-27 16:41:22 +08:00
dy
0df09e0f9e 娃娃机改为掉落组 2023-12-27 16:33:31 +08:00
dy
6089ad5dd2 增加抓娃娃的任务类型,userPing同步玩家钻石金币 2023-12-27 15:06:22 +08:00
dy
b578bb0db0 消费竞赛改为跨服活动 2023-12-27 14:17:10 +08:00
dy
1cf4784d42 元旦红点,破冰红点 2023-12-27 11:02:53 +08:00
dy
4538c0dc16 自选礼包红点 2023-12-27 10:23:12 +08:00
dy
f9989cf002 自选礼包 2023-12-27 10:17:38 +08:00
dy
944ef41d5d 达摩献礼 2023-12-27 09:51:37 +08:00
dy
8503a65c1f yuandan fun 2023-12-26 20:04:05 +08:00
dy
f50f6de933 yuandan 2023-12-26 19:49:46 +08:00
dy
08d0bed291 元旦活动 2023-12-26 17:33:48 +08:00
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