dy
|
3b12f760e1
|
Merge branch 'dev-tequan' into dev
|
2023-12-19 18:40:10 +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
|
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 |
|
xcy
|
e57fad35d8
|
Revert "fix:"
This reverts commit 7e775e90e1.
|
2023-12-18 20:05:26 +08:00 |
|
xcy
|
28e4aca1f2
|
Revert "fix:"
This reverts commit 404bb9a7e5.
|
2023-12-18 20:04:52 +08:00 |
|
xcy
|
c8751956ef
|
Revert "fix:"
This reverts commit 5679361eab.
|
2023-12-18 20:04:48 +08:00 |
|
xcy
|
e89d7a91c1
|
Revert "fix:脚本"
This reverts commit 954c2e8d2e.
|
2023-12-18 20:04:41 +08:00 |
|
