30 Commits

Author SHA1 Message Date
xiekaidong
8be0258270 日志上报 2023-08-03 14:20:41 +08:00
xiekaidong
66d69032e6 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
xiekaidong
cb4147e794 bug修复 2023-07-21 15:15:28 +08:00
xiekaidong
b620281b43 更新配置和优化 2023-07-17 17:21:20 +08:00
xiekaidong
11ea2e87fc 战报阵容 2023-07-17 15:52:44 +08:00
Fang
de6de7f77e 竞技场重新匹配无cd时添加文案 2023-07-11 18:31:43 +08:00
xiekaidong
1f204e3f0f 英雄试玩 2023-07-10 18:44:40 +08:00
xiekaidong
aec6bfc13c 竞技场引导问题修复 2023-07-10 15:22:56 +08:00
xiekaidong
9ffe0ff7cf 竞技场引导容错 2023-07-10 14:13:35 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
Fang
90b1e8ed97 编译 2023-07-06 19:23:46 +08:00
Fang
951cfb2d92 成长礼包触发方式修改 2023-07-06 18:21:15 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
Fang
089dbee9ba 竞技场未上榜处理 2023-07-06 11:41:06 +08:00
xiekaidong
4a76de5b95 竞技场弹出礼包 2023-07-06 10:16:03 +08:00
xiekaidong
6ac555593c 引导处理一下 2023-07-05 21:59:04 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
efb2fc57ba 竞技场弹窗礼包 2023-07-03 20:02:46 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
007e810cf2 动效添加、替图 2023-07-03 17:17:36 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
chenxi
4809253845 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/textures/ui/common.meta
#	Assets/arts/textures/ui/common/common_alpha.png.meta
#	Assets/arts/textures/ui/common/common_arrow_3.png
#	Assets/arts/textures/ui/common/common_arrow_3.png.meta
#	Assets/arts/textures/ui/common/common_arrow_4.png
#	Assets/arts/textures/ui/common/common_arrow_4.png.meta
#	Assets/arts/textures/ui/common/common_bg_0.png.meta
#	Assets/arts/textures/ui/common/common_bg_3.png
#	Assets/arts/textures/ui/common/common_bg_3.png.meta
#	Assets/arts/textures/ui/common/common_board_10.png
#	Assets/arts/textures/ui/common/common_board_10.png.meta
#	Assets/arts/textures/ui/common/common_board_6.png
#	Assets/arts/textures/ui/common/common_board_6.png.meta
#	Assets/arts/textures/ui/common/common_board_7.png
#	Assets/arts/textures/ui/common/common_board_7.png.meta
#	Assets/arts/textures/ui/common/common_btn_2.png
#	Assets/arts/textures/ui/common/common_btn_2.png.meta
#	Assets/arts/textures/ui/common/common_btn_3.png
#	Assets/arts/textures/ui/common/common_btn_3.png.meta
#	Assets/arts/textures/ui/common/common_check_1.png
#	Assets/arts/textures/ui/common/common_check_1.png.meta
#	Assets/arts/textures/ui/common/common_chest_1.png
#	Assets/arts/textures/ui/common/common_chest_1.png.meta
#	Assets/arts/textures/ui/common/common_dec_1.png
#	Assets/arts/textures/ui/common/common_dec_1.png.meta
#	Assets/arts/textures/ui/common/common_hp.png
#	Assets/arts/textures/ui/common/common_hp.png.meta
#	Assets/arts/textures/ui/common/common_inf.png
#	Assets/arts/textures/ui/common/common_inf.png.meta
#	Assets/arts/textures/ui/common/common_lock_2.png
#	Assets/arts/textures/ui/common/common_lock_2.png.meta
#	Assets/arts/textures/ui/common/common_progress_4.png
#	Assets/arts/textures/ui/common/common_progress_4.png.meta
2023-04-07 15:27:09 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00