433 Commits

Author SHA1 Message Date
xiekaidong
7f47ebdfd0 修改显示 2023-06-16 11:34:21 +08:00
chenxi
f04af250ac 编译 2023-06-16 10:37:25 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +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
19084e41f4 bug修复 2023-06-15 14:07:48 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +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
chenxi
481af73ddb cdkey临时界面 2023-06-13 20:54:29 +08:00
xiekaidong
8e3ebe353d 英雄升级特效 2023-06-13 18:50:19 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00
chenxi
04ab254222 编译 2023-06-13 15:06:57 +08:00
chenxi
14167e5736 金猪倒计时 2023-06-13 12:00:06 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
chenxi
20aea655a1 支付转菊花 2023-06-12 22:19:42 +08:00
chenxi
e81eab8c4f 编译 2023-06-12 18:27:47 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
chenxi
ba0a25fde5 编译 2023-06-08 18:32:37 +08:00
chenxi
52ad339930 fix bug 2023-06-07 19:50:16 +08:00
xiekaidong
a0f67c414a 主界面关卡宝箱领取显示bug修复 2023-06-07 10:31:24 +08:00
chenxi
e44e390e88 编译 2023-06-06 21:13:13 +08:00
xiekaidong
de19bdfa8b 显示bug修复 2023-06-06 20:37:54 +08:00
CloudJ
4b7294b8ad 编译 2023-06-06 17:51:48 +08:00
Fang
49af10d8a9 战斗退出后显示主界面控制 2023-06-06 17:31:34 +08:00
CloudJ
a7756805cb 编译 2023-06-06 17:12:25 +08:00
chenxi
3483961cc5 超过5秒提示网络断开连接 2023-06-06 15:30:54 +08:00
xiekaidong
77cd8d33ac 编译lua 2023-06-06 15:06:56 +08:00
xiekaidong
641afee2f7 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 14:13:10 +08:00
xiekaidong
ffcfe93299 切换波次时自动关闭buff弹窗 2023-06-06 14:13:07 +08:00
chenxi
29a6483899 编译 2023-06-06 12:01:23 +08:00
xiekaidong
85eff9cbec 调快速度 2023-06-06 11:56:34 +08:00
chenxi
f245ce203c 编译 2023-06-06 11:46:17 +08:00
chenxi
8a8eb8c14b 编译 2023-06-06 11:45:49 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
xiekaidong
247f64e371 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/common/audio_manager.lua.bytes
2023-06-06 11:32:34 +08:00
xiekaidong
c10a2e6b71 显示优化 2023-06-06 11:32:22 +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