18 Commits

Author SHA1 Message Date
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
xiekaidong
31950885ef 宝箱修改 2023-04-24 11:22:05 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
xiekaidong
fd6eb94de4 bug和显示优化 2023-04-23 17:22:33 +08:00
xiekaidong
67e1428e45 更新配置 2023-04-21 19:49:33 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
chenxi
3cb237de48 fix bug 2023-04-21 14:53:28 +08:00
chenxi
62a3ba1905 红点 2023-04-21 11:57:11 +08:00
xiekaidong
e4fe7b4882 关卡数据容错 2023-04-21 09:57:02 +08:00
chenxi
a065253b43 编译 2023-04-20 22:42:51 +08:00
xiekaidong
9f35910fc6 英雄解锁逻辑 2023-04-20 21:53:22 +08:00
chenxi
18f974d5b8 主城箭头 2023-04-20 18:02:15 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +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