16 Commits

Author SHA1 Message Date
puxuan
55449888a4 config 2025-10-20 11:18:20 +08:00
puxuan
f4387fca51 fix bug 2025-10-18 18:05:57 +08:00
puxuan
39878f292c 英雄 2025-10-10 15:12:41 +08:00
puxuan
21b5b2b20a 属性 2025-09-18 17:52:48 +08:00
puxuan
1c080a08b2 config 2025-09-16 20:08:47 +08:00
puxuan
22a6577076 抽卡 2025-08-13 15:38:46 +08:00
puxuan
0223007bc4 star 2025-06-22 19:06:10 +08:00
puxuan
c3d9830278 config 2025-06-12 22:06:18 +08:00
xiekaidong
5c1fa9be63 更新配置 2023-08-10 09:41:33 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +08:00
xiekaidong
410cc6b903 优化显示逻辑 2023-08-02 18:47:41 +08:00
chenxi
163ff77186 编译 2023-06-05 21:33:50 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
119deac852 编译 2023-05-12 21:09:16 +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