xcy
|
1184b0b6de
|
feat:
脚本
|
2023-12-22 11:50:45 +08:00 |
|
xcy
|
a326ef7d39
|
feat:
脚本
|
2023-12-22 11:49:14 +08:00 |
|
dy
|
6e67ae6441
|
Merge branch 'master' into feature/xiaofeijingsai
|
2023-12-22 11:39:29 +08:00 |
|
dy
|
f17f4182a9
|
消费竞赛定时器
|
2023-12-22 11:39:17 +08:00 |
|
|
|
ce9238ccdb
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 11:31:31 +08:00 |
|
|
|
76a04a34d5
|
fix: 修复 groups 配置取值错误的问题
|
2023-12-22 11:30:54 +08:00 |
|
dy
|
e34a5a635f
|
Merge branch 'master' into dev
|
2023-12-22 11:04:11 +08:00 |
|
|
|
e660adb95c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 10:15:44 +08:00 |
|
|
|
bb60b00d93
|
Merge branch 'feature/json' into dev
|
2023-12-22 10:12:43 +08:00 |
|
|
|
4b190272b1
|
fix: 调整 remaining 计算规则
|
2023-12-22 10:11:24 +08:00 |
|
|
|
3d43fa1a34
|
fix: 更新抢钻石活动的数据结构
|
2023-12-22 10:07:23 +08:00 |
|
dy
|
ba2c49868f
|
fix pay
|
2023-12-22 00:22:54 +08:00 |
|
dy
|
c695388208
|
fix pay
|
2023-12-21 23:51:03 +08:00 |
|
dy
|
50c52556e0
|
fix pay
|
2023-12-21 23:40:41 +08:00 |
|
dy
|
be5d421393
|
Merge branch 'master' into bugfix
|
2023-12-21 22:14:30 +08:00 |
|
|
|
607d590f2f
|
Merge branch 'feature/json' into dev
|
2023-12-21 21:41:18 +08:00 |
|
|
|
bfb6e4ff4e
|
build: 更新活动配置
|
2023-12-21 21:40:49 +08:00 |
|
xcy
|
c70c154099
|
feat:
累充礼包
|
2023-12-21 21:38:53 +08:00 |
|
|
|
2fc85853dc
|
feat: 充值抢钻石活动
|
2023-12-21 21:14:13 +08:00 |
|
|
|
ba8653dca9
|
fix: 添加领取数额的最大值配置
|
2023-12-21 21:08:22 +08:00 |
|
|
|
6808b53dd4
|
fix: 允许玩家领取到的钻石数小于配置的最低档位额度
|
2023-12-21 20:33:47 +08:00 |
|
|
|
2ae2a1362d
|
feat: 添加炫耀逻辑
|
2023-12-21 20:16:29 +08:00 |
|
|
|
82b4b61725
|
feat: 抢红包分钻石接口 初版
|
2023-12-21 19:52:19 +08:00 |
|
xcy
|
122041f404
|
feat:
脚本目录
|
2023-12-21 18:16:54 +08:00 |
|
dy
|
5bf5f59bfa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-21 17:49:19 +08:00 |
|
dy
|
351f8f7934
|
Merge branch 'bugfix' into dev
|
2023-12-21 17:34:06 +08:00 |
|
dy
|
720d89e988
|
主角皮肤计算属性
|
2023-12-21 17:33:31 +08:00 |
|
yushunrui
|
4690254453
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:43 +08:00 |
|
yushunrui
|
f1a4daece3
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
05368fc0de
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
48038d1b07
|
fix:圣诞活动新增vip经验任务157
|
2023-12-21 16:42:41 +08:00 |
|
yushunrui
|
ad439d0b14
|
fix:圣诞活动礼包改成每日重置
|
2023-12-21 16:42:40 +08:00 |
|
yushunrui
|
1d7b1a4f58
|
fix:圣诞活动红点报错处理
|
2023-12-21 16:42:40 +08:00 |
|
yushunrui
|
5ec8b60e99
|
fix:新增圣诞活动签到也加上经验
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
4e74b001b5
|
fix:新增圣诞活动每日消耗钻石任务类型
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
ec3d872390
|
fix:圣诞活动红点
|
2023-12-21 16:42:38 +08:00 |
|
yushunrui
|
1b222a9fc6
|
fix:圣诞活动充值不到账
|
2023-12-21 16:41:32 +08:00 |
|
yushunrui
|
80908e5a46
|
fix:圣诞任务增加圣诞经验字段
|
2023-12-21 16:41:31 +08:00 |
|
dy
|
0cc3d1c031
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 16:29:11 +08:00 |
|
dy
|
8ca2772e30
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 16:10:47 +08:00 |
|
dy
|
b38fc4f21f
|
fix use item model
|
2023-12-21 16:10:37 +08:00 |
|
dy
|
c59cae6a16
|
Merge branch 'bugfix' into release
|
2023-12-21 15:00:10 +08:00 |
|
dy
|
02ae6ada55
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 14:59:48 +08:00 |
|
dy
|
deeac9c1f8
|
Merge branch 'feature/json' into release
|
2023-12-21 14:59:42 +08:00 |
|
dy
|
36dc1e6f8c
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/pay.json
# src/json/tuisonglibao.json
|
2023-12-21 14:57:47 +08:00 |
|
dy
|
1d847480fc
|
cehua json
|
2023-12-21 14:57:26 +08:00 |
|
dy
|
85ccd8dd90
|
造型脚本
|
2023-12-21 14:56:30 +08:00 |
|
dy
|
40d4bb64fc
|
Merge branch 'feature/dev-json' into dev
|
2023-12-21 14:47:31 +08:00 |
|
dy
|
7bfa453bea
|
cehua json
|
2023-12-21 14:47:06 +08:00 |
|
dy
|
2f9483725d
|
头像脚本
|
2023-12-21 14:46:25 +08:00 |
|
xcy
|
44dc10fae6
|
fix:
修复定时器重复执行导致邮件重复发送问题
|
2023-12-21 14:01:47 +08:00 |
|
xcy
|
f725816c20
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 14:01:16 +08:00 |
|
xcy
|
c20bf92491
|
fix:
修复定时器重复执行导致邮件重复发送问题
|
2023-12-21 14:01:08 +08:00 |
|
dy
|
825a056415
|
Merge branch 'feature/json' into release
# Conflicts:
# src/json/tuisonglibao.json
|
2023-12-21 13:34:27 +08:00 |
|
dy
|
0ea1acac43
|
cehua json
|
2023-12-21 13:33:33 +08:00 |
|
dy
|
12f6729f4e
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 13:25:18 +08:00 |
|
dy
|
ba978c827a
|
Merge branch 'bugfix' into release
|
2023-12-21 13:25:04 +08:00 |
|
dy
|
527cd64b24
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 12:43:56 +08:00 |
|
dy
|
54c483bed0
|
造型更换bug
|
2023-12-21 12:43:25 +08:00 |
|
dy
|
3dff056df6
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 12:37:55 +08:00 |
|
dy
|
3194dc6449
|
造型更换
|
2023-12-21 12:37:39 +08:00 |
|
dy
|
185c929f31
|
Merge branch 'bugfix' into dev
|
2023-12-21 12:01:06 +08:00 |
|
dy
|
59720a4a2b
|
内存泄露优化
|
2023-12-21 12:01:00 +08:00 |
|
dy
|
d5ce29164a
|
Merge branch 'bugfix' into dev
|
2023-12-21 11:55:54 +08:00 |
|
dy
|
cd6c79f6ac
|
内存泄露优化
|
2023-12-21 11:55:32 +08:00 |
|
dy
|
f013d35dc4
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 11:37:33 +08:00 |
|
dy
|
4ceaeb8a5e
|
用户头像造型修复bug
|
2023-12-21 11:36:53 +08:00 |
|
dy
|
e477b14546
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 11:32:30 +08:00 |
|
dy
|
552da79951
|
用户头像造型修复bug
|
2023-12-21 11:32:15 +08:00 |
|
dy
|
3b3a322168
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 10:14:32 +08:00 |
|
dy
|
d633d52d80
|
造型
|
2023-12-21 10:14:21 +08:00 |
|
dy
|
f52e3ca55c
|
Merge branch 'feature/playerhead' into dev
# Conflicts:
# src/json/playerHead.json
# src/json/tuisonglibao.json
|
2023-12-21 09:53:14 +08:00 |
|
dy
|
dd60fe3bab
|
Merge branch 'bugfix' into dev
|
2023-12-21 09:52:15 +08:00 |
|
|
|
87ccce1875
|
fix: 对主角技能 buff 造成的伤害添加上限限制
|
2023-12-21 09:45:08 +08:00 |
|
dy
|
715f564848
|
造型
|
2023-12-20 21:59:23 +08:00 |
|
dy
|
6cb39ad523
|
消费竞赛limit
|
2023-12-20 21:08:06 +08:00 |
|
dy
|
463c272089
|
Merge branch 'feature/planb' into dev
|
2023-12-20 20:07:22 +08:00 |
|
dy
|
d3ebfdcc02
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 20:07:20 +08:00 |
|
yushunrui
|
abed7be68f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-25 19:33:39 +08:00 |
|
yushunrui
|
772993260e
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-25 19:30:55 +08:00 |
|
dy
|
97d1ddb142
|
破冰
|
2023-12-20 20:06:52 +08:00 |
|
dy
|
fd3c13d2b5
|
消耗竞赛
|
2023-12-20 20:05:40 +08:00 |
|
dy
|
9429dacc63
|
公路狂飙性能优化
|
2023-12-20 19:22:51 +08:00 |
|
dy
|
5f0d645c08
|
Merge branch 'feature/playerhead' into dev
|
2023-12-20 19:18:10 +08:00 |
|
dy
|
48e656e652
|
玩家头像框，造型，头像，对话框增加model解锁配置
|
2023-12-20 19:17:17 +08:00 |
|
xcy
|
23e1941812
|
fix:
修复定时器重复执行导致邮件重复发送问题
|
2023-12-20 19:05:09 +08:00 |
|
yushunrui
|
e1386c698a
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 19:03:41 +08:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
xcy
|
14ab1d45b8
|
fix:
过滤没有充值得payid
|
2023-12-15 18:27:57 +08:00 |
|
xcy
|
00f829c48c
|
fix:
协议
|
2023-12-15 18:26:25 +08:00 |
|
xcy
|
973e2033a0
|
Merge remote-tracking branch 'origin/dev' into dev-jitianhaoli
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-15 18:24:19 +08:00 |
|
xcy
|
a6fb04ce58
|
fix:
首充
|
2023-12-15 18:01:05 +08:00 |
|
xcy
|
d060004609
|
fix:
十五天累计充值
|
2023-12-15 17:42:20 +08:00 |
|
dy
|
99eb799c99
|
Merge branch 'dev-shouchong' into dev
|
2023-12-15 17:01:40 +08:00 |
|
dy
|
11c1c0b2c2
|
fix bug
|
2023-12-15 17:01:32 +08:00 |
|
dy
|
14d691604e
|
proto
|
2023-12-15 16:47:34 +08:00 |
|
dy
|
159bafcea9
|
Merge branch 'bugfix' into dev
# Conflicts:
# src/api_s2c/event/christmas/ApiGame.ts
# src/api_s2c/event/christmas/ApiLiBao.ts
# src/api_s2c/event/christmas/ApiOpen.ts
# src/api_s2c/event/christmas/ApiQianDao.ts
# src/api_s2c/event/christmas/ApiZhanLingRec.ts
# src/api_s2c/event/christmas/fun.ts
# src/api_s2c/hongdian/fun.ts
# src/api_s2c/pushgift/ApiOpen.ts
# src/globalListener.ts
|
2023-12-15 16:46:06 +08:00 |
|
dy
|
8d3b2178fc
|
fix kuangdong
|
2023-12-15 16:41:31 +08:00 |
|
xcy
|
4a10921600
|
Merge branch 'dev-shouchong' into dev
|
2023-12-15 16:24:33 +08:00 |
|
dy
|
934097ec16
|
cehua json
|
2023-12-15 15:14:37 +08:00 |
|
xcy
|
4fc0da4a70
|
fix:
首充调整与脚本
|
2023-12-15 15:14:12 +08:00 |
|
dy
|
c3b6f8d988
|
cehua json
|
2023-12-15 15:10:05 +08:00 |
|
dy
|
461803f4d3
|
Revert "cehua json"
This reverts commit 5bebf36600.
|
2023-12-15 15:09:29 +08:00 |
|
|
|
f07b1fc0b7
|
mdb空闲关闭
|
2023-12-15 14:41:10 +08:00 |
|
dy
|
5bebf36600
|
cehua json
|
2023-12-15 14:28:53 +08:00 |
|
dy
|
28d01f586a
|
cehua json
|
2023-12-15 14:28:42 +08:00 |
|
dy
|
87820f669a
|
fix bug
|
2023-12-15 12:18:20 +08:00 |
|
dy
|
b39d0055ef
|
fix bug
|
2023-12-15 12:18:18 +08:00 |
|
dy
|
865bfb9943
|
fix bug
|
2023-12-15 12:17:58 +08:00 |
|
|
|
afd0eb93de
|
战斗清理
|
2023-12-15 12:02:35 +08:00 |
|
dy
|
0b806429ab
|
fix bug
|
2023-12-15 12:01:38 +08:00 |
|
xcy
|
0b18e39dd7
|
fix bug
|
2023-12-15 11:39:46 +08:00 |
|
xcy
|
9d5b69edc2
|
fix bug
|
2023-12-15 11:31:46 +08:00 |
|
dy
|
fe8a68a6eb
|
fix bug
|
2023-12-15 11:14:42 +08:00 |
|
xcy
|
b524f2a847
|
fix:
主线任务vip经验计数错误，修改为直接读取gud的payexp
|
2023-12-15 11:14:38 +08:00 |
|
dy
|
3488f61978
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-15 11:12:12 +08:00 |
|
dy
|
f6248d1294
|
fix bug
|
2023-12-15 11:12:04 +08:00 |
|
xcy
|
e35e950e11
|
fix:
主线任务vip经验计数错误，修改为直接读取gud的payexp
|
2023-12-15 11:01:56 +08:00 |
|
dy
|
1d4a34c266
|
合并,暂时屏蔽其他功能
|
2023-12-15 10:46:53 +08:00 |
|
dy
|
9f151f182b
|
合并,暂时屏蔽其他功能
|
2023-12-15 10:46:47 +08:00 |
|
dy
|
24c2efdfa2
|
合并
|
2023-12-15 10:37:29 +08:00 |
|
dy
|
eee802594d
|
合并
|
2023-12-15 10:32:21 +08:00 |
|
xcy
|
e99b5dad15
|
feat:
1.推送礼包
|
2023-12-15 10:30:47 +08:00 |
|
dy
|
938d881ce3
|
fix bug
|
2023-12-15 10:28:06 +08:00 |
|
dy
|
8b15048d0f
|
周末礼包红点
|
2023-12-15 10:27:43 +08:00 |
|
dy
|
79f17aa48f
|
周末礼包
|
2023-12-15 10:27:33 +08:00 |
|
dy
|
4f6297fc7a
|
周末礼包，修补钻石替换
|
2023-12-15 10:27:31 +08:00 |
|
dy
|
61827c52d4
|
周末礼包
|
2023-12-15 10:27:28 +08:00 |
|
|
|
1d02f22df8
|
fix语言包为null
|
2023-12-15 10:26:35 +08:00 |
|
dy
|
6aadb030c5
|
周末礼包
|
2023-12-15 10:26:23 +08:00 |
|
dy
|
afb925bc40
|
proto
|
2023-12-15 10:26:11 +08:00 |
|
dy
|
66918ab247
|
proto
|
2023-12-15 10:26:08 +08:00 |
|
dy
|
a189f77303
|
init
|
2023-12-15 10:25:44 +08:00 |
|
dy
|
4ba9b9f504
|
init
|
2023-12-15 10:25:39 +08:00 |
|
dy
|
0fc409b0dc
|
fix bug
|
2023-12-15 09:55:18 +08:00 |
|
xcy
|
ef90c131f3
|
feat:
1.推送礼包
|
2023-12-14 20:57:15 +08:00 |
|
|
|
5dea65e51a
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2023-12-14 20:43:33 +08:00 |
|
|
|
0304c78991
|
战斗清理
|
2023-12-14 20:42:22 +08:00 |
|
dy
|
bfc1fb0c9c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-14 19:42:13 +08:00 |
|
yushunrui
|
96f8b26ce8
|
修改圣诞小游戏逻辑
|
2023-12-16 19:31:48 +08:00 |
|
yushunrui
|
582ac4f7e3
|
更新圣诞活动相关代码
|
2023-12-16 19:05:37 +08:00 |
|
dy
|
dc50b71b01
|
proto
|
2023-12-14 19:42:03 +08:00 |
|
dy
|
5fabfb2c5a
|
周末礼包红点
|
2023-12-14 18:52:17 +08:00 |
|
xcy
|
5d9ece056e
|
feat:
1.推送礼包
|
2023-12-14 18:18:26 +08:00 |
|
dy
|
39362ea6ab
|
周末礼包
|
2023-12-14 17:53:52 +08:00 |
|
dy
|
39cb12ac9a
|
周末礼包，修补钻石替换
|
2023-12-14 17:16:36 +08:00 |
|
dy
|
ab8404ef62
|
周末礼包
|
2023-12-14 17:01:39 +08:00 |
|
|
|
e0d9c40be3
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2023-12-14 16:07:54 +08:00 |
|
yushunrui
|
dc822cc958
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-16 15:49:56 +08:00 |
|
yushunrui
|
901484252d
|
追杀令经验修改
|
2023-12-16 15:49:22 +08:00 |
|
|
|
02798b1c1d
|
fix语言包为null
|
2023-12-14 16:07:36 +08:00 |
|
dy
|
0ebe169f50
|
周末礼包
|
2023-12-14 15:34:32 +08:00 |
|
dy
|
49cb5d6f81
|
proto
|
2023-12-14 14:01:18 +08:00 |
|
dy
|
ae56d03f72
|
proto
|
2023-12-14 13:52:41 +08:00 |
|
dy
|
64f3f75b77
|
init
|
2023-12-14 13:51:24 +08:00 |
|
dy
|
d8f8aaa8d1
|
init
|
2023-12-14 13:48:47 +08:00 |
|
dy
|
4f9c1276c4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-14 11:38:57 +08:00 |
|
dy
|
bcab41c9bb
|
proto
|
2023-12-14 11:38:15 +08:00 |
|
|
|
e0c0d03f4e
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2023-12-14 11:33:14 +08:00 |
|
|
|
941d74195d
|
Merge branch 'master' into dev
|
2023-12-14 11:28:52 +08:00 |
|
dy
|
e244b8b495
|
忽略列表
|
2023-12-14 11:22:46 +08:00 |
|
|
|
3d40edd421
|
动态调整mdb连接上限数
|
2023-12-14 11:20:35 +08:00 |
|
dy
|
e1f3e726b7
|
周末礼包
|
2023-12-14 11:06:54 +08:00 |
|
dy
|
312afa1b69
|
周末礼包
|
2023-12-14 11:04:16 +08:00 |
|
dy
|
4fea8d6863
|
json
|
2023-12-14 09:59:06 +08:00 |
|
dy
|
c99b56b768
|
json
|
2023-12-14 09:52:34 +08:00 |
|
dy
|
aefd1d0052
|
init
|
2023-12-13 20:51:17 +08:00 |
|
DESKTOP-15R5JU0\legu
|
7d8dff9799
|
init
|
2023-11-17 21:55:32 +08:00 |
|
DESKTOP-15R5JU0\legu
|
97e070ea81
|
init
|
2023-11-17 12:02:12 +08:00 |
|
