22 Commits

Author SHA1 Message Date
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
433ec88ba1 编译lua 2023-08-08 16:00:08 +08:00
xiekaidong
cd5f588a66 统一接口,金币不足提示弹窗询问 2023-08-03 14:54:55 +08:00
Fang
8e5b9560ce 碎片界面标题修改 2023-07-06 17:08:22 +08:00
xiekaidong
b96a9aca6b 竞技场开启引导 2023-07-05 15:46:03 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
chenxi
7a141820b4 merge 2023-06-14 15:43:17 +08:00
chenxi
20aea655a1 支付转菊花 2023-06-12 22:19:42 +08:00
chenxi
3483961cc5 超过5秒提示网络断开连接 2023-06-06 15:30:54 +08:00
xiekaidong
6de85c5b98 bug修复 2023-06-02 11:55:05 +08:00
xiekaidong
4b805302fc bug修复 2023-05-31 18:06:48 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
CloudJ
35af04e42d compile 2023-05-26 19:58:22 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
xiekaidong
af05ae6dc5 棋盘死局 2023-04-27 20:15:53 +08:00
chenxi
46f9462b79 回血加盾不算combo 2023-04-27 14:22:21 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +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