19 Commits

Author SHA1 Message Date
chenxi
2ac2d73e0b 战令红点bug 2023-06-15 16:58:13 +08:00
CloudJ
700804df00 编译 2023-06-06 18:22:26 +08:00
chenxi
585bd539c5 从任务跳转去战令,一定要弹出购买弹窗 2023-05-29 11:16:21 +08:00
chenxi
3894964322 编译 2023-05-22 21:25:43 +08:00
chenxi
d2b296fe95 宝箱tips 2023-05-19 16:37:44 +08:00
chenxi
f2622a2ae2 tips 2023-05-17 19:05:57 +08:00
chenxi
f9d361e469 战令 2023-05-17 15:01:17 +08:00
chenxi
82f8030d2f 战令 2023-05-17 14:41:30 +08:00
chenxi
fbf45b0eb1 战令 2023-05-17 11:14:49 +08:00
chenxi
4a1a187694 主城战令 2023-05-16 22:40:02 +08:00
chenxi
3b60a301a4 战令重复奖励 2023-05-16 22:03:22 +08:00
chenxi
7501e9c08a 弹窗 2023-05-16 19:42:25 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
chenxi
62b4039351 主城 2023-05-05 22:05:13 +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