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 |
|
yushunrui
|
0326ceffd7
|
fix:圣诞任务增加圣诞经验字段
|
2023-12-19 17:38:59 +08:00 |
|
dy
|
94bf56cc9e
|
Merge branch 'feature/json' into release
|
2023-12-19 17:14:00 +08:00 |
|
|
|
58ff276e10
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-19 17:00:42 +08:00 |
|
|
|
11e5f17b20
|
增加gc Test
|
2023-12-19 17:00:25 +08:00 |
|
xcy
|
7ae7349550
|
fix:跨服邮件定时器
|
2023-12-19 16:26:41 +08:00 |
|
dy
|
b84fd92528
|
Merge branch 'bugfix' into release
|
2023-12-19 16:24:37 +08:00 |
|
dy
|
dbda10a17e
|
去掉trace log
|
2023-12-19 16:24:14 +08:00 |
|
dy
|
b1e3c9c488
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-19 15:01:14 +08:00 |
|
dy
|
581022d579
|
Merge branch 'feature/json' into dev
|
2023-12-19 15:01:08 +08:00 |
|
dy
|
19893f8faa
|
Merge branch 'feature/shouchong' into dev
|
2023-12-19 15:01:02 +08:00 |
|
dy
|
6215737571
|
cehua-json
|
2023-12-19 15:00:51 +08:00 |
|
dy
|
1a703f1ecd
|
首充改为直购
|
2023-12-19 14:59:28 +08:00 |
|
xcy
|
1a38710669
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-19 14:43:00 +08:00 |
|
xcy
|
0ceae9c2bb
|
fix:跨服邮件定时器
|
2023-12-19 14:42:51 +08:00 |
|
dy
|
87d5b0902f
|
铁笼死斗，相同积分用战力排名
|
2023-12-19 14:30:01 +08:00 |
|
dy
|
beae71eb7f
|
铁笼死斗，相同积分用战力排名
|
2023-12-19 14:29:14 +08:00 |
|
dy
|
38e04d29ab
|
破冰礼包
|
2023-12-19 13:42:23 +08:00 |
|
dy
|
eb1e346988
|
Merge branch 'dev' into release
|
2023-12-19 10:13:21 +08:00 |
|
xcy
|
d4634f729e
|
fix:跨服邮件定时器
|
2023-12-19 10:12:49 +08:00 |
|
dy
|
d1b9aa476b
|
Merge branch 'dev' into release
# Conflicts:
# src/json/herogrow_ewai.json
# src/json/huodong.json5
# src/json/item.json
# src/json/pay.json
|
2023-12-19 10:10:20 +08:00 |
|
dy
|
83c99c25bd
|
Merge branch 'bugfix' into release
|
2023-12-19 10:08:44 +08:00 |
|
dy
|
c428d0d2f7
|
cehua-json
|
2023-12-19 09:48:43 +08:00 |
|
xcy
|
91f14c69ce
|
fix:红点
|
2023-12-18 21:31:51 +08:00 |
|
