38 Commits

Author SHA1 Message Date
chenxi
597b00d8ea 编译 2023-04-26 19:02:10 +08:00
xiekaidong
8ebcad8898 界面调整和gm修改 2023-04-26 18:25:25 +08:00
chenxi
a5c89fec0a 编译 2023-04-26 14:18:44 +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
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
31950885ef 宝箱修改 2023-04-24 11:22:05 +08:00
xiekaidong
dca6601d90 编译lua 2023-04-23 17:39:29 +08:00
xiekaidong
4703cacf30 更新配置 2023-04-23 15:55:35 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
xiekaidong
e4fe7b4882 关卡数据容错 2023-04-21 09:57:02 +08:00
chenxi
3e0f6af2da 编译 2023-04-20 21:49:28 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
chenxi
32f7cbab3d 战斗ui 2023-04-20 12:07:02 +08:00
chenxi
24fe10437e 编译 2023-04-20 11:20:15 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
chenxi
822f2e6734 编译 2023-04-19 20:51:38 +08:00
chenxi
7f4d5d009b 编译 2023-04-19 20:06:53 +08:00
chenxi
af8adbe236 编译 2023-04-17 16:53:55 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00:58 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
xiekaidong
13a433d321 棋盘新的读取方式 2023-04-12 15:17:21 +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