924 Commits

Author SHA1 Message Date
Fang
2c7f90f837 英雄升级报错fix 2023-07-20 20:28:30 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
Fang
622234139b review 2023-07-20 19:35:17 +08:00
Fang
f01c611d72 导表 2023-07-20 19:35:17 +08:00
Fang
043dbf29c1 review 2023-07-20 19:35:17 +08:00
Fang
047f17e6f3 装备系统 2023-07-20 19:35:17 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
Fang
0d5df08e09 满级英雄收集点数显示fix 2023-07-18 14:30:49 +08:00
xiekaidong
0d18dac853 编译lua 2023-07-18 09:35:11 +08:00
xiekaidong
32704fc6cc Merge branch 'master' into dev_20230725
# Conflicts:
#	Assets/lua/app/ui/hero/hero_comp.lua.bytes
2023-07-18 09:34:10 +08:00
xiekaidong
8978455495 战斗引导问题 2023-07-17 18:38:25 +08:00
xiekaidong
e343016c9f 更新日语多语言 2023-07-17 17:40:30 +08:00
xiekaidong
86cf2f3a20 功能开启异常飘字修复,引导异常修复 2023-07-17 17:33:21 +08:00
xiekaidong
b620281b43 更新配置和优化 2023-07-17 17:21:20 +08:00
xiekaidong
11ea2e87fc 战报阵容 2023-07-17 15:52:44 +08:00
Fang
6f8acc2673 新号报错处理 2023-07-17 15:18:57 +08:00
Fang
56f5506bba review 2023-07-17 11:17:19 +08:00
Fang
ce09322f82 红点 2023-07-14 17:36:18 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
chenxi
dd4d99c673 ab name 2023-07-14 16:28:28 +08:00
Fang
580bb37878 英雄信息界面金币改变刷新fix 2023-07-14 16:12:47 +08:00
Fang
6ea28967be 礼包入口spine、更表 2023-07-14 15:27:27 +08:00
xiekaidong
8328738e0f 优化章节礼包弹出逻辑 2023-07-13 16:53:15 +08:00
xiekaidong
641deeedf0 侧边栏增加前往优惠商城的按钮,修改战斗内技能链接显示bug 2023-07-13 15:52:56 +08:00
xiekaidong
6cbbcdfe9a 网络优化和bug修复 2023-07-13 11:14:29 +08:00
xiekaidong
663b851c63 设置界面跳转链接处理 2023-07-12 17:35:34 +08:00
xiekaidong
c0e6409eea 引导问题 2023-07-12 16:46:44 +08:00
xiekaidong
6e3fb79498 引导问题修复 2023-07-12 16:02:47 +08:00
xiekaidong
07bfc6b006 修改引导逻辑,防止异常卡死 2023-07-12 15:45:20 +08:00
xiekaidong
a19624ff92 更新配置 2023-07-12 14:58:26 +08:00
xiekaidong
bbda3be68f 出包前资源检查和设置ABName 2023-07-12 14:56:43 +08:00
Fang
05478ef129 新成长礼包不显示限购次数 2023-07-12 10:30:54 +08:00
Fang
fad7069e88 入门礼包界面显示fix 2023-07-12 10:20:01 +08:00
Fang
2eae3a5817 首充礼包界面显示fix 2023-07-12 10:13:05 +08:00
xiekaidong
e1120e654b 编译lua 2023-07-12 09:49:10 +08:00
xiekaidong
364d84ae09 Merge branch 'master' into dev_20230712
# Conflicts:
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/module/login/login_manager.lua.bytes
2023-07-12 09:48:12 +08:00
xiekaidong
03106ca454 试玩 2023-07-12 09:44:32 +08:00
Fang
de6de7f77e 竞技场重新匹配无cd时添加文案 2023-07-11 18:31:43 +08:00
xiekaidong
6576bb731b Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712
# Conflicts:
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
2023-07-11 15:46:43 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
392134a777 碎片弹窗标题消失fix 2023-07-11 15:14:28 +08:00
Fang
eb54d58240 碎片副本奖励展示优化 2023-07-11 14:53:58 +08:00
xiekaidong
3ff2ce8651 bug修复 2023-07-11 11:43:05 +08:00
xiekaidong
23e7f5f465 更新配置 2023-07-11 11:12:02 +08:00
xiekaidong
85c0709552 Merge branch 'master' into dev_20230712 2023-07-11 11:05:55 +08:00
xiekaidong
678d368026 一些日志上报混乱修复 2023-07-11 11:02:33 +08:00
xiekaidong
a2e84ce943 修改上报参数,bug修复 2023-07-11 10:21:05 +08:00
xiekaidong
1f204e3f0f 英雄试玩 2023-07-10 18:44:40 +08:00
xiekaidong
36af88f4b5 更新配置 2023-07-10 18:30:47 +08:00
xiekaidong
cd0a81c0db 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:59 +08:00