35 Commits

Author SHA1 Message Date
xiekaidong
d62a8edbe0 提交资源 2023-05-30 11:33:36 +08:00
chenxi
feb719eab7 英雄解锁 2023-05-30 10:20:22 +08:00
chenxi
3b47c0dc1a 编译 2023-05-23 19:03:11 +08:00
chenxi
db92c0bb37 英雄详情界面 2023-05-23 18:42:04 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
chenxi
cc2dc24479 编译 2023-04-25 12:09:30 +08:00
xiekaidong
b78493fc7a 修复一些bug 2023-04-24 20:18:32 +08:00
xiekaidong
39e9ba43a0 动画 2023-04-24 17:21:12 +08:00
xiekaidong
a849c21af9 一些spine 2023-04-24 15:50:14 +08:00
xiekaidong
800d806ef5 英雄界面特效 2023-04-24 15:17:48 +08:00
xiekaidong
79f39ede70 界面调整 2023-04-24 14:21:23 +08:00
xiekaidong
9184710970 显示优化 2023-04-24 14:16:44 +08:00
xiekaidong
b2fb08e435 英雄排序bug修复 2023-04-23 15:49:10 +08:00
xiekaidong
e82acf920a 编译lua 2023-04-23 14:20:08 +08:00
xiekaidong
b1835f1da3 优化排序 2023-04-23 12:08:00 +08:00
chenxi
4aecc2ebde 编译 2023-04-23 10:35:56 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
xiekaidong
6c0307c660 动画 2023-04-21 10:57:51 +08:00
xiekaidong
e4fe7b4882 关卡数据容错 2023-04-21 09:57:02 +08:00
xiekaidong
a564a7aba3 修改 2023-04-20 21:37:23 +08:00
chenxi
e472c46a8a 系数 2023-04-19 22:41:22 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
chenxi
7b2e8a8802 大小 2023-04-19 15:40:14 +08:00
chenxi
5182596112 merge 2023-04-19 10:48:28 +08:00
chenxi
534deaf72d 编译 2023-04-18 20:37:49 +08:00
xiekaidong
aa8de9d540 编译lua 2023-04-18 18:01:07 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00:58 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
chenxi
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
chenxi
1163b9c827 编译 2023-04-10 21:56:12 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +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