31 Commits

Author SHA1 Message Date
xiekaidong
fe4ea6ec05 gm修改 2023-04-26 18:42:13 +08:00
xiekaidong
8ebcad8898 界面调整和gm修改 2023-04-26 18:25:25 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
xiekaidong
6f6f9718e7 编译lua 2023-04-24 21:46:36 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
xiekaidong
b78493fc7a 修复一些bug 2023-04-24 20:18:32 +08:00
chenxi
6908a37147 编译 2023-04-24 16:59:47 +08:00
chenxi
ec5a839960 编译 2023-04-24 16:17:20 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
chenxi
f4c45df9aa 编译 2023-04-23 18:46:11 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
xiekaidong
cf15eb8953 初始化数据 2023-04-21 17:05:52 +08:00
chenxi
77c5806104 merge 2023-04-21 16:32:08 +08:00
chenxi
ad3f9961d7 编译 2023-04-21 16:30:58 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
chenxi
c603125410 编译 2023-04-20 22:52:59 +08:00
chenxi
a065253b43 编译 2023-04-20 22:42:51 +08:00
chenxi
e36099a0e7 编译 tips 2023-04-20 22:15:16 +08:00
chenxi
3e0f6af2da 编译 2023-04-20 21:49:28 +08:00
chenxi
248a61e446 编译 2023-04-19 17:21:27 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
xiekaidong
13a433d321 棋盘新的读取方式 2023-04-12 15:17:21 +08:00
chenxi
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
7c3bf48beb 编译 2023-04-11 21:58:49 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +08:00
chenxi
468ded50d3 编译 2023-04-07 22:23:28 +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