259 Commits

Author SHA1 Message Date
xiekaidong
a6c85e6741 容错 2023-06-20 22:09:40 +08:00
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
Fang
0d624772e7 添加头像背景品质 2023-06-20 14:23:48 +08:00
Fang
700b38d1fc 添加重命名与当前昵称相同提示 2023-06-19 16:25:25 +08:00
Fang
7939d1630d 跨天关闭副本关卡选择界面 2023-06-19 16:00:11 +08:00
xiekaidong
9d0901dc2b 免控 2023-06-19 11:55:52 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
xiekaidong
da555bd8f3 怪物经验可配置根据血量的分段经验 2023-06-16 18:44:43 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
e62e198b8e bug修复 2023-06-16 11:49:17 +08:00
xiekaidong
62f45a0392 战斗支持血量换皮肤 2023-06-15 18:56:07 +08:00
chenxi
2ac2d73e0b 战令红点bug 2023-06-15 16:58:13 +08:00
Fang
fa28d96027 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:09:12 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +08:00
xiekaidong
b7a592bd51 日志上报 2023-06-14 16:06:21 +08:00
chenxi
7a141820b4 merge 2023-06-14 15:43:17 +08:00
chenxi
b51d130b3b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/proto/protocol.bytes
2023-06-14 15:41:50 +08:00
chenxi
25534ecacb 编译 2023-06-14 15:40:09 +08:00
Fang
6ad7ea4135 编译 2023-06-14 14:54:11 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/global.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00
chenxi
04ab254222 编译 2023-06-13 15:06:57 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
chenxi
e81eab8c4f 编译 2023-06-12 18:27:47 +08:00
xiekaidong
f48f17db38 攻击距离可配置 2023-06-12 10:38:07 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
CloudJ
700804df00 编译 2023-06-06 18:22:26 +08:00
xiekaidong
de983ee4e5 战斗bi日志上报 2023-06-06 18:07:07 +08:00
Fang
49af10d8a9 战斗退出后显示主界面控制 2023-06-06 17:31:34 +08:00
CloudJ
a7756805cb 编译 2023-06-06 17:12:25 +08:00
xiekaidong
cb667f4e9c bug修复 2023-06-06 16:45:39 +08:00
chenxi
29a6483899 编译 2023-06-06 12:01:23 +08:00
CloudJ
6e6bbb013b 编译 2023-06-05 19:43:50 +08:00
CloudJ
5008ac9a76 编译 2023-06-05 15:21:06 +08:00
CloudJ
9c2745302f 编译 2023-06-05 14:21:57 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
CloudJ
b46065772c 编译 2023-06-05 11:48:01 +08:00
Fang
6c637656e5 编译 2023-06-05 10:43:13 +08:00
xiekaidong
e6a28c8acd 修改bug,优化战斗流程逻辑 2023-06-03 19:12:33 +08:00
xiekaidong
c65d52c8de 水泡动画 2023-06-02 19:02:18 +08:00
CloudJ
03424f4786 编译 2023-06-02 18:43:49 +08:00
Fang
5356a92634 功能解锁飞行动画 2023-06-02 18:36:05 +08:00