xiekaidong
|
5db24d5a74
|
更新配置
|
2023-07-17 18:05:26 +08:00 |
|
xiekaidong
|
de04cbc6ff
|
更新配置和优化
|
2023-07-17 17:21:00 +08:00 |
|
xiekaidong
|
5691ea1f0b
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-17 15:52:07 +08:00 |
|
xiekaidong
|
e2d08a7ffa
|
战报阵容
|
2023-07-17 15:52:04 +08:00 |
|
Fang
|
fc98c944af
|
新号报错处理
|
2023-07-17 15:18:18 +08:00 |
|
xiekaidong
|
85f016086d
|
层数buff完善
|
2023-07-17 14:46:02 +08:00 |
|
xiekaidong
|
ac9d7dd776
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-17 14:28:58 +08:00 |
|
xiekaidong
|
de16d711ec
|
层数护盾
|
2023-07-17 14:28:55 +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 |
|
chenxi
|
6848735fd9
|
merge master
|
2023-07-14 17:06:39 +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
|
b1dd325b05
|
伤害公式
|
2023-07-13 18:18:22 +08:00 |
|
xiekaidong
|
a69305960b
|
更新配置
|
2023-07-13 18:03:33 +08:00 |
|
xiekaidong
|
29bcf831a3
|
Merge branch 'battle' into dev_20230725
|
2023-07-13 18:03:03 +08:00 |
|
xiekaidong
|
90711c7e2a
|
英雄属性增加，以及战斗伤害治疗公式修改
|
2023-07-13 18:02:46 +08:00 |
|
xiekaidong
|
c0c0c8f93e
|
优化章节礼包弹出逻辑
|
2023-07-13 16:52:38 +08:00 |
|
xiekaidong
|
99a26d953d
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:18 +08:00 |
|
xiekaidong
|
2b0d5b7596
|
网络模块优化和bug提交
|
2023-07-13 11:03:41 +08:00 |
|
xiekaidong
|
3c76dfe2ef
|
网络优化和bug修复
|
2023-07-13 10:35:01 +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 |
|
xiekaidong
|
4c8b8116e3
|
更新配置
|
2023-07-12 14:57:56 +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
|
f527141d7b
|
Merge branch 'master' into dev_20230712
|
2023-07-12 09:48:18 +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
|
95a13a09bb
|
修复bug
|
2023-07-11 11:41:57 +08:00 |
|
xiekaidong
|
d9ffcd187e
|
更新配置
|
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
|
更新配置
|
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 |
|