12 Commits

Author SHA1 Message Date
xiekaidong
07c8ef8648 Merge branch 'master' into dev
# Conflicts:
#	Assets/Editor/JenkinsAdapter.cs
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
2023-07-07 17:14:54 +08:00
xiekaidong
8231fc3cc5 添加容错 2023-06-25 10:31:05 +08:00
xiekaidong
12135088dd 修改下提示 2023-05-30 15:33:09 +08:00
xiekaidong
fb0c37f6f9 动画报错 2023-05-29 11:55:11 +08:00
xiekaidong
819dd83892 容错 2023-05-29 11:48:09 +08:00
xiekaidong
c55ab20a6d 多段伤害的更改 2023-05-26 15:48:05 +08:00
xiekaidong
3275f651fa 编辑模式下增加一个弹窗提示的容错 2023-05-25 10:59:33 +08:00
xiekaidong
5d648ac6c3 增加一下受击动画容错 2023-05-25 10:38:10 +08:00
chenxi
49b0499a43 关键伤害帧 2023-04-18 16:04:58 +08:00
chenxi
e9cf5af678 援助攻击 2023-04-17 22:11:09 +08:00
chenxi
20f87dc4de 资源 2023-04-11 18:26:10 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00