Commit Graph

206 Commits

Author SHA1 Message Date
dy
2f9483725d 头像脚本 2023-12-21 14:46:25 +08:00
dy
54c483bed0 造型更换bug 2023-12-21 12:43:25 +08:00
dy
3194dc6449 造型更换 2023-12-21 12:37:39 +08:00
dy
4ceaeb8a5e 用户头像造型修复bug 2023-12-21 11:36:53 +08:00
dy
552da79951 用户头像造型修复bug 2023-12-21 11:32:15 +08:00
dy
d633d52d80 造型 2023-12-21 10:14:21 +08:00
dy
715f564848 造型 2023-12-20 21:59:23 +08:00
dy
48e656e652 玩家头像框,造型,头像,对话框增加model解锁配置 2023-12-20 19:17:17 +08:00
dy
0ba9688238 Merge remote-tracking branch 'origin/master-cross-emial' into release 2023-12-19 22:32:18 +08:00
xcy
24ca69bc08 fix:修复开服删除邮件 2023-12-19 22:30:01 +08:00
dy
145c1ef8fe Merge branch 'feature/json' into release 2023-12-19 20:39:24 +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
5969e32323 fix:伙伴招募修改条件至尊月卡 2023-12-19 19:00:11 +08:00
dy
36f233d6c4 cehua json 2023-12-19 18:46:28 +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
xcy
070edf1cb5 fix:
修改伙伴招募的奖励领取条件
2023-12-19 18:00:29 +08:00
xcy
db2286509c fix:
修改情报特权
2023-12-19 18:00:02 +08:00
dy
94bf56cc9e Merge branch 'feature/json' into release 2023-12-19 17:14:00 +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
6215737571 cehua-json 2023-12-19 15:00:51 +08:00
dy
1a703f1ecd 首充改为直购 2023-12-19 14:59:28 +08:00
dy
87d5b0902f 铁笼死斗,相同积分用战力排名 2023-12-19 14:30:01 +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
xcy
0ac5246d5b fix:
积天好礼bug
2023-12-18 21:22:01 +08:00
xcy
3cce7bbfc7 fix:
过滤没有充值得payid
2023-12-18 21:22:01 +08:00
xcy
7e063ef72b fix:
协议
2023-12-18 21:22:00 +08:00
xcy
50087cd543 fix:
十五天累计充值
2023-12-18 21:21:35 +08:00
1463aa239f Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-18 21:18:50 +08:00
xcy
d2ce3dd143 Merge branch 'dev-jitianhaoli' into dev
# Conflicts:
#	src/api_s2c/event/shiwuleichong/ApiOpen.ts
2023-12-18 21:18:10 +08:00
724f91fc36 公会战力优化 2023-12-18 21:17:30 +08:00
xcy
3b49056a60 fix:脚本 2023-12-18 20:30:22 +08:00
dy
203e8ee297 trace log 2023-12-18 20:20:01 +08:00
xcy
79fcc6ec85 Revert "feat: 1.推送礼包"
This reverts commit 5d9ece05
2023-12-18 20:09:56 +08:00
xcy
ce5836be83 Revert "feat:"
This reverts commit ef90c131f3.
2023-12-18 20:08:30 +08:00
xcy
c282ece109 Revert "feat:"
This reverts commit e99b5dad15.
2023-12-18 20:08:27 +08:00
xcy
cddda8288e Revert "fix bug"
This reverts commit 0b18e39dd7.
2023-12-18 20:06:54 +08:00
xcy
fe898ca42c Revert "fix:"
This reverts commit 4fc0da4a70.
2023-12-18 20:06:40 +08:00
xcy
893008c1e7 Revert "fix:"
This reverts commit d060004609.
2023-12-18 20:06:33 +08:00
xcy
fa7fbbfdd0 Revert "fix:"
This reverts commit a6fb04ce58.
2023-12-18 20:05:46 +08:00
xcy
10c54fce47 Revert "fix:"
This reverts commit 00f829c48c.
2023-12-18 20:05:40 +08:00
xcy
b2c0d754a1 Revert "fix:"
This reverts commit 14ab1d45b8.
2023-12-18 20:05:32 +08:00