20 Commits

Author SHA1 Message Date
xiekaidong
d32e88ac01 编译lua 2023-09-19 15:03:21 +08:00
xiekaidong
9ca3f79c89 bug修复 2023-09-19 14:30:19 +08:00
Fang
e003e236ec 更表 2023-09-19 11:28:36 +08:00
xiekaidong
980d92839d 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:28:01 +08:00
xiekaidong
b8f7a7a783 更新配置 2023-08-15 21:39:40 +08:00
xiekaidong
5c1fa9be63 更新配置 2023-08-10 09:41:33 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
Fang
f01c611d72 导表 2023-07-20 19:35:17 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
chenxi
5f9898ee06 更新配置 2023-06-21 11:21:41 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00
Fang
491599bf1a 导表 2023-06-20 11:44:52 +08:00
chenxi
c3fdacbef8 编译 2023-06-16 21:34:55 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
CloudJ
35af04e42d compile 2023-05-26 19:58:22 +08:00
xiekaidong
1dbe6be188 禁锢效果 2023-05-26 18:09:46 +08:00
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +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