xiekaidong
|
99a26d953d
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:18 +08:00 |
|
xiekaidong
|
f527141d7b
|
Merge branch 'master' into dev_20230712
|
2023-07-12 09:48:18 +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
|
7de42dd068
|
碎片副本奖励展示优化
|
2023-07-11 14:53:19 +08:00 |
|
xiekaidong
|
95a13a09bb
|
修复bug
|
2023-07-11 11:41:57 +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
|
b1561991c6
|
更新配置
|
2023-07-10 18:30:30 +08:00 |
|
xiekaidong
|
0beaf804a9
|
用户属性主线阵容上报信息错误修复，竞技场消耗上报增加段位id，竞技场结算上报增加胜负
|
2023-07-10 17:46:11 +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
|
460a60a34f
|
木兰试玩
|
2023-07-10 12:00:32 +08:00 |
|
xiekaidong
|
da664585a0
|
Merge branch 'master' into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller.lua
|
2023-07-07 17:17:01 +08:00 |
|
Fang
|
b16f75f42e
|
竞技场挑战前判断阵容、超框
|
2023-07-07 11:54:27 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +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 |
|
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
|
dc386c2bdb
|
网络模块优化，重连被拒绝后，后台静默重新登陆
|
2023-07-06 17:20:16 +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
|
9a7b8d316d
|
竞技场bi上报
|
2023-07-06 11:59:28 +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 |
|
xiekaidong
|
e597b9f7be
|
战斗中属性加密
|
2023-07-05 17:05:17 +08:00 |
|
xiekaidong
|
960bf2eb5f
|
竞技场引导
|
2023-07-05 15:46:43 +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
|
21365f487e
|
显示问题修复
|
2023-07-05 14:25:27 +08:00 |
|
xiekaidong
|
afd2c11ef1
|
连击提示
|
2023-07-05 11:22:46 +08:00 |
|
xiekaidong
|
9718eca3d7
|
竞技场任务
|
2023-07-05 10:15:33 +08:00 |
|
xiekaidong
|
c1592accae
|
敌方也显示combo
|
2023-07-04 21:04:50 +08:00 |
|
xiekaidong
|
d030ee5988
|
bug修复
|
2023-07-04 20:21:23 +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
|
6099fe08fb
|
fix
|
2023-07-04 18:29:05 +08:00 |
|
xiekaidong
|
e73346b5d6
|
客服红点
|
2023-07-04 18:14:46 +08:00 |
|
xiekaidong
|
8569147e4c
|
更新协议
|
2023-07-04 18:14:09 +08:00 |
|
xiekaidong
|
47d5b00318
|
取消连线
|
2023-07-04 18:05:17 +08:00 |
|
xiekaidong
|
12ba5a0430
|
临时处理一下
|
2023-07-04 15:51:45 +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 |
|