540 Commits

Author SHA1 Message Date
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
chenxi
0a6aab4681 护盾bufficon 没有消除的bug 2023-04-25 23:02:07 +08:00
xiekaidong
fd70f87d65 动画调整 2023-04-25 23:01:27 +08:00
xiekaidong
e085aad38f 进度条显示bug修复 2023-04-25 22:39:11 +08:00
xiekaidong
323d61ecd4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 22:24:04 +08:00
xiekaidong
d52d40d741 显示优化 2023-04-25 22:24:01 +08:00
chenxi
736ed2b7cb fix bug 2023-04-25 22:14:19 +08:00
chenxi
21c9a1c13c 血量被动的bug 2023-04-25 22:13:23 +08:00
chenxi
9489cf9a6f fix bug 2023-04-25 22:01:19 +08:00
chenxi
b0ea68863c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 21:55:20 +08:00
chenxi
b60e0c1a37 更新配置 2023-04-25 21:55:17 +08:00
xiekaidong
59de0189ed Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 21:52:53 +08:00
xiekaidong
71a4e9a62d 显示修复 2023-04-25 21:52:50 +08:00
chenxi
399cfbfe92 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 21:30:42 +08:00
chenxi
65db643867 防守方buff消除 2023-04-25 21:30:36 +08:00
xiekaidong
6d4e23616d bug修复 2023-04-25 21:10:28 +08:00
xiekaidong
02c18688f9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 20:38:20 +08:00
xiekaidong
3a4a6b4e0b 随机消除元素bug修复 2023-04-25 20:38:17 +08:00
chenxi
3caafceabd 更新配置 2023-04-25 20:19:09 +08:00
chenxi
84ee036fea fix bug 2023-04-25 20:18:17 +08:00
chenxi
cae53d753f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 19:51:54 +08:00
chenxi
4bf666b800 fix bug 2023-04-25 19:51:48 +08:00
xiekaidong
d71c41b40c bug修复 2023-04-25 18:46:24 +08:00
xiekaidong
3dc6d91f33 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 18:38:52 +08:00