Commit Graph

647 Commits

Author SHA1 Message Date
yushunrui
8a10552203 fix:圣诞活动红点 2023-12-20 16:17:09 +08:00
dy
88aa94bc09 proto 2023-12-20 16:08:52 +08:00
dy
2ade418245 Merge branch 'feature/xiaofeijingsai' into dev
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-20 16:08:20 +08:00
dy
4631cba0b3 消费竞赛 2023-12-20 16:07:59 +08:00
xcy
c613cb4e53 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 15:42:21 +08:00
xcy
d1750bb097 fix:
玩家退出公会时gud残留ghid,在登录时检测修复一下
2023-12-20 15:42:14 +08:00
dy
d0a80a4c73 Merge branch 'bugfix' into dev 2023-12-20 15:41:53 +08:00
dy
88a3c51e9d package 2023-12-20 15:33:25 +08:00
dy
7bf1595149 package 2023-12-20 15:27:31 +08:00
xcy
b2ef913c26 feat:
脚本文件
2023-12-20 15:20:38 +08:00
xcy
276ca85bc3 feat:
脚本文件
2023-12-20 15:20:16 +08:00
xcy
fb7684326e feat:
在临时停服执行脚本时,可以使用这个方案
2023-12-20 15:19:45 +08:00
xcy
7e24671983 fix:
1.下限保底,拉去英雄列表时,检测英雄穿戴的peijian是否存在,不存在就置空
2023-12-20 15:18:31 +08:00
dy
8247613c27 proto 2023-12-20 14:52:02 +08:00
dy
47ebe4fe14 Merge branch 'feature/pushgift' into dev
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-20 14:50:58 +08:00
3c84f4092a 王者荣耀性能优化 2023-12-20 14:14:52 +08:00
0b9da72279 增加gc Test 2023-12-20 14:14:42 +08:00
dy
105af9bbc7 revert 推送礼包 2023-12-20 13:59:38 +08:00
dy
a113f4c461 Revert "Revert "feat:""
This reverts commit c282ece109.
2023-12-20 13:56:45 +08:00
dy
146f5a1daa Revert "Revert "feat:""
This reverts commit ce5836be83.
2023-12-20 13:56:24 +08:00
dy
7488802fd0 revert 推送礼包 2023-12-20 13:56:20 +08:00
47769ab6bf Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-20 12:30:41 +08:00
b77f97c740 王者荣耀性能优化 2023-12-20 12:29:19 +08:00
dy
b9db5098cc Merge branch 'feature/planb' into dev 2023-12-20 11:28:35 +08:00
dy
1a6789b17b 破冰礼包 2023-12-20 11:27:25 +08:00
dy
0ba9688238 Merge remote-tracking branch 'origin/master-cross-emial' into release 2023-12-19 22:32:18 +08:00
dy
cea27e9ea4 Merge branch 'master' into feature/planb 2023-12-19 22:31:20 +08:00
xcy
24ca69bc08 fix:修复开服删除邮件 2023-12-19 22:30:01 +08:00
dy
5be46475f4 Merge branch 'bugfix' into dev 2023-12-19 22:20:07 +08:00
dy
ac8994c2ba Merge branch 'master' into dev 2023-12-19 22:19:53 +08:00
dy
6ffe4eba17 Merge branch 'master' into bugfix 2023-12-19 22:17:37 +08:00
dy
ec68b193a0 公路狂飙性能优化 2023-12-19 22:06:34 +08:00
dy
145c1ef8fe Merge branch 'feature/json' into release 2023-12-19 20:39:24 +08:00
yushunrui
b0cc406d43 fix:圣诞活动充值不到账 2023-12-19 19:35:45 +08:00
dy
9844a5323a Merge branch 'dev-tequan' into release 2023-12-19 19:27:54 +08:00
xcy
c75f14d88e fix:作战特权增加免费快速探险次数2->5 2023-12-19 19:12:01 +08:00
xcy
a969fb65df fix:伙伴招募 2023-12-19 19:11:54 +08:00
xcy
4bdee9fc7c fix:伙伴招募 2023-12-19 19:11:08 +08:00
xcy
eb7c4204b8 fix:作战特权增加免费快速探险次数2->5 2023-12-19 19:03:29 +08:00
xcy
8d765e5027 fix:伙伴招募修改条件至尊月卡 2023-12-19 19:00:42 +08:00
xcy
5969e32323 fix:伙伴招募修改条件至尊月卡 2023-12-19 19:00:11 +08:00
dy
2262d86d18 Merge branch 'feature/json' into dev 2023-12-19 18:46:39 +08:00
dy
36f233d6c4 cehua json 2023-12-19 18:46:28 +08:00
dy
3b12f760e1 Merge branch 'dev-tequan' into dev 2023-12-19 18:40:10 +08:00
dy
9257595264 Merge branch 'dev-tequan' into release 2023-12-19 18:39:27 +08:00
xcy
8b157a047a fix:伙伴招募修改条件至尊月卡 2023-12-19 18:38:42 +08:00
dy
4c33bad9fb Merge branch 'bugfix' into dev 2023-12-19 18:12:14 +08:00
dy
5c6e403e19 Merge branch 'release' into bugfix 2023-12-19 18:01:22 +08:00
xcy
070edf1cb5 fix:
修改伙伴招募的奖励领取条件
2023-12-19 18:00:29 +08:00
xcy
db2286509c fix:
修改情报特权
2023-12-19 18:00:02 +08:00