Commit Graph

105 Commits

Author SHA1 Message Date
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