457 Commits

Author SHA1 Message Date
xiekaidong
59895e47bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 21:18:32 +08:00
xiekaidong
4f3dc135a2 显示·问题 2023-06-20 21:18:14 +08:00
Fang
9810b012e0 超框 2023-06-20 21:08:40 +08:00
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
Fang
7c79623e92 超框处理 2023-06-20 18:43:08 +08:00
xiekaidong
48be4a8731 显示bug修复 2023-06-20 18:30:43 +08:00
xiekaidong
5938486e5b bug修复 2023-06-20 18:09:54 +08:00
chenxi
622d9918d3 ab name 2023-06-20 14:32:36 +08:00
Fang
0d624772e7 添加头像背景品质 2023-06-20 14:23:48 +08:00
chenxi
c5053df18a 主城底部按钮 2023-06-20 12:05:10 +08:00
Fang
ccd4276e6f 英雄编队拆分出来 2023-06-20 11:08:11 +08:00
Fang
700b38d1fc 添加重命名与当前昵称相同提示 2023-06-19 16:25:25 +08:00
Fang
3432c69fa1 fix 2023-06-19 16:08:03 +08:00
Fang
8f5e9cb336 选择头像/头像框时,添加预览效果 2023-06-19 16:05:09 +08:00
Fang
7939d1630d 跨天关闭副本关卡选择界面 2023-06-19 16:00:11 +08:00
Fang
dfa698542b 玩家头像抽象成独立cell 2023-06-19 14:59:02 +08:00
xiekaidong
e81062f43b buff回合数等于1时也显示 2023-06-19 12:03:45 +08:00
Fang
8c7286c1b8 编译 2023-06-19 11:58:44 +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
chenxi
3f855b2357 界面调整 2023-06-16 17:36:57 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
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