563 Commits

Author SHA1 Message Date
chenxi
f4afa2e96c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-27 10:10:22 +08:00
chenxi
3364785c3c 刘海屏 2023-04-27 10:10:18 +08:00
xiekaidong
64826cfefb 改一下执行顺序 2023-04-27 09:49:03 +08:00
xiekaidong
442f75efab 调整一下bi打印逻辑 2023-04-27 09:45:16 +08:00
chenxi
783ade4a69 刘海屏适配 2023-04-26 23:06:03 +08:00
chenxi
47a75078dc 更新配置 2023-04-26 22:32:08 +08:00
chenxi
343c6bdcc9 连击效果 2023-04-26 22:24:08 +08:00
xiekaidong
0a68394c62 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-26 21:46:39 +08:00
xiekaidong
8d9a22c5f4 刘海屏 2023-04-26 21:46:36 +08:00
chenxi
f97813e910 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 21:35:27 +08:00
chenxi
ecd18170cc combo表现 2023-04-26 21:35:24 +08:00
xiekaidong
cf3ee52e68 刘海屏适配 2023-04-26 21:19:27 +08:00
chenxi
88e5f4b0df 节点 2023-04-26 21:00:29 +08:00
chenxi
5f8c7e2295 combo 2023-04-26 20:47:02 +08:00
chenxi
fe18d54aa7 gm工具 2023-04-26 19:43:12 +08:00
chenxi
467e775042 战斗清理 2023-04-26 19:33:25 +08:00
chenxi
d0c0b398bc fix bug 2023-04-26 19:22:10 +08:00
chenxi
c5c4acb569 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 19:01:30 +08:00
chenxi
a903fe2950 更新配置 2023-04-26 19:01:23 +08:00
xiekaidong
6541221ff5 特效丢失问题 2023-04-26 18:48:05 +08:00
xiekaidong
0de502ba07 gm修改 2023-04-26 18:41:24 +08:00
xiekaidong
2d1ab5421d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-26 18:39:42 +08:00
xiekaidong
1f59264830 bug修复 2023-04-26 18:39:39 +08:00
chenxi
799b6c531d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 18:27:52 +08:00
chenxi
342c12d46a item cell 2023-04-26 18:27:48 +08:00
xiekaidong
de21e5e1a8 界面调整和gm修改 2023-04-26 18:25:17 +08:00
xiekaidong
a9cd35f3c4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-26 18:12:52 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
chenxi
eb6cbe169f 战斗buff显示 2023-04-26 18:07:55 +08:00
chenxi
5ac0c46c82 结算界面 2023-04-26 16:58:44 +08:00
chenxi
5b43ae2f27 结算界面 2023-04-26 16:01:25 +08:00
chenxi
b7ba74fd78 游戏内语言 2023-04-26 15:29:18 +08:00
chenxi
01f34843e8 体力上限显示 2023-04-26 15:26:16 +08:00
chenxi
cb87e896e6 打点 2023-04-26 15:21:50 +08:00
chenxi
ada8e950c4 热更上报 2023-04-26 15:09:23 +08:00
chenxi
eccbb328ba 请求版本号 2023-04-26 15:03:20 +08:00
chenxi
f1274720e8 更新配置 2023-04-26 14:17:54 +08:00
chenxi
9b28cded0f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 14:17:11 +08:00
chenxi
54174019ee 技能加速 2023-04-26 14:17:08 +08:00
xiekaidong
e232a344cc 关闭一些特效,节省一下性能 2023-04-26 12:05:43 +08:00
xiekaidong
9e4db809a7 英雄升级红点 2023-04-26 11:43:16 +08:00
xiekaidong
88d4e989d3 升级特效 2023-04-26 10:57:19 +08:00
xiekaidong
79b3f3d446 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-26 10:36:56 +08:00
xiekaidong
e4c0ea6be5 主界面宝箱 2023-04-26 10:36:53 +08:00
chenxi
8fc0090b76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 10:20:35 +08:00
chenxi
e60f269767 fix bug 2023-04-26 10:20:30 +08:00
xiekaidong
5a97438c08 怪物丢棋盘技能的动画 2023-04-26 09:47:56 +08:00
xiekaidong
1ced149768 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 23:27:21 +08:00
xiekaidong
a6bf141658 技能选择界面改到战斗界面中 2023-04-25 23:27:19 +08:00
chenxi
89bcd8ab01 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 23:02:14 +08:00