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 |
|
yushunrui
|
4690254453
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:43 +08:00 |
|
yushunrui
|
48038d1b07
|
fix:圣诞活动新增vip经验任务157
|
2023-12-21 16:42:41 +08:00 |
|
yushunrui
|
4e74b001b5
|
fix:新增圣诞活动每日消耗钻石任务类型
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
1b222a9fc6
|
fix:圣诞活动充值不到账
|
2023-12-21 16:41:32 +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 |
|
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
|
12f6729f4e
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 13:25:18 +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
|
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 |
|
dy
|
715f564848
|
造型
|
2023-12-20 21:59:23 +08:00 |
|
yushunrui
|
772993260e
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-25 19:30:55 +08:00 |
|
yushunrui
|
e09d057f32
|
fix:圣诞活动新增vip经验任务157
|
2023-12-20 17:47:37 +08:00 |
|
xcy
|
dacd312bfe
|
fix:
日常任务初始值问题修复
|
2023-12-20 16:56:23 +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 |
|
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 |
|
dy
|
d0a80a4c73
|
Merge branch 'bugfix' into dev
|
2023-12-20 15:41:53 +08:00 |
|
dy
|
47ebe4fe14
|
Merge branch 'feature/pushgift' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-20 14:50:58 +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
|
6ffe4eba17
|
Merge branch 'master' into bugfix
|
2023-12-19 22:17:37 +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
|
eb7c4204b8
|
fix:作战特权增加免费快速探险次数2->5
|
2023-12-19 19:03:29 +08:00 |
|
dy
|
5c6e403e19
|
Merge branch 'release' into bugfix
|
2023-12-19 18:01:22 +08:00 |
|
xcy
|
7ae7349550
|
fix:跨服邮件定时器
|
2023-12-19 16:26:41 +08:00 |
|
xcy
|
0ceae9c2bb
|
fix:跨服邮件定时器
|
2023-12-19 14:42:51 +08:00 |
|
xcy
|
d4634f729e
|
fix:跨服邮件定时器
|
2023-12-19 10:12:49 +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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
dy
|
fdbf22f62f
|
Merge branch 'bugfix' into dev
|
2023-12-18 14:47:13 +08:00 |
|
|
|
327f9c9b5a
|
全面去掉hero的redis依赖
|
2023-12-18 14:43:13 +08:00 |
|
yushunrui
|
192ee578dc
|
圣诞功能还原版本
|
2023-12-18 11:23:13 +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 |
|
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
|
b524f2a847
|
fix:
主线任务vip经验计数错误，修改为直接读取gud的payexp
|
2023-12-15 11:14:38 +08:00 |
|
xcy
|
e35e950e11
|
fix:
主线任务vip经验计数错误，修改为直接读取gud的payexp
|
2023-12-15 11:01:56 +08:00 |
|
dy
|
9f151f182b
|
合并,暂时屏蔽其他功能
|
2023-12-15 10:46:47 +08:00 |
|
xcy
|
e99b5dad15
|
feat:
1.推送礼包
|
2023-12-15 10:30:47 +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 |
|
dy
|
a189f77303
|
init
|
2023-12-15 10:25:44 +08:00 |
|
dy
|
4ba9b9f504
|
init
|
2023-12-15 10:25:39 +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 |
|
yushunrui
|
582ac4f7e3
|
更新圣诞活动相关代码
|
2023-12-16 19:05:37 +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 |
|
dy
|
312afa1b69
|
周末礼包
|
2023-12-14 11:04:16 +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 |
|
