2594 Commits

Author SHA1 Message Date
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
xiekaidong
fc1a1edfef Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712 2023-07-12 10:21:04 +08:00
xiekaidong
1286af0c82 入门礼包修复 2023-07-12 10:21:01 +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
db01fdc430 预制体修改 2023-07-11 18:37:00 +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
chenxi
054d28b725 热更 v1.0.2_andoird v1.0.2_ios v1.1.2_ios 2023-07-11 14:54:47 +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
chenxi
4c5c8e1fd7 Merge branch 'dev_20230710_hotupdate' v1.0.1_android v1.0.1_ios v1.1.1_ios 2023-07-10 18:46:08 +08:00
xiekaidong
057b8e7a73 Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712 2023-07-10 18:44:44 +08:00
xiekaidong
1f204e3f0f 英雄试玩 2023-07-10 18:44:40 +08:00
xiekaidong
36af88f4b5 更新配置 2023-07-10 18:30:47 +08:00
Fang
28661c3f03 竞技场布阵优化 2023-07-10 18:27:35 +08:00
xiekaidong
cd0a81c0db 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:59 +08:00
chenxi
b113e1b4d5 FB参数 v1.1.0_ios 2023-07-10 17:12:42 +08:00
chenxi
90bc5ac220 提升版本 2023-07-10 16:30:01 +08:00
xiekaidong
47a5446628 修改战斗伤害公式 2023-07-10 16:07:46 +08:00
xiekaidong
db42f547d4 竞技场引导优化 2023-07-10 15:47:10 +08:00
xiekaidong
1107b0831d 竞技场匹配阵容提示优化 2023-07-10 15:39:59 +08:00
xiekaidong
aec6bfc13c 竞技场引导问题修复 2023-07-10 15:22:56 +08:00
xiekaidong
9ffe0ff7cf 竞技场引导容错 2023-07-10 14:13:35 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
chenxi
5cb76715b5 深度链接 2023-07-10 11:50:14 +08:00
chenxi
c7d7264156 ios version v1.0.0_android v1.0.0_ios 2023-07-07 22:29:13 +08:00
Fang
6b151b7f98 ui适配 2023-07-07 20:30:08 +08:00
Fang
6e1c66bd22 竞技场界面处理刘海屏 2023-07-07 20:25:22 +08:00
xiekaidong
c7a6071937 设置abname 2023-07-07 20:16:27 +08:00
chenxi
cf68df4e6b 提升版本号 2023-07-07 18:54:05 +08:00
xiekaidong
91e33365b7 first字体大小调整 2023-07-07 18:45:07 +08:00
xiekaidong
c8e1980dac 编译lua 2023-07-07 17:20:00 +08:00
xiekaidong
07c8ef8648 Merge branch 'master' into dev
# Conflicts:
#	Assets/Editor/JenkinsAdapter.cs
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
2023-07-07 17:14:54 +08:00
chenxi
10d5a193cc 正式包 2023-07-07 17:00:45 +08:00
xiekaidong
3197d7cc7d 更新配置 2023-07-07 16:53:40 +08:00
xiekaidong
c79d0eebae 二确认弹窗修复 2023-07-07 16:10:14 +08:00
xiekaidong
ae12ce4101 更新配置 2023-07-07 16:06:18 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00