1025 Commits

Author SHA1 Message Date
xiekaidong
6bc0ce7738 添加一些容错 2023-07-24 17:04:40 +08:00
Fang
fd863d414c 道具获取扫荡文案修改 2023-07-24 15:57:58 +08:00
Fang
8ad4b580e0 礼包资源上传、bug_fix 2023-07-24 15:13:21 +08:00
Fang
fddf41fca5 bug fix 2023-07-24 14:34:52 +08:00
xiekaidong
e42990673e Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 14:08:49 +08:00
xiekaidong
a963053416 字段修改 2023-07-24 14:08:39 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
xiekaidong
13851fb403 显示修改 2023-07-24 11:40:19 +08:00
xiekaidong
1ca93be7f6 修改描述 2023-07-24 11:22:32 +08:00
xiekaidong
dc84eb073d 新增道具宝箱显示 2023-07-24 11:18:21 +08:00
xiekaidong
d7ed50ab8c 处理界面显示 2023-07-24 10:36:25 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
Fang
eac7f683c6 材料获取显示修复 2023-07-21 18:04:13 +08:00
xiekaidong
3148733679 更新配置,上传资源 2023-07-21 17:17:51 +08:00
xiekaidong
f204a47316 试玩弹窗优化 2023-07-21 16:24:04 +08:00
xiekaidong
ee6d36fa48 界面调整 2023-07-21 16:16:36 +08:00
xiekaidong
ff21cd5b2b 界面调整 2023-07-21 16:15:25 +08:00
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