2594 Commits

Author SHA1 Message Date
chenxi
a77930ec89 AF v1.1.0_android v1.2.0_ios 2023-07-26 00:05:41 +08:00
xiekaidong
1c967bd864 刷新界面 2023-07-25 23:41:42 +08:00
Fang
5431c724af fix 2023-07-25 23:33:30 +08:00
xiekaidong
5906b8053b 资源检查,设置abName 2023-07-25 23:18:24 +08:00
xiekaidong
9f25ac377e bug修复 2023-07-25 23:14:31 +08:00
Fang
5abcbc47e7 支线基金跨阶段fix 2023-07-25 23:11:00 +08:00
Fang
ccacd36da3 更新特效 2023-07-25 22:55:31 +08:00
Fang
2651eafff4 装备礼包重登不弹窗 2023-07-25 22:49:12 +08:00
Fang
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
3bea93894e 增加版本号 2023-07-25 22:11:18 +08:00
xiekaidong
2af5fb2301 资源检查,更新配置,编译lua,更新pb 2023-07-25 22:09:41 +08:00
xiekaidong
6586382722 Merge branch 'master' into dev_20230725
# Conflicts:
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/common/pay_manager.lua.bytes
#	Assets/lua/app/common/sdk_manager.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-25 22:07:22 +08:00
xiekaidong
2104d20eed 资源检查 2023-07-25 22:06:48 +08:00
xiekaidong
8a1e124054 优化显示 2023-07-25 21:52:41 +08:00
xiekaidong
8f360a86c7 bug修复 2023-07-25 21:19:01 +08:00
xiekaidong
728cea36a5 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 21:07:19 +08:00
xiekaidong
251ca6a3a7 资源调整 2023-07-25 21:07:10 +08:00
Fang
298a77cb44 显示修复、导入特效文件 2023-07-25 21:02:08 +08:00
Fang
8506550027 拼写错误fix 2023-07-25 20:28:49 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
xiekaidong
5e6093378c 更新配置 2023-07-25 19:29:18 +08:00
xiekaidong
5b418c4878 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 18:22:42 +08:00
xiekaidong
565b7c9e2e 界面调整 2023-07-25 18:22:40 +08:00
Fang
698bf8e05c 编译 2023-07-25 18:12:06 +08:00
xiekaidong
c9ffa43d94 bug修复 2023-07-25 17:17:05 +08:00
xiekaidong
687f373a2e Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 16:51:01 +08:00
xiekaidong
97708c861a 更新配置 2023-07-25 16:50:58 +08:00
Fang
ab3b086d91 修复英雄首次升级装备报错 2023-07-25 16:48:49 +08:00
xiekaidong
abe953ab9e 更新资源 2023-07-25 16:39:02 +08:00
xiekaidong
282476fbd7 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 16:37:02 +08:00
xiekaidong
8cdcbd5c1f 多语言 2023-07-25 16:36:56 +08:00
Fang
5cff8c0e57 超框、修复报错 2023-07-25 16:33:15 +08:00
Fang
d829c85777 编译 2023-07-25 16:13:33 +08:00
xiekaidong
ebeda8b20e 超框问题 2023-07-25 16:09:25 +08:00
xiekaidong
23ea46e1e2 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
#	Assets/lua/app/config/strings/cn/global.lua.bytes
2023-07-25 16:06:27 +08:00
xiekaidong
4cc90051a4 韩国社区跳转处理 2023-07-25 16:06:17 +08:00
Fang
4d508ec53d 1 2023-07-25 15:45:52 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +08:00
xiekaidong
7752930572 bug修复 2023-07-25 15:36:24 +08:00
xiekaidong
e0e6ebfd4b 显示调整 2023-07-24 22:01:10 +08:00
xiekaidong
a89f9ed725 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-24 21:48:07 +08:00
xiekaidong
2aaf6afd0c 优化 2023-07-24 21:48:04 +08:00
Fang
f821a6e6d1 显示fix 2023-07-24 21:39:48 +08:00
xiekaidong
ae520c3757 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-24 21:20:27 +08:00
xiekaidong
863446d377 bug修复 2023-07-24 21:20:23 +08:00
Fang
60652a2829 防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画、武器漂浮动画 2023-07-24 21:07:54 +08:00
xiekaidong
613e62e3ab 加一个底板 2023-07-24 21:04:54 +08:00
xiekaidong
8b4a69cb90 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-24 20:55:07 +08:00
xiekaidong
0a7c4c5170 bug修复 2023-07-24 20:55:03 +08:00