1358 Commits

Author SHA1 Message Date
chenxi
e6435c68ff 公共事件增加上报体力 2023-06-06 16:43:12 +08:00
chenxi
be043ef0d1 支付上报 2023-06-06 15:50:33 +08:00
chenxi
d3d224c855 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 15:29:54 +08:00
chenxi
469cd98661 显示重连 2023-06-06 15:29:52 +08:00
xiekaidong
32df7d9516 修改上报 2023-06-06 15:25:21 +08:00
xiekaidong
4d6e578982 显示 2023-06-06 15:06:18 +08:00
xiekaidong
e60cedc505 检查一下 2023-06-06 14:47:02 +08:00
xiekaidong
c9558263e2 更新配置 2023-06-06 14:39:25 +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
CloudJ
8052cfa716 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 12:00:50 +08:00
CloudJ
2c4aec0178 成长礼包屏蔽满级状态 2023-06-06 12:00:45 +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
d8814f4153 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 11:15:05 +08:00
CloudJ
65124b9343 调整宝箱消耗道具显示顺序 2023-06-06 11:14:53 +08:00
chenxi
53f18c5b8a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 11:10:39 +08:00
chenxi
7a83365fe2 只有战斗胜利才算完成任务 2023-06-06 11:10:29 +08:00
xiekaidong
6efff3f554 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 11:08:57 +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
xiekaidong
b8f08c59a3 资源上传 2023-06-06 11:08:52 +08:00
CloudJ
9a5d42c753 音效 2023-06-06 11:08:37 +08:00
chenxi
04f9000eed 白名单 2023-06-06 11:07:07 +08:00
xiekaidong
3c1b73cebe Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 10:59:37 +08:00
xiekaidong
c218e5a359 音效 2023-06-06 10:59:34 +08:00
chenxi
952ada512e 更新配置 2023-06-06 10:49:11 +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
xiekaidong
eb1281f999 bi注释 2023-06-06 09:44:02 +08:00
chenxi
e80ac95990 播放动画 2023-06-05 22:17:38 +08:00
chenxi
b0b6b7cee1 还原语言相关设置 2023-06-05 22:01:49 +08:00
chenxi
755c9937b3 首包逻辑处理 2023-06-05 21:58:33 +08:00
chenxi
4a7e11114a 正式版 2023-06-05 21:55:44 +08:00
chenxi
5790cef72b 更新配置 2023-06-05 21:30:53 +08:00
chenxi
48504e5ff5 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 21:29:57 +08:00