148 Commits

Author SHA1 Message Date
xiekaidong
36950a4364 更新pb 2023-05-19 18:23:35 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
chenxi
9a122cf094 编译 2023-05-18 20:32:53 +08:00
xiekaidong
54fcd748cf 多段伤害 2023-05-18 10:59:17 +08:00
chenxi
88aa8c35e3 编译 2023-05-17 20:06:15 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
chenxi
3154a8ab4e 编译 2023-04-27 19:20:01 +08:00
chenxi
5f71cef0f1 编译 2023-04-27 19:09:12 +08:00
chenxi
786937833b 更新配置 2023-04-27 17:29:45 +08:00
chenxi
597b00d8ea 编译 2023-04-26 19:02:10 +08:00
chenxi
a5c89fec0a 编译 2023-04-26 14:18:44 +08:00
chenxi
0b148a37da 编译 2023-04-25 22:15:38 +08:00
chenxi
7164bd63bb 编译 2023-04-25 20:19:48 +08:00
chenxi
176fa1f3a7 编译 2023-04-25 17:49:16 +08:00
chenxi
aa7b47357d 编译 2023-04-25 16:22:11 +08:00
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
chenxi
9afe9a1af0 编译 2023-04-25 14:40:59 +08:00
chenxi
d79e88c8bc 编译 2023-04-24 22:02:38 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
chenxi
01ec336b13 编译 2023-04-24 17:39:40 +08:00
chenxi
82deccace8 更新配置 2023-04-24 17:26:29 +08:00
chenxi
61e80a527e 特效bug 2023-04-23 21:37:55 +08:00
chenxi
04c373fad1 技能音效 2023-04-23 19:21:15 +08:00
xiekaidong
dca6601d90 编译lua 2023-04-23 17:39:29 +08:00
xiekaidong
4703cacf30 更新配置 2023-04-23 15:55:35 +08:00
chenxi
4aecc2ebde 编译 2023-04-23 10:35:56 +08:00
chenxi
7ec7f4ec9c 更新配置 2023-04-22 00:07:51 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00
xiekaidong
67e1428e45 更新配置 2023-04-21 19:49:33 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
xiekaidong
cf15eb8953 初始化数据 2023-04-21 17:05:52 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
chenxi
e3692493e2 编译 2023-04-20 16:34:26 +08:00
chenxi
24fe10437e 编译 2023-04-20 11:20:15 +08:00
chenxi
65f1f4b1bd 编译 2023-04-19 12:24:24 +08:00
chenxi
529cd6c6b3 编译 2023-04-18 22:32:39 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +08:00
chenxi
e9cf5af678 援助攻击 2023-04-17 22:11:09 +08:00
chenxi
25a3b2a846 编译 2023-04-17 18:41:06 +08:00
chenxi
af8adbe236 编译 2023-04-17 16:53:55 +08:00
xiekaidong
a0e4002e55 更新配置 2023-04-14 18:02:24 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00:58 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +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