2414 Commits

Author SHA1 Message Date
Fang
54cdb0fb0b Merge branch 'fang/技能描述' into dev_20230809 2023-07-28 11:47:55 +08:00
Fang
74dec91e6d 技能tips 2023-07-28 11:46:58 +08:00
xiekaidong
2035826fce 提升版本号 v1.1.2_android v1.2.2_ios 2023-07-28 11:28:03 +08:00
xiekaidong
e6858a8eee 邮件拉去增加一个随机延时 2023-07-28 11:18:01 +08:00
xiekaidong
fb4140d219 增加容错 2023-07-28 10:49:49 +08:00
Fang
f004f4ca4a 英雄收集文案fix、武器升级动效显示fix 2023-07-28 09:51:02 +08:00
xiekaidong
1b0abc14c4 版本号还原一下,不用升版本 v1.1.1_android v1.2.1_ios 2023-07-27 17:07:07 +08:00
xiekaidong
a4594e1374 增加版本号 2023-07-27 16:13:55 +08:00
xiekaidong
5bed0fb78c 增加版本号 2023-07-27 12:34:48 +08:00
xiekaidong
56cf140e85 更新配置 2023-07-27 12:33:23 +08:00
Fang
75e63b9685 红点修改 2023-07-27 12:03:11 +08:00
Fang
2f1aa1145e 英雄图鉴红点fix 2023-07-27 10:33:31 +08:00
xiekaidong
b74826ee90 更新配置 2023-07-27 10:28:08 +08:00
xiekaidong
365a1628ba bug修复 2023-07-27 10:04:08 +08:00
xiekaidong
34a4fd6725 显示优化 2023-07-27 09:51:23 +08:00
Fang
9bc06371fb 编译 2023-07-26 18:23:37 +08:00
xiekaidong
85d2281b42 修改 2023-07-26 16:25:45 +08:00
Fang
a43ea6c7d7 编译 2023-07-26 16:15:13 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
xiekaidong
57867145a4 显示优化 2023-07-26 11:48:07 +08:00
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