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 |
|
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 |
|
