1184 Commits

Author SHA1 Message Date
xiekaidong
27ef576c8f 副本入口 2023-07-18 21:00:12 +08:00
xiekaidong
2610718eb2 副本入口 2023-07-18 17:01:27 +08:00
Fang
7a6d84c902 满级英雄收集点数显示fix 2023-07-18 14:30:21 +08:00
xiekaidong
2c379e55a1 功能开启异常飘字修复,引导异常修复 2023-07-17 17:32:55 +08:00
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +08:00
xiekaidong
e2d08a7ffa 战报阵容 2023-07-17 15:52:04 +08:00
陈希
ee64fb61d9 Merge branch 'fang/collect' into 'dev_20230725'
英雄图鉴

See merge request b6-client/b6-lua!5
2023-07-17 03:19:35 +00:00
Fang
3025a7e58a review 2023-07-17 11:16:51 +08:00
xiekaidong
6249f3bd3e 引导bug修复 2023-07-17 10:34:10 +08:00
Fang
e2ef9ea208 红点 2023-07-14 17:35:55 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
Fang
5e985f7743 英雄信息界面金币改变刷新fix 2023-07-14 16:12:19 +08:00
Fang
fe2f7de08b 礼包入口spine 2023-07-14 15:26:38 +08:00
xiekaidong
99a26d953d 侧边栏增加前往优惠商城的按钮,修改战斗内技能链接显示bug 2023-07-13 15:52:18 +08:00
xiekaidong
a0fedc60ad 设置界面跳转链接处理 2023-07-12 17:35:23 +08:00
xiekaidong
8c3ce37bbe 引导问题 2023-07-12 16:46:21 +08:00
xiekaidong
9f9ee9e1d9 引导问题修复 2023-07-12 16:02:38 +08:00
xiekaidong
62989cb4cf 修改引导逻辑,防止异常卡死 2023-07-12 15:44:54 +08:00
Fang
69502e9e51 新成长礼包不显示限购次数 2023-07-12 10:30:24 +08:00
Fang
fc5aec8396 入门礼包界面显示fix 2023-07-12 10:19:30 +08:00
Fang
46208b01b3 首充礼包道具底框消失fix 2023-07-12 10:11:54 +08:00
xiekaidong
061ac748ec 试玩 2023-07-12 09:43:49 +08:00
Fang
0f3f3fa664 竞技场重新匹配无cd时添加文案 2023-07-11 18:31:04 +08:00
xiekaidong
68567319a6 Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-lua into dev_20230712
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
2023-07-11 15:45:24 +08:00
xiekaidong
dde65f49c3 设置界面新增社区链接按钮 2023-07-11 15:45:14 +08:00
Fang
a7d2655c8c 碎片弹窗标题消失fix 2023-07-11 15:13:53 +08:00
Fang
7de42dd068 碎片副本奖励展示优化 2023-07-11 14:53:19 +08:00
xiekaidong
dba2cf5b42 Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-lua into dev_20230712 2023-07-10 18:43:43 +08:00
xiekaidong
a15e60d6fe 英雄试玩 2023-07-10 18:43:40 +08:00
Fang
635a37e3f5 竞技场布阵优化 2023-07-10 18:26:54 +08:00
xiekaidong
0a78db2330 竞技场匹配阵容提示优化 2023-07-10 15:39:39 +08:00
xiekaidong
e68de8da6c 竞技场引导问题修复 2023-07-10 15:22:20 +08:00
xiekaidong
351b8adb9e 竞技场引导容错 2023-07-10 14:12:53 +08:00
xiekaidong
460a60a34f 木兰试玩 2023-07-10 12:00:32 +08:00
xiekaidong
8e17ed9850 技能显示bug修复 2023-07-07 18:00:02 +08:00
xiekaidong
0b747a1071 二确认弹窗修复 2023-07-07 16:10:02 +08:00
Fang
c4aed1b62d 主界面英雄页图标显示处理 2023-07-07 15:39:50 +08:00
xiekaidong
b9c9b4d0ce 审核模式不显示竞技场礼包 2023-07-07 14:13:12 +08:00
xiekaidong
870a1e32d0 提审状态不显示竞技场战令 2023-07-07 14:06:01 +08:00
xiekaidong
3cb9989ddb 战斗技能tips 2023-07-07 12:06:54 +08:00
xiekaidong
8462dd5898 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/ui/tips/battle_board_skill_tips.lua
2023-07-07 11:59:57 +08:00
xiekaidong
adc1186019 技能提示 2023-07-07 11:59:25 +08:00
Fang
b16f75f42e 竞技场挑战前判断阵容、超框 2023-07-07 11:54:27 +08:00
xiekaidong
b6171cef38 竞技场暂停界面可滑动 2023-07-07 11:43:53 +08:00
xiekaidong
a34edc2fd7 快捷切换多语言 2023-07-07 11:39:30 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
Fang
7eabeeb752 超框 2023-07-06 19:23:17 +08:00
xiekaidong
8ecb19d48c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-06 18:24:59 +08:00
xiekaidong
9ff9550fb5 日志上报 2023-07-06 18:24:53 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00