24 Commits

Author SHA1 Message Date
chenxi
3b85a8f27d 资源纠正 2023-05-30 21:12:21 +08:00
Fang
9a0d2fc84d 材质丢失fix 2023-05-29 18:32:09 +08:00
Fang
c5ca672020 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	Assets/arts/atlas/ui/battle.spriteatlas
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_board_23.png.meta
#	Assets/arts/textures/ui/common/common_board_24.png.meta
#	Assets/arts/textures/ui/common/common_board_25.png.meta
#	Assets/arts/textures/ui/common/common_dec_12.png.meta
#	Assets/arts/textures/ui/common/common_title_9.png.meta
#	Assets/arts/textures/ui/common/common_toast_2.png.meta
2023-05-29 18:23:09 +08:00
chenxi
9a5d50b728 调整界面 2023-05-26 19:01:36 +08:00
Fang
ee234a3efd tips等预制体修改 2023-05-26 15:43:40 +08:00
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +08:00
xiekaidong
99339d3461 技能tips 2023-05-22 15:59:35 +08:00
chenxi
14bf5e913d 编译 2023-05-19 21:58:07 +08:00
chenxi
d2b296fe95 宝箱tips 2023-05-19 16:37:44 +08:00
chenxi
168c556b6d 挂机 2023-05-17 22:28:55 +08:00
chenxi
f2622a2ae2 tips 2023-05-17 19:05:57 +08:00
chenxi
fb0544d956 删除不用的资源 2023-05-04 11:33:11 +08:00
xiekaidong
79f39ede70 界面调整 2023-04-24 14:21:23 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
e36099a0e7 编译 tips 2023-04-20 22:15:16 +08:00
chenxi
eac9e5753a tips 2023-04-20 21:09:11 +08:00
chenxi
4b1ca125e0 随便 2023-04-20 17:40:58 +08:00
chenxi
f321791a71 更新资源 2023-04-20 11:16:09 +08:00
chenxi
42d59d6045 界面替换 2023-04-19 17:56:21 +08:00
xiekaidong
5ba9c3a3ae 界面处理 2023-04-17 15:19:44 +08:00
xiekaidong
b301bf09fa 关卡宝箱 2023-04-15 14:45:52 +08:00
xiekaidong
a442b8ffb1 战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理 2023-04-14 15:19:49 +08:00
xiekaidong
4049830098 reward显示 2023-04-12 21:46:25 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00