47 Commits

Author SHA1 Message Date
xiekaidong
2d14102407 反伤bug、反击bug、死亡时带有流血buff触发机制实现 2023-05-26 21:37:35 +08:00
xiekaidong
1dbe6be188 禁锢效果 2023-05-26 18:09:46 +08:00
xiekaidong
47b32345d6 反击表现 2023-05-23 20:10:54 +08:00
xiekaidong
97953f1958 格挡动作表现、反击界面表现 2023-05-23 16:40:45 +08:00
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +08:00
xiekaidong
36950a4364 更新pb 2023-05-19 18:23:35 +08:00
chenxi
d2b296fe95 宝箱tips 2023-05-19 16:37:44 +08:00
xiekaidong
1eae40bf23 更新配置 2023-05-19 16:29:20 +08:00
xiekaidong
7d72a0fbad 新增技能机制 2023-05-19 10:52:23 +08:00
xiekaidong
efaa9ff92a 修改prefab 2023-05-18 22:09:30 +08:00
xiekaidong
55e4216493 打开广告刷新按钮 2023-05-15 11:04:23 +08:00
xiekaidong
9122032a63 一些技能机制 2023-05-11 19:19:06 +08:00
xiekaidong
9c5faae2be 编译lua 2023-05-11 09:59:41 +08:00
chenxi
d17282cfd0 编译 2023-04-25 11:58:49 +08:00
chenxi
a4ae91cd5a 编译 2023-04-24 21:51:39 +08:00
chenxi
a39b333d38 fix bug 2023-04-24 17:49:17 +08:00
chenxi
14a9a938c7 fix bug 2023-04-24 17:25:11 +08:00
chenxi
0bae4aa36d 伤害数字 2023-04-24 15:37:48 +08:00
chenxi
7868fa9aa5 编译 2023-04-23 21:25:41 +08:00
chenxi
04c373fad1 技能音效 2023-04-23 19:21:15 +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
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00
chenxi
dd040045c9 编译 2023-04-21 21:25:02 +08:00
xiekaidong
415fecdf8f bug修复 2023-04-21 20:45:15 +08:00
chenxi
e2d6673810 资源 2023-04-21 20:37:42 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +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
d6b0cd71fd 血条动画 2023-04-18 22:22:32 +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
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
3d28196523 修复一些报错 2023-04-11 20:33:59 +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