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 |
|
