713 Commits

Author SHA1 Message Date
xiekaidong
1c46acc425 优化一版战斗结构 2023-06-12 15:30:00 +08:00
xiekaidong
5be91b491c 暂存 2023-06-12 15:21:26 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
chenxi
608eb91087 英雄tips 2023-06-08 21:34:28 +08:00
chenxi
822b6baa75 商店热卖标签红点 2023-06-08 20:51:09 +08:00
chenxi
c1c5e8415e 金猪满了后下一次进主城要弹出来 2023-06-08 20:20:42 +08:00
chenxi
bda768c79f bug 2023-06-08 18:05:55 +08:00
xiekaidong
c46b80a567 新增上报 2023-06-07 17:33:54 +08:00
xiekaidong
22ca62a023 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-07 17:25:17 +08:00
xiekaidong
c800a0cc31 日志上报 2023-06-07 17:25:08 +08:00
chenxi
26ea46d608 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-07 16:49:16 +08:00
chenxi
2257dfc25d 挂机界面1分钟拉一次 2023-06-07 16:49:09 +08:00
xiekaidong
502c73bae8 主界面关卡宝箱领取显示bug修复 2023-06-07 10:30:37 +08:00
chenxi
695e9f1e7d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 21:11:42 +08:00
chenxi
3edeb6c50c 隐私政策,退回登录界面还是连不上的问题 2023-06-06 21:11:38 +08:00
xiekaidong
1c89ec147b 显示bug修复 2023-06-06 20:37:32 +08:00
CloudJ
f4b2f6d32c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 17:51:23 +08:00
CloudJ
0d2144756d 调整上报参数 2023-06-06 17:51:18 +08:00
chenxi
9c94d29418 几个上报 2023-06-06 17:41:29 +08:00
Fang
be6d42fe88 战斗退出后显示主界面控制 2023-06-06 17:30:50 +08:00
CloudJ
f95926cfde 增加一部分上报 2023-06-06 17:11:16 +08:00
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