xiekaidong
|
da664585a0
|
Merge branch 'master' into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller.lua
|
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 |
|
xiekaidong
|
ffd98d8270
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-06 17:20:19 +08:00 |
|
xiekaidong
|
dc386c2bdb
|
网络模块优化，重连被拒绝后，后台静默重新登陆
|
2023-07-06 17:20:16 +08:00 |
|
Fang
|
eedd7bd918
|
碎片界面标题修改
|
2023-07-06 17:06:49 +08:00 |
|
xiekaidong
|
a53dc6d688
|
未及时收到回复、断开连接、未定义error，主动静默重连，不弹窗提示
|
2023-07-06 15:17:08 +08:00 |
|
xiekaidong
|
f65285bf46
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-06 14:43:51 +08:00 |
|
xiekaidong
|
994e93468c
|
引导延迟
|
2023-07-06 14:43:48 +08:00 |
|
Fang
|
dfb1967899
|
竞技场战令文案替换
|
2023-07-06 14:42:10 +08:00 |
|
Fang
|
9a7b8d316d
|
竞技场bi上报
|
2023-07-06 11:59:28 +08:00 |
|
Fang
|
b65ffa68fc
|
竞技场未上榜显示处理
|
2023-07-06 11:40:01 +08:00 |
|
xiekaidong
|
6c7418fd54
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-06 10:38:28 +08:00 |
|
xiekaidong
|
25dc1fe0b5
|
显示问题修复
|
2023-07-06 10:38:20 +08:00 |
|
Fang
|
47418bab2e
|
竞技场宝箱增加每日次数控制
|
2023-07-06 10:24:53 +08:00 |
|
Fang
|
c09f030e2a
|
竞技场战令容错处理
|
2023-07-06 10:23:56 +08:00 |
|
Fang
|
ebaf680eeb
|
头像框解锁fix
|
2023-07-06 10:23:56 +08:00 |
|
xiekaidong
|
398880e440
|
竞技场弹出礼包
|
2023-07-06 10:15:37 +08:00 |
|
xiekaidong
|
d90bff1941
|
引导
|
2023-07-06 09:57:57 +08:00 |
|
xiekaidong
|
5b4e6e3a05
|
抽卡结束不关闭抽卡界面
|
2023-07-05 22:05:45 +08:00 |
|
xiekaidong
|
f13f1f3e3a
|
引导处理一下
|
2023-07-05 21:58:38 +08:00 |
|
xiekaidong
|
592eb102ef
|
竞技场弹出礼包
|
2023-07-05 21:01:18 +08:00 |
|
Fang
|
dea1136538
|
竞技场ad宝箱权重奖励展示
|
2023-07-05 19:05:55 +08:00 |
|
xiekaidong
|
0162bce262
|
显示
|
2023-07-05 18:35:58 +08:00 |
|