|
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
xcy
|
9f744b7cee
|
Revert "fix:脚本"
This reverts commit 76794921fb.
|
2023-12-18 20:04:35 +08:00 |
|
xcy
|
9523f7c00d
|
fix:
积天好礼bug
|
2023-12-18 20:00:49 +08:00 |
|
|
|
9964e12f80
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-18 19:22:48 +08:00 |
|
|
|
a452f12654
|
分析db find数据
|
2023-12-18 19:22:37 +08:00 |
|
dy
|
a1b7cb1d7c
|
Merge branch 'bugfix' into dev
|
2023-12-18 19:19:13 +08:00 |
|
dy
|
c8d6f7d433
|
修复充值经验任务计算，开服狂欢进度，优化dayPay查询
|
2023-12-18 19:12:51 +08:00 |
|
xcy
|
20bb0c9478
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 18:35:44 +08:00 |
|
xcy
|
76794921fb
|
fix:脚本
|
2023-12-18 18:34:41 +08:00 |
|
|
|
af0225005a
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-18 18:02:15 +08:00 |
|
|
|
3f275e4af4
|
去掉发邮件时的上限判断机制
|
2023-12-18 18:01:55 +08:00 |
|
dy
|
540291696a
|
Merge branch 'dev-meirilibao' into dev
|
2023-12-18 16:51:38 +08:00 |
|
dy
|
d84173b67e
|
每日礼包改版，增加一键购买
|
2023-12-18 16:49:54 +08:00 |
|
yushunrui
|
9882a28090
|
fix:处理圣诞活动免费次数bug
|
2023-12-18 16:16:11 +08:00 |
|
dy
|
a5ad7ee2cf
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-18 15:50:50 +08:00 |
|
dy
|
7ae81dc6f5
|
战力数值计算加上速度倍数
|
2023-12-18 15:50:40 +08:00 |
|
|
|
ea179c2a3c
|
redis优化
|
2023-12-18 15:50:28 +08:00 |
|
yushunrui
|
25a8e15ed3
|
task增加新的任务类型，154是圣诞小游戏挑战 155是每日任务最终宝箱奖励
|
2023-12-18 15:29:48 +08:00 |
|
|
|
dd34a1c3a4
|
equip去redis化
|
2023-12-18 15:27:10 +08:00 |
|
yushunrui
|
89b75bbf2b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 15:02:07 +08:00 |
|
yushunrui
|
30de992a62
|
圣诞活动增加异步按钮
|
2023-12-18 14:58:41 +08:00 |
|
dy
|
b615f5d4fc
|
Merge branch 'dev-json' into dev
|
2023-12-18 14:47:30 +08:00 |
|
dy
|
fdbf22f62f
|
Merge branch 'bugfix' into dev
|
2023-12-18 14:47:13 +08:00 |
|
dy
|
7474b4583f
|
json
|
2023-12-18 14:46:36 +08:00 |
|
|
|
327f9c9b5a
|
全面去掉hero的redis依赖
|
2023-12-18 14:43:13 +08:00 |
|
xcy
|
954c2e8d2e
|
fix:脚本
|
2023-12-18 14:38:26 +08:00 |
|
xcy
|
6809bdc2b3
|
fix:
积天好礼bug
|
2023-12-18 14:29:31 +08:00 |
|
xcy
|
4737f94fcd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 13:51:20 +08:00 |
|
xcy
|
5679361eab
|
fix:
积天好礼bug
|
2023-12-18 13:48:43 +08:00 |
|
dy
|
3cbc09345a
|
策划JSON同步
|
2023-12-18 11:37:23 +08:00 |
|
yushunrui
|
192ee578dc
|
圣诞功能还原版本
|
2023-12-18 11:23:13 +08:00 |
|
dy
|
23f56c3964
|
Merge remote-tracking branch 'origin/dev-tequan' into dev
|
2023-12-18 10:26:31 +08:00 |
|
dy
|
ce11402430
|
Merge branch 'bugfix' into dev
|
2023-12-18 10:06:55 +08:00 |
|
dy
|
2bbfb55704
|
修复矿洞延时接口
|
2023-12-16 11:15:16 +08:00 |
|
dy
|
64f333908d
|
bugfix
|
2023-12-15 22:58:48 +08:00 |
|
dy
|
99500b7bf4
|
干部功能redis直取修复
|
2023-12-15 22:49:54 +08:00 |
|
dy
|
77159cc7e3
|
干部功能redis直取修复
|
2023-12-15 22:48:45 +08:00 |
|
dy
|
ec3f954518
|
fix bug
|
2023-12-15 22:41:20 +08:00 |
|
dy
|
87466c68ad
|
Merge branch 'release' into bugfix
|
2023-12-15 22:38:34 +08:00 |
|
dy
|
5150032d20
|
cehua json
|
2023-12-15 22:32:02 +08:00 |
|
dy
|
5106632893
|
cehua json
|
2023-12-15 22:31:48 +08:00 |
|
dy
|
a550711bbb
|
cehua json
|
2023-12-15 21:16:14 +08:00 |
|
dy
|
2dcb2f2082
|
cehua json
|
2023-12-15 21:15:42 +08:00 |
|
xcy
|
404bb9a7e5
|
fix:
修改伙伴招募的奖励领取条件
|
2023-12-15 21:11:31 +08:00 |
|
dy
|
9d436fd34a
|
Merge remote-tracking branch 'origin/dev-jitianhaoli' into dev
|
2023-12-15 20:21:24 +08:00 |
|
xcy
|
7e775e90e1
|
fix:
修改情报特权
|
2023-12-15 20:06:20 +08:00 |
|
xcy
|
fb6a6dfb38
|
Merge remote-tracking branch 'origin/dev' into dev-shouchong
|
2023-12-15 18:28:50 +08:00 |
|
