22 Commits

Author SHA1 Message Date
xiekaidong
b7a592bd51 日志上报 2023-06-14 16:06:21 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
Fang
49af10d8a9 战斗退出后显示主界面控制 2023-06-06 17:31:34 +08:00
chenxi
791a81438b 绑定账号 2023-05-31 22:23:48 +08:00
chenxi
7af6800ea0 功能解锁弹窗 2023-05-30 15:33:46 +08:00
CloudJ
35af04e42d compile 2023-05-26 19:58:22 +08:00
chenxi
edf3b503a4 编译 2023-05-24 21:46:18 +08:00
xiekaidong
abd32989ad 通用技能tips 2023-05-22 16:38:42 +08:00
chenxi
54af22fa60 邮箱 2023-05-22 11:37:14 +08:00
xiekaidong
ee9f6680b9 更新资源 2023-05-19 20:00:57 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
chenxi
9a027c3125 购买体力 2023-05-09 14:54:14 +08:00
chenxi
5ab1e11c6b 设置界面 2023-05-08 21:11:13 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
chenxi
95752b42e0 编译 2023-05-08 14:40:44 +08:00
chenxi
62b4039351 主城 2023-05-05 22:05:13 +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
7c3bf48beb 编译 2023-04-11 21:58:49 +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