376 Commits

Author SHA1 Message Date
xiekaidong
da555bd8f3 怪物经验可配置根据血量的分段经验 2023-06-16 18:44:43 +08:00
chenxi
da087b9dff 维护公告 2023-06-16 16:17:09 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
c0e16123f8 bug修复 2023-06-16 14:30:30 +08:00
xiekaidong
187dab8ee6 bug修复,更新图集 2023-06-16 10:59:00 +08:00
xiekaidong
62f45a0392 战斗支持血量换皮肤 2023-06-15 18:56:07 +08:00
xiekaidong
ef7d1f78cd bug修复 2023-06-15 17:53:01 +08:00
xiekaidong
0b5670c7a4 每日挑战任务完成情况上报 2023-06-15 17:30:49 +08:00
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +08:00
xiekaidong
402aaa1ad1 副本开启引导触发、神秘宝箱开启音效 2023-06-15 15:33:09 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +08:00
xiekaidong
e98b0d2368 伤害数字重叠问题 2023-06-14 18:35:41 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +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
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
523c2e4a7f 交换一下战斗双方死亡的判定顺序 2023-06-14 10:43:29 +08:00
xiekaidong
2c10467ffc 对手先手期间,英雄不会播放死亡动作bug修复 2023-06-14 10:03:52 +08:00
chenxi
481af73ddb cdkey临时界面 2023-06-13 20:54:29 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +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
47ddf4f7c7 更新协议 2023-06-12 16:53:24 +08:00
xiekaidong
f48f17db38 攻击距离可配置 2023-06-12 10:38:07 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
0221c6c826 sdk参数 2023-06-09 19:02:30 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
chenxi
52ad339930 fix bug 2023-06-07 19:50:16 +08:00
xiekaidong
8ccfae34f3 登陆界面复制账号 2023-06-06 21:06:13 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +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
xiekaidong
f3c87a786f 修改上报 2023-06-06 15:25:51 +08:00
xiekaidong
ffcfe93299 切换波次时自动关闭buff弹窗 2023-06-06 14:13:07 +08:00
chenxi
f91872672a 音效和ab 2023-06-06 11:30:15 +08:00
CloudJ
e7d278de0c 编译 2023-06-06 11:15:26 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +08:00
xiekaidong
b2f8e11059 音效 2023-06-06 11:01:33 +08:00
xiekaidong
9a6732acdd 增加棋盘查看字段 2023-06-05 21:08:16 +08:00
xiekaidong
5bc73b98ab 消除显示优化 2023-06-05 20:53:19 +08:00
chenxi
7224512691 充值后提示绑定 2023-06-05 18:33:48 +08:00
xiekaidong
f2a67512f8 显示bug修复 2023-06-05 18:26:27 +08:00
chenxi
8ea8688321 侧边栏调整位置 2023-06-05 16:26:38 +08:00
xiekaidong
9a48380ba2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 16:24:51 +08:00