2594 Commits

Author SHA1 Message Date
xiekaidong
3af52969ec 更新图集 2023-07-05 18:30:11 +08:00
xiekaidong
288370bb15 战斗开始时更新英雄数据 2023-07-05 18:24:56 +08:00
xiekaidong
3405a1b1ae Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 17:55:15 +08:00
xiekaidong
7bedad109d bug修复 2023-07-05 17:55:12 +08:00
Fang
4c45a9db92 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:49:39 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
xiekaidong
6ace7d8845 竞技场引导 2023-07-05 15:47:05 +08:00
xiekaidong
b96a9aca6b 竞技场开启引导 2023-07-05 15:46:03 +08:00
xiekaidong
29c5bb9021 更新配置 2023-07-05 15:36:23 +08:00
xiekaidong
000c335396 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 15:36:02 +08:00
xiekaidong
18f5489ddb 更新资源 2023-07-05 15:35:59 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
Fang
48293f54c1 竞技场宝箱功能补全 2023-07-05 14:54:34 +08:00
xiekaidong
37c4da852d bug修复 2023-07-05 14:45:49 +08:00
xiekaidong
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
9a6ae59dbd 动画 2023-07-05 12:04:15 +08:00
xiekaidong
b267679bcb 英雄红点 2023-07-05 11:46:45 +08:00
zhangpengfei
a1e7fcdf7e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 11:28:55 +08:00
zhangpengfei
d7a02f0682 连击动画修改 2023-07-05 11:28:45 +08:00
xiekaidong
4d2830317a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 11:23:30 +08:00
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +08:00
Fang
55793b1177 添加段位变化特效 2023-07-05 11:15:24 +08:00
zhangpengfei
9fe0c26af5 连击字体动画修改 2023-07-05 11:07:04 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00
xiekaidong
2e605fabc0 适配 2023-07-05 10:42:39 +08:00
zhangpengfei
f93981e096 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 10:31:39 +08:00
zhangpengfei
270a11cbc1 连击动画增加 2023-07-05 10:31:20 +08:00
CloudJ
830e5633f4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-07-05 10:29:03 +08:00
CloudJ
466cbd7a8d thai字体 2023-07-05 10:28:57 +08:00
xiekaidong
6f2edceb71 显示问题 2023-07-05 10:21:46 +08:00
CloudJ
6e799005ad thai 2023-07-05 10:20:51 +08:00
xiekaidong
c5ec2e1853 竞技场任务 2023-07-05 10:16:00 +08:00
xiekaidong
ca456f4bbe bug修复 2023-07-04 20:21:48 +08:00
xiekaidong
0320ef81bd prefab资源检查,更新字体 2023-07-04 20:16:20 +08:00
xiekaidong
41e7e66d01 prefab资源检查,更新字体 2023-07-04 20:16:01 +08:00
xiekaidong
4f0174813a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/atlas/ui/battle.asset
2023-07-04 20:13:58 +08:00
xiekaidong
1acaec8748 竞技场波次显示 2023-07-04 20:13:44 +08:00
Fang
98a14c54c2 段位图标重叠fix 2023-07-04 18:50:44 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
cc0b2c05f8 战斗速度 2023-07-04 18:25:20 +08:00
xiekaidong
f660bfe4e7 客服红点 2023-07-04 18:15:04 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
c4b290c735 临时处理一下 2023-07-04 15:52:07 +08:00
xiekaidong
2f01e53cba 资源问题 2023-07-04 15:41:12 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
xiekaidong
83b8dbe82d Merge branch 'dev' into arena
# Conflicts:
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-04 15:33:45 +08:00
Fang
47fa64a007 中途退出不重置对手 2023-07-04 15:25:06 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
c6bd34ace8 竞技场暂停界面 2023-07-04 15:06:20 +08:00