459 Commits

Author SHA1 Message Date
chenxi
569843691f 弹出框 2023-06-15 16:44:31 +08:00
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +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
0dd3747804 维护公告界面 2023-06-13 21:01:23 +08:00
chenxi
481af73ddb cdkey临时界面 2023-06-13 20:54:29 +08:00
Fang
0308d2f57d ui细节调整 2023-06-13 17:34:28 +08:00
Fang
656f096c03 ui资源补充替换 2023-06-13 16:16:29 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
chenxi
14167e5736 金猪倒计时 2023-06-13 12:00:06 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
chenxi
c64dcdf8f9 苹果账号绑定界面 2023-06-13 10:41:58 +08:00
Fang
9dc58eea91 奖励显示逻辑补充 2023-06-12 18:33:28 +08:00
Fang
f1f805feaf 修改预制体 2023-06-12 17:14:36 +08:00
Fang
6aa23549f5 活动副本 2023-06-12 15:40:03 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
xiekaidong
36490e20fa Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 21:26:51 +08:00
xiekaidong
1996dbf284 界面处理 2023-06-06 21:26:48 +08:00
chenxi
0f1588059e 登录界面 2023-06-06 21:12:12 +08:00
chenxi
aef3b9834a 战令界面微调 2023-06-06 18:39:34 +08:00
chenxi
b88815d16f 战令界面 2023-06-06 17:32:58 +08:00
chenxi
19ebceb54b 刷新一下 2023-06-06 15:10:31 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
xiekaidong
c10a2e6b71 显示优化 2023-06-06 11:32:22 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +08:00
chenxi
b409ab7e86 资源 2023-06-06 10:35:12 +08:00
CloudJ
ee24231070 替换界面 2023-06-06 10:16:30 +08:00
chenxi
1299aa14c6 logo 2023-06-05 21:06:28 +08:00
chenxi
e8cbf8ebc6 ui 2023-06-05 21:05:24 +08:00
chenxi
0e93f635ba 红点位置 2023-06-05 20:41:57 +08:00
chenxi
585f501282 任务红点 2023-06-05 20:32:58 +08:00
CloudJ
6d843a4f12 多语言问题 2023-06-05 20:32:00 +08:00
CloudJ
7bb5e7c18d 编译 2023-06-05 20:17:55 +08:00
xiekaidong
a9baeccc0e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 20:07:13 +08:00
xiekaidong
9040c5d2ae 特效 2023-06-05 20:07:09 +08:00
chenxi
22b2bc9553 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 19:54:58 +08:00
chenxi
83363f4694 主城资源 2023-06-05 19:54:50 +08:00
xiekaidong
15bc158263 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 19:50:13 +08:00
xiekaidong
7a00b64dcf 音效资源上传 2023-06-05 19:50:10 +08:00
CloudJ
6fd6a62469 调整字体 2023-06-05 19:43:37 +08:00
chenxi
d1ec620837 资源自动处理和ab name 2023-06-05 19:19:17 +08:00
Fang
229690f71b 结算界面动画替换、每日挑战背景替换 2023-06-05 19:08:31 +08:00
chenxi
818cef2b0f 英雄详情界面 2023-06-05 18:53:25 +08:00
chenxi
7224512691 充值后提示绑定 2023-06-05 18:33:48 +08:00
Fang
123128ce1f 结算界面金猪动画 2023-06-05 18:30:16 +08:00
chenxi
54919c6898 七天乐界面 2023-06-05 18:08:18 +08:00
Fang
ef3600bc81 每日挑战火盆加火动画 2023-06-05 18:07:43 +08:00
chenxi
7963b91bbd 七天乐换界面 2023-06-05 17:57:32 +08:00