692 Commits

Author SHA1 Message Date
chenxi
469cd98661 显示重连 2023-06-06 15:29:52 +08:00
xiekaidong
e60cedc505 检查一下 2023-06-06 14:47:02 +08:00
xiekaidong
0afa71888e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 14:12:53 +08:00
xiekaidong
0867e84815 切换波次时自动关闭buff弹窗 2023-06-06 14:12:50 +08:00
chenxi
48cc41ba97 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 11:59:44 +08:00
chenxi
24c71edd35 loading 2023-06-06 11:59:36 +08:00
xiekaidong
184b03d5ad Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 11:56:03 +08:00
xiekaidong
6a821f718a 调快速度 2023-06-06 11:55:59 +08:00
CloudJ
062d3e54e8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 11:45:01 +08:00
CloudJ
ed3d1898b0 调整宝箱界面 2023-06-06 11:44:58 +08:00
chenxi
74f3121e9e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 11:43:03 +08:00
chenxi
83a22c48b8 点击音效 2023-06-06 11:42:57 +08:00
xiekaidong
1128b8853b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 11:32:10 +08:00
xiekaidong
24a853e31a 显示优化 2023-06-06 11:32:07 +08:00
chenxi
f63a2bf876 音效 2023-06-06 11:29:34 +08:00
CloudJ
65124b9343 调整宝箱消耗道具显示顺序 2023-06-06 11:14:53 +08:00
CloudJ
17984d56ae Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/audio_manager.lua
2023-06-06 11:08:52 +08:00
CloudJ
9a5d42c753 音效 2023-06-06 11:08:37 +08:00
Fang
0ba73d34ed 健壮性 2023-06-06 10:47:51 +08:00
Fang
1cebb9f5aa 引导和界面冲突处理 2023-06-06 10:39:13 +08:00
xiekaidong
61b9ef3ae0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 10:38:46 +08:00
xiekaidong
2dbf06a3b0 boss预警音效 2023-06-06 10:38:43 +08:00
Fang
1bc3b686f5 引导时不主动弹每日挑战任务弹窗 2023-06-06 10:23:36 +08:00
CloudJ
bfa156bdb5 界面调整 2023-06-06 10:21:18 +08:00
CloudJ
8b0a3dd24a 界面调整 2023-06-06 10:16:13 +08:00
Fang
2df5f6a66c 结算界面、功能解锁界面dotween代码优化 2023-06-06 10:14:00 +08:00
chenxi
e80ac95990 播放动画 2023-06-05 22:17:38 +08:00
xiekaidong
512fbc64e6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 21:07:45 +08:00
xiekaidong
611d962181 增加棋盘查看字段 2023-06-05 21:07:38 +08:00
chenxi
f2ff976fdf Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 21:04:47 +08:00
chenxi
0c8613fd6c bi 2023-06-05 21:04:38 +08:00
xiekaidong
b12312c2ea Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 20:51:53 +08:00
xiekaidong
cc77a77193 消除显示优化 2023-06-05 20:51:50 +08:00
chenxi
418390a920 红点位置 2023-06-05 20:41:35 +08:00
chenxi
507a696e08 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 20:32:16 +08:00
chenxi
84efd33d1f 任务红点 2023-06-05 20:32:13 +08:00
CloudJ
9e8ff9a083 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 20:17:16 +08:00
CloudJ
8badb72aec 抽卡表现调整 2023-06-05 20:17:11 +08:00
xiekaidong
0c420e840b 特效 2023-06-05 20:06:51 +08:00
CloudJ
2a5d350837 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 19:41:12 +08:00
CloudJ
8f27d79134 配置表 2023-06-05 19:41:10 +08:00
chenxi
96e4d6b279 box tips里面的感叹号 2023-06-05 19:39:21 +08:00
chenxi
f4876233ae bug 2023-06-05 19:08:23 +08:00
Fang
9bead326d2 结算界面动画替换 2023-06-05 19:07:07 +08:00
chenxi
e4ebe8884e 英雄详情界面 2023-06-05 18:52:42 +08:00
chenxi
baa1c4280e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 18:32:54 +08:00
chenxi
16975e700e 充值后没有绑定则提示绑定 2023-06-05 18:32:51 +08:00
Fang
404fa2ca30 结算界面金猪动画 2023-06-05 18:29:22 +08:00
chenxi
a0da15d140 七天乐界面 2023-06-05 18:07:40 +08:00
chenxi
38aa2b8ffa 七天乐替换界面 2023-06-05 17:56:35 +08:00