1158 Commits

Author SHA1 Message Date
xiekaidong
5d433841b5 bug修复 2023-07-21 15:15:21 +08:00
xiekaidong
bab7c281ca 更新配置,英雄排序问题 2023-07-21 11:47:19 +08:00
xiekaidong
dbc99ccb79 优化 2023-07-21 11:41:37 +08:00
xiekaidong
909df16ca7 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-21 11:37:33 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
Fang
10ea4ca114 通行证赛季更新 2023-07-21 11:18:55 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
xiekaidong
4ea04aadc5 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-21 09:49:51 +08:00
xiekaidong
adaacec90f 优化 2023-07-21 09:49:41 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +08:00
xiekaidong
a4a1574ace 支线副本 2023-07-20 21:56:24 +08:00
xiekaidong
d68d2257fe Merge branch 'dev_20230725' into dungeon 2023-07-20 21:47:21 +08:00
xiekaidong
cd41579159 支线副本 2023-07-20 21:46:49 +08:00
Fang
015de6fc70 英雄升级显示、战斗报错fix 2023-07-20 21:23:02 +08:00
xiekaidong
ef1b59db67 支线副本战斗中的任务 2023-07-20 20:41:17 +08:00
xiekaidong
100e125c19 Merge branch 'dev_20230725' into dungeon
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
2023-07-20 19:45:54 +08:00
xiekaidong
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +08:00
xiekaidong
2772c26e81 改名异常修复 2023-07-20 15:10:58 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
854ce2b986 通用扫荡弹窗 2023-07-19 10:39:22 +08:00
xiekaidong
27ef576c8f 副本入口 2023-07-18 21:00:12 +08:00
xiekaidong
2610718eb2 副本入口 2023-07-18 17:01:27 +08:00
Fang
7a6d84c902 满级英雄收集点数显示fix 2023-07-18 14:30:21 +08:00
xiekaidong
2c379e55a1 功能开启异常飘字修复,引导异常修复 2023-07-17 17:32:55 +08:00
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +08:00
xiekaidong
e2d08a7ffa 战报阵容 2023-07-17 15:52:04 +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
Fang
5e985f7743 英雄信息界面金币改变刷新fix 2023-07-14 16:12:19 +08:00
Fang
fe2f7de08b 礼包入口spine 2023-07-14 15:26:38 +08:00
xiekaidong
99a26d953d 侧边栏增加前往优惠商城的按钮,修改战斗内技能链接显示bug 2023-07-13 15:52:18 +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
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
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