Commit Graph

105 Commits

Author SHA1 Message Date
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
5969e32323 fix:伙伴招募修改条件至尊月卡 2023-12-19 19:00:11 +08:00
xcy
8b157a047a fix:伙伴招募修改条件至尊月卡 2023-12-19 18:38:42 +08:00
xcy
404bb9a7e5 fix:
修改伙伴招募的奖励领取条件
2023-12-15 21:11:31 +08:00
xcy
7e775e90e1 fix:
修改情报特权
2023-12-15 20:06: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
xcy
aab0951e6d Merge remote-tracking branch 'origin/pushgift' into pushgift 2023-12-14 20:53:47 +08:00