Commit Graph

668 Commits

Author SHA1 Message Date
yushunrui
e71c562e08 fix:圣诞活动修改异步按钮逻辑 2023-12-20 18:56:40 +08:00
dy
6953349058 消费竞赛 2023-12-20 18:21:43 +08:00
dy
1e46f70cd9 Merge branch 'feature/planb' into dev 2023-12-20 18:02:39 +08:00
dy
44be68a8ca 破冰礼包 2023-12-20 18:02:26 +08:00
dy
41799960e0 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 17:49:15 +08:00
dy
56aa689a18 Merge branch 'feature/xiaofeijingsai' into dev 2023-12-20 17:48:53 +08:00
dy
5b4e0cce65 消费竞赛 2023-12-20 17:48:42 +08:00
yushunrui
e09d057f32 fix:圣诞活动新增vip经验任务157 2023-12-20 17:47:37 +08:00
yushunrui
fcf79d7df0 fix:圣诞活动礼包改成每日重置 2023-12-20 17:32:31 +08:00
yushunrui
ec524e1ebd fix:圣诞活动红点报错处理 2023-12-20 16:59:16 +08:00
xcy
dacd312bfe fix:
日常任务初始值问题修复
2023-12-20 16:56:23 +08:00
dy
6d1c58492b Merge branch 'feature/dev-json' into dev 2023-12-20 16:55:29 +08:00
dy
d41cde3297 cehua public json 2023-12-20 16:55:21 +08:00
dy
7ae262ba06 Merge branch 'feature/dev-json' into dev 2023-12-20 16:47:58 +08:00
dy
d3f8d9d9e8 cehua public json 2023-12-20 16:47:39 +08:00
dy
2932cf071b Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 16:44:55 +08:00
dy
8df2ccf160 Merge branch 'feature/planb' into dev 2023-12-20 16:44:44 +08:00
dy
fa88c44593 破冰礼包fix 2023-12-20 16:44:30 +08:00
yushunrui
c22d471260 fix:新增圣诞活动签到也加上经验 2023-12-20 16:39:29 +08:00
xcy
e2d9eea5ed fix:
修复Class_task_134任务监听参数问题导致的报错
2023-12-20 16:31:32 +08:00
yushunrui
16254610b0 fix:新增圣诞活动每日消耗钻石任务类型 2023-12-20 16:25:22 +08:00
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