24 Commits

Author SHA1 Message Date
CloudJ
03424f4786 编译 2023-06-02 18:43:49 +08:00
chenxi
7389ba8509 只有主线战斗结算界面显示金猪 2023-06-02 12:12:09 +08:00
xiekaidong
0fc01c78b6 战斗相关bug修复 2023-05-31 14:24:15 +08:00
chenxi
7af6800ea0 功能解锁弹窗 2023-05-30 15:33:46 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
chenxi
feb719eab7 英雄解锁 2023-05-30 10:20:22 +08:00
xiekaidong
eb07f98711 显示优化 2023-05-26 16:33:21 +08:00
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
CloudJ
76d6e3d29f compile 2023-05-25 18:18:38 +08:00
CloudJ
7eb30359a3 编译 2023-05-24 16:01:10 +08:00
chenxi
165eff0164 金猪和邮件 2023-05-23 17:05:47 +08:00
chenxi
2edef87063 先屏蔽金猪 2023-05-22 11:22:45 +08:00
xiekaidong
36950a4364 更新pb 2023-05-19 18:23:35 +08:00
xiekaidong
fff1c9260e 宝箱 2023-05-17 19:20:18 +08:00
xiekaidong
33cad880c9 联网 2023-05-08 11:03:17 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
chenxi
dd040045c9 编译 2023-04-21 21:25:02 +08:00
xiekaidong
0b47632138 bug修复 2023-04-21 11:00:32 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +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