22 Commits

Author SHA1 Message Date
xiekaidong
fff1c9260e 宝箱 2023-05-17 19:20:18 +08:00
xiekaidong
63ad1d641a 神灯障碍物 2023-05-16 21:24:26 +08:00
xiekaidong
55e4216493 打开广告刷新按钮 2023-05-15 11:04:23 +08:00
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +08:00
xiekaidong
05965fa97e bug修复 2023-04-27 15:24:50 +08:00
xiekaidong
e6b56b51ec bug修复 2023-04-27 14:25:00 +08:00
xiekaidong
dcd9ed1d3f bug修复 2023-04-25 21:10:43 +08:00
xiekaidong
9e03ce63fc 章节障碍物和棋盘地图 2023-04-25 18:39:02 +08:00
xiekaidong
09a35689bc 棋盘技能 2023-04-25 09:57:19 +08:00
xiekaidong
12637d5306 技能位置 2023-04-24 22:08:03 +08:00
xiekaidong
891d0d35ed 消除bug修复 2023-04-24 20:50:18 +08:00
xiekaidong
71af77d393 bug修复 2023-04-24 11:32:26 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
xiekaidong
fa08d49955 资源替换 2023-04-23 09:56:15 +08:00
xiekaidong
b0a3b083c1 填充bug修复 2023-04-19 21:05:10 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +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
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