2021 Commits

Author SHA1 Message Date
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
95a13a09bb 修复bug 2023-07-11 11:41:57 +08:00
xiekaidong
d9ffcd187e 更新配置 v1.0.2_andoird v1.0.2_ios v1.1.2_ios 2023-07-11 11:11:30 +08:00
xiekaidong
61a23d81c9 Merge branch 'master' into dev_20230712 2023-07-11 11:05:47 +08:00
xiekaidong
0157ca5d27 一些日志上报混乱修复 2023-07-11 11:02:14 +08:00
xiekaidong
552e604167 修改上报参数,bug修复 2023-07-11 10:20:37 +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
xiekaidong
b1561991c6 更新配置 v1.0.1_android v1.0.1_ios v1.1.1_ios 2023-07-10 18:30:30 +08:00
Fang
635a37e3f5 竞技场布阵优化 2023-07-10 18:26:54 +08:00
xiekaidong
0beaf804a9 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:11 +08:00
xiekaidong
a334622cbb bug修复 2023-07-10 16:44:29 +08:00
xiekaidong
1759c04305 修改战斗伤害公式 2023-07-10 16:07:32 +08:00
xiekaidong
e12bb83ac2 竞技场引导优化 2023-07-10 15:46:48 +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
da664585a0 Merge branch 'master' into dev
# Conflicts:
#	lua/app/module/battle/controller/battle_controller.lua
v1.0.0_android v1.0.0_ios v1.1.0_ios
2023-07-07 17:17:01 +08:00
xiekaidong
c8724b978f 更新配置 2023-07-07 16:53:19 +08:00
xiekaidong
0b747a1071 二确认弹窗修复 2023-07-07 16:10:02 +08:00
xiekaidong
576320840a 更新配置 2023-07-07 16:06:11 +08:00
xiekaidong
8e0160b5b7 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-07 15:47:01 +08:00
xiekaidong
d365365645 首包界面 2023-07-07 15:46:58 +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
xiekaidong
f210e72284 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-06 21:49:46 +08:00
xiekaidong
8bea91e63e 加一行代码 2023-07-06 21:49:35 +08:00
Fang
7eabeeb752 超框 2023-07-06 19:23:17 +08:00
xiekaidong
a2f900eed4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-06 18:43:05 +08:00
xiekaidong
28b9d2bc7f bug修复 2023-07-06 18:43:02 +08:00
Fang
34dfc5edb2 fix 2023-07-06 18:30: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
2a6d74482f 导表 2023-07-06 18:19:11 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
0445086500 竞技场日志上报 2023-07-06 18:08:53 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
xiekaidong
7d8b58cef3 bug修复 2023-07-06 17:28:23 +08:00