chenxi
|
1e8aebf944
|
注释和删除中文
|
2023-06-20 20:18:11 +08:00 |
|
xiekaidong
|
d46fdec70a
|
bug修复
|
2023-06-20 17:50:33 +08:00 |
|
xiekaidong
|
d9a6ccc527
|
bug修复
|
2023-06-20 16:28:51 +08:00 |
|
xiekaidong
|
5de785f28e
|
bug修复
|
2023-06-20 11:35:23 +08:00 |
|
xiekaidong
|
f1b4a21ae6
|
免控
|
2023-06-19 11:55:10 +08:00 |
|
Fang
|
f3924368ce
|
头像昵称功能
|
2023-06-19 10:57:39 +08:00 |
|
xiekaidong
|
e8e17acbdf
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-19 10:13:08 +08:00 |
|
xiekaidong
|
9a620ae064
|
bug修复
|
2023-06-19 10:13:05 +08:00 |
|
chenxi
|
0988c47259
|
adjust事件
|
2023-06-19 09:56:07 +08:00 |
|
xiekaidong
|
aa5f557c75
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:42:41 +08:00 |
|
chenxi
|
a3f223ffe2
|
维护公告
|
2023-06-16 16:16:39 +08:00 |
|
chenxi
|
805b9bec93
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-16 15:38:10 +08:00 |
|
chenxi
|
7929c8ba37
|
维护公告
|
2023-06-16 15:38:07 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|
chenxi
|
0a82df2421
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-16 15:11:40 +08:00 |
|
chenxi
|
fb671ca1af
|
维护公告
|
2023-06-16 15:11:37 +08:00 |
|
xiekaidong
|
7b8da9c782
|
bug修复
|
2023-06-16 14:29:55 +08:00 |
|
xiekaidong
|
942f06485f
|
bug修复
|
2023-06-16 10:58:10 +08:00 |
|
xiekaidong
|
027809a5bd
|
战斗支持血量换皮肤
|
2023-06-15 18:55:10 +08:00 |
|
xiekaidong
|
c11428b80b
|
bug修复
|
2023-06-15 17:52:22 +08:00 |
|
xiekaidong
|
3723335174
|
每日挑战任务完成情况上报
|
2023-06-15 17:30:08 +08:00 |
|
chenxi
|
c6361d035f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-15 16:26:00 +08:00 |
|
chenxi
|
2c2e67caee
|
客服
|
2023-06-15 16:25:58 +08:00 |
|
xiekaidong
|
e8b6534d3b
|
副本开启引导触发
|
2023-06-15 15:32:27 +08:00 |
|
xiekaidong
|
4cce3bb36b
|
buff显示修改
|
2023-06-15 14:17:48 +08:00 |
|
xiekaidong
|
3f23f976e3
|
bug修复
|
2023-06-14 19:05:15 +08:00 |
|
xiekaidong
|
5214dd8136
|
伤害数字重叠问题
|
2023-06-14 18:35:20 +08:00 |
|
xiekaidong
|
e664f4ab0a
|
连携提示
|
2023-06-14 18:20:57 +08:00 |
|
chenxi
|
d3bb4c3698
|
Merge branch 'dev_ios' into dev
|
2023-06-14 15:40:47 +08:00 |
|
chenxi
|
7ae76d3438
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-14 15:39:24 +08:00 |
|
xiekaidong
|
918146dda0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-14 15:34:25 +08:00 |
|
xiekaidong
|
e3b8eaa04c
|
显示buff
|
2023-06-14 15:34:21 +08:00 |
|
chenxi
|
34332c6af9
|
merge cdkey
|
2023-06-14 15:04:56 +08:00 |
|
chenxi
|
5934e03198
|
cdkey
|
2023-06-14 15:04:26 +08:00 |
|
Fang
|
98206fea34
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# lua/app/config/avatar.lua.meta
# lua/app/config/avatar_frame.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/avatar.lua.meta
# lua/app/config/strings/cn/avatar_frame.lua.meta
# lua/app/config/strings/cn/hero.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/avatar.lua.meta
# lua/app/config/strings/de/avatar_frame.lua.meta
# lua/app/config/strings/en/avatar.lua.meta
# lua/app/config/strings/en/avatar_frame.lua.meta
# lua/app/config/strings/fr/avatar.lua.meta
# lua/app/config/strings/fr/avatar_frame.lua.meta
# lua/app/config/strings/id/avatar.lua.meta
# lua/app/config/strings/id/avatar_frame.lua.meta
# lua/app/config/strings/ja/avatar.lua.meta
# lua/app/config/strings/ja/avatar_frame.lua.meta
# lua/app/config/strings/ko/avatar.lua.meta
# lua/app/config/strings/ko/avatar_frame.lua.meta
# lua/app/config/strings/pt/avatar.lua.meta
# lua/app/config/strings/pt/avatar_frame.lua.meta
# lua/app/config/strings/ru/avatar.lua.meta
# lua/app/config/strings/ru/avatar_frame.lua.meta
# lua/app/config/strings/th/avatar.lua.meta
# lua/app/config/strings/th/avatar_frame.lua.meta
# lua/app/config/strings/vi/avatar.lua.meta
# lua/app/config/strings/vi/avatar_frame.lua.meta
# lua/app/config/strings/zh/avatar.lua.meta
# lua/app/config/strings/zh/avatar_frame.lua.meta
|
2023-06-14 11:41:12 +08:00 |
|
Fang
|
ecb24214aa
|
fix
|
2023-06-14 11:38:50 +08:00 |
|
xiekaidong
|
9b24d69fbd
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:41:34 +08:00 |
|
Fang
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
xiekaidong
|
6cf247d86d
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:21 +08:00 |
|
chenxi
|
c95991df76
|
先传一下维护公告界面
|
2023-06-13 21:01:11 +08:00 |
|
chenxi
|
8eed1c6a97
|
cdkey临时界面
|
2023-06-13 20:53:53 +08:00 |
|
Fang
|
1d68846a85
|
ui细节调整
|
2023-06-13 18:44:47 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
xiekaidong
|
4846a97b75
|
grideffect=6的处理
|
2023-06-13 15:08:02 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
xiekaidong
|
90bd77a4b7
|
显示调整
|
2023-06-13 10:36:44 +08:00 |
|
xiekaidong
|
43826faab8
|
界面处理
|
2023-06-13 10:16:58 +08:00 |
|
xiekaidong
|
5def9aed8a
|
战斗
|
2023-06-12 18:54:27 +08:00 |
|
xiekaidong
|
f20f435227
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/config/chapter_dungeon_gold.lua
# lua/app/module/dungeon/dungeon_manager.lua
|
2023-06-12 18:50:40 +08:00 |
|
xiekaidong
|
30bfbb5476
|
接入战斗
|
2023-06-12 18:49:59 +08:00 |
|