26 Commits

Author SHA1 Message Date
CloudJ
ba4231ea83 编译 2023-05-29 18:08:46 +08:00
CloudJ
13e23d167b 更配置 2023-05-29 15:38:58 +08:00
chenxi
809fda8619 基金重命名 2023-05-29 10:54:43 +08:00
CloudJ
35af04e42d compile 2023-05-26 19:58:22 +08:00
chenxi
7bfc35f9ab 七天乐 2023-05-26 15:40:44 +08:00
chenxi
b8652d1bbc 七天乐 2023-05-26 14:52:05 +08:00
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
chenxi
f72c92e5ce 紧急 2023-05-25 17:08:25 +08:00
xiekaidong
5d648ac6c3 增加一下受击动画容错 2023-05-25 10:38:10 +08:00
chenxi
56e27bfd3f 基金界面 2023-05-24 19:26:13 +08:00
chenxi
b7f1dd92e0 金猪完成 2023-05-23 18:22:06 +08:00
chenxi
165eff0164 金猪和邮件 2023-05-23 17:05:47 +08:00
chenxi
3894964322 编译 2023-05-22 21:25:43 +08:00
chenxi
2edef87063 先屏蔽金猪 2023-05-22 11:22:45 +08:00
xiekaidong
430637632b 弹窗 2023-05-22 10:25:26 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
chenxi
168c556b6d 挂机 2023-05-17 22:28:55 +08:00
chenxi
f055493dff 设置界面 2023-05-08 21:46:27 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
chenxi
1e6eac90fb 编译 2023-05-08 09:44:06 +08:00
chenxi
62b4039351 主城 2023-05-05 22:05:13 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
xiekaidong
9801e68bf5 下边页签动效 2023-04-24 16:12:46 +08:00
xiekaidong
e82acf920a 编译lua 2023-04-23 14:20:08 +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