Commit Graph

358 Commits

Author SHA1 Message Date
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
dy
3dff056df6 Merge branch 'feature/playerhead' into dev 2023-12-21 12:37:55 +08:00
dy
3194dc6449 造型更换 2023-12-21 12:37:39 +08:00
dy
185c929f31 Merge branch 'bugfix' into dev 2023-12-21 12:01:06 +08:00
dy
59720a4a2b 内存泄露优化 2023-12-21 12:01:00 +08:00
dy
d5ce29164a Merge branch 'bugfix' into dev 2023-12-21 11:55:54 +08:00
dy
cd6c79f6ac 内存泄露优化 2023-12-21 11:55:32 +08:00
dy
f013d35dc4 Merge branch 'feature/playerhead' into dev 2023-12-21 11:37:33 +08:00
dy
4ceaeb8a5e 用户头像造型修复bug 2023-12-21 11:36:53 +08:00
dy
e477b14546 Merge branch 'feature/playerhead' into dev 2023-12-21 11:32:30 +08:00
dy
552da79951 用户头像造型修复bug 2023-12-21 11:32:15 +08:00
dy
80b25869ec Merge branch 'release' into dev 2023-12-21 10:39:49 +08:00
dy
3b3a322168 Merge branch 'feature/playerhead' into dev 2023-12-21 10:14:32 +08:00
dy
d633d52d80 造型 2023-12-21 10:14:21 +08:00
dy
f52e3ca55c Merge branch 'feature/playerhead' into dev
# Conflicts:
#	src/json/playerHead.json
#	src/json/tuisonglibao.json
2023-12-21 09:53:14 +08:00
dy
dd60fe3bab Merge branch 'bugfix' into dev 2023-12-21 09:52:15 +08:00
87ccce1875 fix: 对主角技能 buff 造成的伤害添加上限限制 2023-12-21 09:45:08 +08:00
dy
715f564848 造型 2023-12-20 21:59:23 +08:00
dy
6cb39ad523 消费竞赛limit 2023-12-20 21:08:06 +08:00
dy
463c272089 Merge branch 'feature/planb' into dev 2023-12-20 20:07:22 +08:00
dy
d3ebfdcc02 Merge branch 'feature/xiaofeijingsai' into dev 2023-12-20 20:07:20 +08:00
yushunrui
abed7be68f Merge remote-tracking branch 'origin/dev' into dev 2023-12-25 19:33:39 +08:00
yushunrui
772993260e fix:圣诞活动修改异步按钮逻辑 2023-12-25 19:30:55 +08:00
dy
97d1ddb142 破冰 2023-12-20 20:06:52 +08:00
dy
fd3c13d2b5 消耗竞赛 2023-12-20 20:05:40 +08:00
dy
9429dacc63 公路狂飙性能优化 2023-12-20 19:22:51 +08:00
dy
5f0d645c08 Merge branch 'feature/playerhead' into dev 2023-12-20 19:18:10 +08:00
dy
48e656e652 玩家头像框,造型,头像,对话框增加model解锁配置 2023-12-20 19:17:17 +08:00
xcy
23e1941812 fix:
修复定时器重复执行导致邮件重复发送问题
2023-12-20 19:05:09 +08:00
yushunrui
e1386c698a fix:圣诞活动修改异步按钮逻辑 2023-12-20 19:03:41 +08:00
yushunrui
e71c562e08 fix:圣诞活动修改异步按钮逻辑 2023-12-20 18:56:40 +08:00
dy
6953349058 消费竞赛 2023-12-20 18:21:43 +08:00
dy
1e46f70cd9 Merge branch 'feature/planb' into dev 2023-12-20 18:02:39 +08:00
dy
44be68a8ca 破冰礼包 2023-12-20 18:02:26 +08:00
dy
41799960e0 Merge remote-tracking branch 'origin/dev' into dev 2023-12-20 17:49:15 +08:00
dy
56aa689a18 Merge branch 'feature/xiaofeijingsai' into dev 2023-12-20 17:48:53 +08:00
dy
5b4e0cce65 消费竞赛 2023-12-20 17:48:42 +08:00
yushunrui
e09d057f32 fix:圣诞活动新增vip经验任务157 2023-12-20 17:47:37 +08:00
yushunrui
fcf79d7df0 fix:圣诞活动礼包改成每日重置 2023-12-20 17:32:31 +08:00
yushunrui
ec524e1ebd fix:圣诞活动红点报错处理 2023-12-20 16:59:16 +08:00