Commit Graph

647 Commits

Author SHA1 Message Date
dy
ba2c49868f fix pay 2023-12-22 00:22:54 +08:00
dy
c695388208 fix pay 2023-12-21 23:51:03 +08:00
dy
50c52556e0 fix pay 2023-12-21 23:40:41 +08:00
dy
4a28a86fe2 Merge branch 'master' into dev
# Conflicts:
#	src/api_s2c/hongdian/fun.ts
2023-12-21 22:15:40 +08:00
dy
be5d421393 Merge branch 'master' into bugfix 2023-12-21 22:14:30 +08:00
607d590f2f Merge branch 'feature/json' into dev 2023-12-21 21:41:18 +08:00
bfb6e4ff4e build: 更新活动配置 2023-12-21 21:40:49 +08:00
xcy
c70c154099 feat:
累充礼包
2023-12-21 21:38:53 +08:00
2fc85853dc feat: 充值抢钻石活动 2023-12-21 21:14:13 +08:00
ba8653dca9 fix: 添加领取数额的最大值配置 2023-12-21 21:08:22 +08:00
6808b53dd4 fix: 允许玩家领取到的钻石数小于配置的最低档位额度 2023-12-21 20:33:47 +08:00
2ae2a1362d feat: 添加炫耀逻辑 2023-12-21 20:16:29 +08:00
82b4b61725 feat: 抢红包分钻石接口 初版 2023-12-21 19:52:19 +08:00
xcy
122041f404 feat:
脚本目录
2023-12-21 18:16:54 +08:00
dy
5bf5f59bfa Merge branch 'feature/xiaofeijingsai' into dev 2023-12-21 17:49:19 +08:00
dy
351f8f7934 Merge branch 'bugfix' into dev 2023-12-21 17:34:06 +08:00
dy
720d89e988 主角皮肤计算属性 2023-12-21 17:33:31 +08:00
yushunrui
4690254453 fix:圣诞活动修改异步按钮逻辑 2023-12-21 16:42:43 +08:00
yushunrui
f1a4daece3 fix:圣诞活动修改异步按钮逻辑 2023-12-21 16:42:42 +08:00
yushunrui
05368fc0de fix:圣诞活动修改异步按钮逻辑 2023-12-21 16:42:42 +08:00
yushunrui
48038d1b07 fix:圣诞活动新增vip经验任务157 2023-12-21 16:42:41 +08:00
yushunrui
ad439d0b14 fix:圣诞活动礼包改成每日重置 2023-12-21 16:42:40 +08:00
yushunrui
1d7b1a4f58 fix:圣诞活动红点报错处理 2023-12-21 16:42:40 +08:00
yushunrui
5ec8b60e99 fix:新增圣诞活动签到也加上经验 2023-12-21 16:42:39 +08:00
yushunrui
4e74b001b5 fix:新增圣诞活动每日消耗钻石任务类型 2023-12-21 16:42:39 +08:00
yushunrui
ec3d872390 fix:圣诞活动红点 2023-12-21 16:42:38 +08:00
yushunrui
1b222a9fc6 fix:圣诞活动充值不到账 2023-12-21 16:41:32 +08:00
yushunrui
80908e5a46 fix:圣诞任务增加圣诞经验字段 2023-12-21 16:41:31 +08:00
dy
0cc3d1c031 Merge branch 'feature/playerhead' into release 2023-12-21 16:29:11 +08:00
dy
8ca2772e30 Merge branch 'feature/playerhead' into dev 2023-12-21 16:10:47 +08:00
dy
b38fc4f21f fix use item model 2023-12-21 16:10:37 +08:00
dy
c59cae6a16 Merge branch 'bugfix' into release 2023-12-21 15:00:10 +08:00
dy
02ae6ada55 Merge branch 'feature/playerhead' into release 2023-12-21 14:59:48 +08:00
dy
deeac9c1f8 Merge branch 'feature/json' into release 2023-12-21 14:59:42 +08:00
dy
36dc1e6f8c Merge branch 'feature/json' into dev
# Conflicts:
#	src/json/pay.json
#	src/json/tuisonglibao.json
2023-12-21 14:57:47 +08:00
dy
1d847480fc cehua json 2023-12-21 14:57:26 +08:00
dy
85ccd8dd90 造型脚本 2023-12-21 14:56:30 +08:00
dy
858cb31a8b Merge branch 'bugfix' into dev 2023-12-21 14:47:43 +08:00
dy
40d4bb64fc Merge branch 'feature/dev-json' into dev 2023-12-21 14:47:31 +08:00
dy
7bfa453bea cehua json 2023-12-21 14:47:06 +08:00
dy
2f9483725d 头像脚本 2023-12-21 14:46:25 +08:00
xcy
44dc10fae6 fix:
修复定时器重复执行导致邮件重复发送问题
2023-12-21 14:01:47 +08:00
xcy
f725816c20 Merge remote-tracking branch 'origin/dev' into dev 2023-12-21 14:01:16 +08:00
xcy
c20bf92491 fix:
修复定时器重复执行导致邮件重复发送问题
2023-12-21 14:01:08 +08:00
dy
825a056415 Merge branch 'feature/json' into release
# Conflicts:
#	src/json/tuisonglibao.json
2023-12-21 13:34:27 +08:00
dy
0ea1acac43 cehua json 2023-12-21 13:33:33 +08:00
dy
12f6729f4e Merge branch 'feature/playerhead' into release 2023-12-21 13:25:18 +08:00
dy
ba978c827a Merge branch 'bugfix' into release 2023-12-21 13:25:04 +08:00
dy
527cd64b24 Merge branch 'feature/playerhead' into dev 2023-12-21 12:43:56 +08:00
dy
54c483bed0 造型更换bug 2023-12-21 12:43:25 +08:00