45 Commits

Author SHA1 Message Date
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
994fc2e7a2 更新配置 2023-05-30 10:03:53 +08:00
chenxi
5eaa1f2f73 编译 2023-05-29 15:22:21 +08:00
CloudJ
35af04e42d compile 2023-05-26 19:58:22 +08:00
xiekaidong
1dbe6be188 禁锢效果 2023-05-26 18:09:46 +08:00
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
CloudJ
f79e8ebe89 编译 2023-05-25 15:27:25 +08:00
chenxi
b7f1dd92e0 金猪完成 2023-05-23 18:22:06 +08:00
xiekaidong
2d65998f52 删除多余配置表 2023-05-22 20:38:33 +08:00
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +08:00
xiekaidong
27bd9d3b09 果冻 2023-05-19 20:45:09 +08:00
xiekaidong
1eae40bf23 更新配置 2023-05-19 16:29:20 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
xiekaidong
54fcd748cf 多段伤害 2023-05-18 10:59:17 +08:00
chenxi
88aa8c35e3 编译 2023-05-17 20:06:15 +08:00
chenxi
82f8030d2f 战令 2023-05-17 14:41:30 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
119deac852 编译 2023-05-12 21:09:16 +08:00
xiekaidong
9122032a63 一些技能机制 2023-05-11 19:19:06 +08:00
xiekaidong
9c5faae2be 编译lua 2023-05-11 09:59:41 +08:00
chenxi
5ab1e11c6b 设置界面 2023-05-08 21:11:13 +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
7164bd63bb 编译 2023-04-25 20:19:48 +08:00
xiekaidong
fed6c5f070 增加一个生效对象 2023-04-25 18:13:00 +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
ecd1adcdb7 ab name 2023-04-24 21:58:09 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
chenxi
82deccace8 更新配置 2023-04-24 17:26:29 +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
b402578058 编译 2023-04-20 20:54:58 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
chenxi
822f2e6734 编译 2023-04-19 20:51:38 +08:00
chenxi
7f4d5d009b 编译 2023-04-19 20:06:53 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +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