43 Commits

Author SHA1 Message Date
xiekaidong
39e9ba43a0 动画 2023-04-24 17:21:12 +08:00
chenxi
0bae4aa36d 伤害数字 2023-04-24 15:37:48 +08:00
xiekaidong
9184710970 显示优化 2023-04-24 14:16:44 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
chenxi
7868fa9aa5 编译 2023-04-23 21:25:41 +08:00
xiekaidong
1da0916885 编译lua 2023-04-23 19:03:58 +08:00
xiekaidong
9249bc74f7 消除技能特效 2023-04-23 19:03:00 +08:00
chenxi
fd1576bec8 编译 2023-04-23 16:16:35 +08:00
xiekaidong
b2fb08e435 英雄排序bug修复 2023-04-23 15:49:10 +08:00
chenxi
14a6a9e198 伤害数字 2023-04-23 11:44:56 +08:00
xiekaidong
fa08d49955 资源替换 2023-04-23 09:56:15 +08:00
xiekaidong
97f473eb2c 修改特效,消除影响改为十字形 2023-04-22 00:47:15 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
xiekaidong
46818a52e9 技能解锁 2023-04-20 21:27:33 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
chenxi
4b1ca125e0 随便 2023-04-20 17:40:58 +08:00
chenxi
38d4878117 位置 2023-04-20 17:04:19 +08:00
chenxi
e3692493e2 编译 2023-04-20 16:34:26 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
xiekaidong
b0a3b083c1 填充bug修复 2023-04-19 21:05:10 +08:00
chenxi
65f1f4b1bd 编译 2023-04-19 12:24:24 +08:00
chenxi
c63c2a619c 编译 2023-04-19 11:54:01 +08:00
chenxi
5182596112 merge 2023-04-19 10:48:28 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +08:00
chenxi
5c54e7077f 编译 2023-04-18 19:00:18 +08:00
xiekaidong
aa8de9d540 编译lua 2023-04-18 18:01:07 +08:00
chenxi
7e76d21958 编译 2023-04-18 12:18:45 +08:00
chenxi
e9cf5af678 援助攻击 2023-04-17 22:11:09 +08:00
chenxi
25a3b2a846 编译 2023-04-17 18:41:06 +08:00
chenxi
b55aa3df89 英雄动作 2023-04-17 16:27:55 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
chenxi
0dc1481919 编译 2023-04-14 21:21:56 +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
7c3bf48beb 编译 2023-04-11 21:58:49 +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