32 Commits

Author SHA1 Message Date
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
7e1f206064 fix bug 2023-04-25 22:04:30 +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
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
chenxi
9afe9a1af0 编译 2023-04-25 14:40:59 +08:00
chenxi
a4ae91cd5a 编译 2023-04-24 21:51:39 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
chenxi
82deccace8 更新配置 2023-04-24 17:26:29 +08:00
xiekaidong
f099cf9228 第二次刷新棋盘时,不下落空元素的bug修复 2023-04-24 09:46:55 +08:00
xiekaidong
4703cacf30 更新配置 2023-04-23 15:55:35 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00
xiekaidong
67e1428e45 更新配置 2023-04-21 19:49:33 +08:00
chenxi
a065253b43 编译 2023-04-20 22:42:51 +08:00
chenxi
3e0f6af2da 编译 2023-04-20 21:49:28 +08:00
xiekaidong
46818a52e9 技能解锁 2023-04-20 21:27:33 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
chenxi
529cd6c6b3 编译 2023-04-18 22:32:39 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +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
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +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