14 Commits

Author SHA1 Message Date
xiekaidong
8089bc6e16 倒计时优化 2023-09-04 17:25:39 +08:00
xiekaidong
8c9945cc63 倒计时优化 2023-09-04 17:25:27 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
xiekaidong
b031fe8a9b 更新配置 2023-05-30 21:30:41 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
d62a8edbe0 提交资源 2023-05-30 11:33:36 +08:00
chenxi
f4c45df9aa 编译 2023-04-23 18:46:11 +08:00
chenxi
25a3b2a846 编译 2023-04-17 18:41:06 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
chenxi
468ded50d3 编译 2023-04-07 22:23:28 +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