16 Commits

Author SHA1 Message Date
chenxi
fe9ccf4325 更新配置 2023-06-20 14:44:12 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
Fang
70bb61e9b6 更表 2023-06-05 17:30:58 +08:00
xiekaidong
8f63807099 更新配置 2023-06-05 15:54:49 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
chenxi
88aa8c35e3 编译 2023-05-17 20:06:15 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
5f71cef0f1 编译 2023-04-27 19:09:12 +08:00
chenxi
597b00d8ea 编译 2023-04-26 19:02:10 +08:00
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +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