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 |
|
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 |
|
yushunrui
|
8a10552203
|
fix:圣诞活动红点
|
2023-12-20 16:17:09 +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
|
d1750bb097
|
fix:
玩家退出公会时gud残留ghid，在登录时检测修复一下
|
2023-12-20 15:42:14 +08:00 |
|
xcy
|
7e24671983
|
fix:
1.下限保底，拉去英雄列表时，检测英雄穿戴的peijian是否存在，不存在就置空
|
2023-12-20 15:18:31 +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
|
7488802fd0
|
revert 推送礼包
|
2023-12-20 13:56:20 +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
|
cea27e9ea4
|
Merge branch 'master' into feature/planb
|
2023-12-19 22:31:20 +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 |
|
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
|
a969fb65df
|
fix:伙伴招募
|
2023-12-19 19:11:54 +08:00 |
|
xcy
|
4bdee9fc7c
|
fix:伙伴招募
|
2023-12-19 19:11:08 +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
|
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 |
|
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
|
1a703f1ecd
|
首充改为直购
|
2023-12-19 14:59:28 +08:00 |
|
dy
|
38e04d29ab
|
破冰礼包
|
2023-12-19 13:42:23 +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 |
|
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
|
50087cd543
|
fix:
十五天累计充值
|
2023-12-18 21:21:35 +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
|
79fcc6ec85
|
Revert "feat: 1.推送礼包"
This reverts commit 5d9ece05
|
2023-12-18 20:09:56 +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
|
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
|
9523f7c00d
|
fix:
积天好礼bug
|
2023-12-18 20:00:49 +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 |
|
yushunrui
|
9882a28090
|
fix:处理圣诞活动免费次数bug
|
2023-12-18 16:16:11 +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
|
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 |
|
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 |
|
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
|
77159cc7e3
|
干部功能redis直取修复
|
2023-12-15 22:48:45 +08:00 |
|
dy
|
ec3f954518
|
fix bug
|
2023-12-15 22:41:20 +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
|
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
|
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
|
4fc0da4a70
|
fix:
首充调整与脚本
|
2023-12-15 15:14:12 +08:00 |
|
dy
|
87820f669a
|
fix bug
|
2023-12-15 12:18:20 +08:00 |
|
dy
|
865bfb9943
|
fix bug
|
2023-12-15 12:17:58 +08:00 |
|
dy
|
fe8a68a6eb
|
fix bug
|
2023-12-15 11:14:42 +08:00 |
|
dy
|
f6248d1294
|
fix bug
|
2023-12-15 11:12:04 +08:00 |
|
dy
|
1d4a34c266
|
合并,暂时屏蔽其他功能
|
2023-12-15 10:46:53 +08:00 |
|
dy
|
9f151f182b
|
合并,暂时屏蔽其他功能
|
2023-12-15 10:46: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 |
|
dy
|
6aadb030c5
|
周末礼包
|
2023-12-15 10:26:23 +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 |
|
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 |
|
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 |
|
dy
|
0ebe169f50
|
周末礼包
|
2023-12-14 15:34:32 +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
|
bcab41c9bb
|
proto
|
2023-12-14 11:38:15 +08:00 |
|
dy
|
e1f3e726b7
|
周末礼包
|
2023-12-14 11:06:54 +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 |
|
