16 Commits

Author SHA1 Message Date
puxuan
e16ec04399 fix bug 2025-10-31 16:41:10 +08:00
puxuan
5cfff8f347 fix bug 2025-10-30 16:41:04 +08:00
puxuan
bad9f48449 fix bug 2025-10-29 19:16:46 +08:00
puxuan
97b91ec0d9 fix bug 2025-10-24 16:37:31 +08:00
puxuan
7dfed34849 特权 2025-10-23 11:31:30 +08:00
puxuan
e32c238a90 副本 2025-10-10 19:22:45 +08:00
Fang
6097fc7c7f 装备升级礼包 2023-08-24 17:29:22 +08:00
Fang
fcba09b85b 装备副本材料获取界面排序 2023-08-01 16:44:29 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
Fang
d829c85777 编译 2023-07-25 16:13:33 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +08:00
Fang
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
Fang
37463a8704 材料获取显示修复 2023-07-21 18:04:40 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51: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