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
|
5ccea04bbe
|
Merge branch 'master' into bugfix
|
2023-12-16 11:05:37 +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 |
|
dy
|
2f87f25a8d
|
fix bug
|
2023-12-15 20:20:46 +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 |
|
