34 Commits

Author SHA1 Message Date
xiekaidong
1bf268b859 显示优化 2023-04-25 22:24:27 +08:00
xiekaidong
9e03ce63fc 章节障碍物和棋盘地图 2023-04-25 18:39:02 +08:00
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
xiekaidong
65a8cb252f 技能特效 2023-04-24 21:03:51 +08:00
xiekaidong
39e9ba43a0 动画 2023-04-24 17:21:12 +08:00
xiekaidong
9184710970 显示优化 2023-04-24 14:16:44 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
xiekaidong
1da0916885 编译lua 2023-04-23 19:03:58 +08:00
xiekaidong
9249bc74f7 消除技能特效 2023-04-23 19:03:00 +08:00
xiekaidong
fd6eb94de4 bug和显示优化 2023-04-23 17:22:33 +08:00
xiekaidong
e82acf920a 编译lua 2023-04-23 14:20:08 +08:00
xiekaidong
97f473eb2c 修改特效,消除影响改为十字形 2023-04-22 00:47:15 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
40b4ce4bf4 结算界面 2023-04-21 22:42:16 +08:00
xiekaidong
0b47632138 bug修复 2023-04-21 11:00:32 +08:00
xiekaidong
6c0307c660 动画 2023-04-21 10:57:51 +08:00
xiekaidong
46818a52e9 技能解锁 2023-04-20 21:27:33 +08:00
xiekaidong
96cba83db9 动画调整 2023-04-20 20:30:56 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
xiekaidong
c1119c5b9a 修复 2023-04-20 18:50:27 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
chenxi
3d3276eaf2 编译 2023-04-19 16:29:38 +08:00
chenxi
5182596112 merge 2023-04-19 10:48:28 +08:00
chenxi
534deaf72d 编译 2023-04-18 20:37:49 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00:58 +08:00
chenxi
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +08:00
chenxi
5c05e888c9 章节 2023-04-07 20:50:58 +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