630 Commits

Author SHA1 Message Date
Fang
a8b82718d0 1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值3、修改副本入口命名 2023-07-28 18:05:35 +08:00
xiekaidong
fb4140d219 增加容错 2023-07-28 10:49:49 +08:00
Fang
f004f4ca4a 英雄收集文案fix、武器升级动效显示fix 2023-07-28 09:51:02 +08:00
Fang
75e63b9685 红点修改 2023-07-27 12:03:11 +08:00
Fang
2f1aa1145e 英雄图鉴红点fix 2023-07-27 10:33:31 +08:00
xiekaidong
34a4fd6725 显示优化 2023-07-27 09:51:23 +08:00
Fang
9bc06371fb 编译 2023-07-26 18:23:37 +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
Fang
5431c724af fix 2023-07-25 23:33:30 +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
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +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
8a1e124054 优化显示 2023-07-25 21:52:41 +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
Fang
698bf8e05c 编译 2023-07-25 18:12:06 +08:00
xiekaidong
c9ffa43d94 bug修复 2023-07-25 17:17:05 +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
d829c85777 编译 2023-07-25 16:13:33 +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
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
Fang
60652a2829 防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画、武器漂浮动画 2023-07-24 21:07:54 +08:00
xiekaidong
8c3abfac91 bug修复 2023-07-26 00:18:57 +08:00
xiekaidong
aaf9e7520c Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
#	Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
2023-07-24 18:48:16 +08:00
xiekaidong
3cfb991ee9 调整一下逻辑 2023-07-24 18:48:04 +08:00
Fang
04730d1ad9 装备属性加成计算fix 2023-07-24 18:38:23 +08:00
xiekaidong
b4ddfb7945 一些报错修复 2023-07-24 18:32:51 +08:00
xiekaidong
894c979aa9 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-24 17:11:03 +08:00
xiekaidong
a3ab8f74fa 副本引导 2023-07-24 17:10:59 +08:00
Fang
79fbc712f3 商城特惠加装备banner、装备礼包弹出规则fix 2023-07-24 17:08:28 +08:00
Fang
7879d441bd 道具获取扫荡文案修改、武器界面加anim组件 2023-07-24 15:59:13 +08:00
Fang
704dac4fa7 礼包资源上传、bug_fix 2023-07-24 15:13:32 +08:00
Fang
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
xiekaidong
288379dbc2 字段修改 2023-07-24 14:10:39 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
xiekaidong
b6116656d7 显示修改 2023-07-24 11:40:30 +08:00
xiekaidong
3506bc596f 修改描述 2023-07-24 11:22:42 +08:00