3010 Commits

Author SHA1 Message Date
xiekaidong
122043a733 删除资源 2023-09-19 20:16:48 +08:00
Fang
01d6a4b439 圆月头像框上传 2023-09-19 20:02:37 +08:00
xiekaidong
55c5ad0741 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 19:41:48 +08:00
xiekaidong
c710842d63 资源修复 2023-09-19 19:41:44 +08:00
Fang
4756312d3c 超框处理 2023-09-19 18:45:28 +08:00
xiekaidong
70c822b986 更新资源 2023-09-19 18:36:21 +08:00
xiekaidong
798fb612d3 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
# Conflicts:
#	Assets/lua/app/config/strings/ja/global.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
2023-09-19 18:34:25 +08:00
xiekaidong
24a0670365 配置更新 2023-09-19 18:34:04 +08:00
Fang
f40b937012 更表、超框处理 2023-09-19 18:31:31 +08:00
xiekaidong
0d8a07e5fa Merge branch 'sdk_2' into dev_20230919 2023-09-19 18:24:09 +08:00
xiekaidong
5f5d13a898 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 18:13:14 +08:00
xiekaidong
60cb67ca4d bug修复 2023-09-19 18:13:11 +08:00
Fang
a68d772eb3 添加符文上报、符文动效fix、皮肤解锁头像fix、属性展示fix 2023-09-19 17:28:10 +08:00
xiekaidong
0aa578ce70 音效 2023-09-19 17:27:29 +08:00
xiekaidong
1d74ee3b77 bug修复 2023-09-19 17:17:18 +08:00
xiekaidong
78c5077f5b 更新资源 2023-09-19 16:51:46 +08:00
xiekaidong
6cfbfbbe50 资源替换 2023-09-19 16:43:00 +08:00
xiekaidong
02f32f15df 上报抽卡次数、特效 2023-09-19 16:05:58 +08:00
xiekaidong
d47ae896cd Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 15:49:54 +08:00
xiekaidong
267d580dad 特效 2023-09-19 15:45:20 +08:00
zhangpengfei
1815903a06 皮肤动画修改 2023-09-19 15:31:21 +08:00
xiekaidong
33e280187a 替换资源 2023-09-19 15:24:57 +08:00
xiekaidong
c686640095 更新配置 2023-09-19 15:04:13 +08:00
xiekaidong
16da88351d Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
# Conflicts:
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/en/equip.lua.bytes
#	Assets/lua/app/config/strings/ja/global.lua.bytes
#	Assets/lua/app/config/strings/vi/task_type.lua.bytes
#	Assets/lua/app/config/strings/zh/task_type.lua.bytes
#	Assets/lua/app/ui/hero/runes_info_comp.lua.bytes
2023-09-19 15:03:53 +08:00
xiekaidong
d32e88ac01 编译lua 2023-09-19 15:03:21 +08:00
Fang
0b59c2d77d 符文动画、属性fix 2023-09-19 15:03:02 +08:00
fb7e273422 符文淬炼-属性动画 2023-09-19 14:45:51 +08:00
chenxi
83016a2aef facebook 2023-09-19 14:45:16 +08:00
xiekaidong
9ca3f79c89 bug修复 2023-09-19 14:30:19 +08:00
xiekaidong
641cccf3c0 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 12:22:24 +08:00
xiekaidong
7057163384 音效 2023-09-19 12:22:20 +08:00
chenxi
1ba9f51ff8 ios package修改 2023-09-19 12:02:11 +08:00
Fang
8ec42e8a10 导入战令banner、fix 2023-09-19 11:52:59 +08:00
5ddfb7eb01 20057hit 2023-09-19 11:51:15 +08:00
Fang
e003e236ec 更表 2023-09-19 11:28:36 +08:00
xiekaidong
92508925bb Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 11:24:12 +08:00
xiekaidong
0942c88d19 设置 2023-09-19 11:24:01 +08:00
Fang
505a7cb8fb fix 2023-09-19 11:22:05 +08:00
xiekaidong
edfc1d0b46 修复 2023-09-19 11:20:59 +08:00
xiekaidong
37979729e0 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 11:05:00 +08:00
xiekaidong
5c3b431d25 提示 2023-09-19 11:04:57 +08:00
Fang
9a44044fa6 修改 2023-09-19 10:59:02 +08:00
xiekaidong
1e766a87c7 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 10:52:15 +08:00
xiekaidong
71058ccfee 增加战斗前后上阵英雄参数,方便查询作弊 2023-09-19 10:52:11 +08:00
Fang
6f5f4d94e9 自动淬炼加同步 2023-09-19 10:51:20 +08:00
Fang
299b03213f 1 2023-09-19 10:44:56 +08:00
Fang
6266224727 预制体修改 2023-09-19 10:42:33 +08:00
Fang
e4b953c193 导入资源 2023-09-19 10:40:16 +08:00
d1306fbb31 20058hit 2023-09-19 10:37:55 +08:00
xiekaidong
1ef890c2b4 更新图集 2023-09-19 10:10:58 +08:00