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 |
|
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 |
|
Fang
|
dfb1967899
|
竞技场战令文案替换
|
2023-07-06 14:42:10 +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 |
|
xiekaidong
|
c9b32741cb
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 17:55:03 +08:00 |
|
xiekaidong
|
7abf7a253b
|
bug修复
|
2023-07-05 17:54:59 +08:00 |
|
Fang
|
73b3a451e9
|
修改头像框界面布局、竞技场赛季刷新fix等
|
2023-07-05 17:48:46 +08:00 |
|
Fang
|
f24f8d5e75
|
显示修复
|
2023-07-05 15:55:44 +08:00 |
|
xiekaidong
|
7c3f2cd890
|
竞技场开启引导
|
2023-07-05 15:45:28 +08:00 |
|
xiekaidong
|
51f709f3f3
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 15:33:42 +08:00 |
|
xiekaidong
|
cb34322f99
|
竞技场解锁动画
|
2023-07-05 15:33:39 +08:00 |
|
Fang
|
68f80b45d3
|
竞技场ad宝箱功能补全
|
2023-07-05 15:02:59 +08:00 |
|
xiekaidong
|
c2622e3013
|
bug修复
|
2023-07-05 14:44:48 +08:00 |
|
xiekaidong
|
21365f487e
|
显示问题修复
|
2023-07-05 14:25:27 +08:00 |
|
xiekaidong
|
9ae7f3d8a0
|
英雄红点
|
2023-07-05 11:45:41 +08:00 |
|
xiekaidong
|
6209b4be52
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-05 11:22:49 +08:00 |
|
xiekaidong
|
afd2c11ef1
|
连击提示
|
2023-07-05 11:22:46 +08:00 |
|
Fang
|
bb12bdd100
|
添加段位变化特效
|
2023-07-05 11:14:37 +08:00 |
|
Fang
|
c07a54b828
|
竞技场fix
|
2023-07-05 10:51:13 +08:00 |
|
xiekaidong
|
d4237d18b9
|
适配
|
2023-07-05 10:42:28 +08:00 |
|
xiekaidong
|
9718eca3d7
|
竞技场任务
|
2023-07-05 10:15:33 +08:00 |
|
xiekaidong
|
c1592accae
|
敌方也显示combo
|
2023-07-04 21:04:50 +08:00 |
|
xiekaidong
|
faf1e2487d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-04 20:13:28 +08:00 |
|
xiekaidong
|
d7cf21fde6
|
竞技场波次显示
|
2023-07-04 20:13:24 +08:00 |
|
Fang
|
5c4cfdcf28
|
段位图标重叠fix
|
2023-07-04 18:50:18 +08:00 |
|
Fang
|
6099fe08fb
|
fix
|
2023-07-04 18:29:05 +08:00 |
|
xiekaidong
|
045b774449
|
战斗速度
|
2023-07-04 18:24:33 +08:00 |
|
xiekaidong
|
47d5b00318
|
取消连线
|
2023-07-04 18:05:17 +08:00 |
|
xiekaidong
|
ce97be9b65
|
Merge branch 'dev' into arena
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
# lua/app/module/battle/controller/battle_controller.lua
# lua/app/ui/main_city/main_city_ui.lua
|
2023-07-04 15:36:04 +08:00 |
|
Fang
|
5cd90eab7e
|
fix
|
2023-07-04 15:14:41 +08:00 |
|
xiekaidong
|
6b60a73944
|
竞技场主动退出判负
|
2023-07-04 15:12:33 +08:00 |
|