23 Commits

Author SHA1 Message Date
chenxi
25b5f350d0 ab name 2023-04-24 22:01:05 +08:00
xiekaidong
1efbea9a7f 简单处理一下引导 2023-04-24 20:27:22 +08:00
xiekaidong
79f39ede70 界面调整 2023-04-24 14:21:23 +08:00
xiekaidong
9184710970 显示优化 2023-04-24 14:16:44 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
xiekaidong
8744238499 替换资源 2023-04-21 14:28:42 +08:00
xiekaidong
af244ed017 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/prefabs/ui/battle/cell/grid_cell.prefab
2023-04-20 18:14:27 +08:00
chenxi
494852cadb toast 2023-04-20 18:08:11 +08:00
xiekaidong
eb26827515 界面调整 2023-04-20 17:03:09 +08:00
xiekaidong
06749eaaeb 战斗节奏调整 2023-04-19 18:38:25 +08:00
chenxi
42d59d6045 界面替换 2023-04-19 17:56:21 +08:00
xiekaidong
7db3de04d5 更新资源 2023-04-19 09:54:56 +08:00
xiekaidong
a442b8ffb1 战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理 2023-04-14 15:19:49 +08:00
xiekaidong
e448d3318d 英雄养成 2023-04-13 21:14:19 +08:00
xiekaidong
4049830098 reward显示 2023-04-12 21:46:25 +08:00
xiekaidong
13a433d321 棋盘新的读取方式 2023-04-12 15:17:21 +08:00
chenxi
7c3bf48beb 编译 2023-04-11 21:58:49 +08:00
chenxi
fd33ffa4ae 英雄界面 2023-04-10 21:55:46 +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
chenxi
f2ba5705ef ui 2023-04-07 15:24:16 +08:00
xiekaidong
28d9843708 棋盘 2023-04-07 11:24:06 +08:00
xiekaidong
e6ecab4ee4 棋盘 2023-04-06 10:39:26 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00