721 Commits

Author SHA1 Message Date
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
xiekaidong
c30fe950b2 章节障碍物和棋盘地图 2023-04-25 18:38:49 +08:00
chenxi
96cd67123b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 18:17:42 +08:00
chenxi
41330be8c2 上报 2023-04-25 18:17:39 +08:00
xiekaidong
f8044eb0de Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 18:12:44 +08:00
xiekaidong
51f600d11c 增加一个生效对象 2023-04-25 18:12:37 +08:00
chenxi
b71b1df606 正式代码 2023-04-25 18:11:31 +08:00
chenxi
60f6b5c8ef 更新配置 2023-04-25 18:04:17 +08:00
xiekaidong
2f2e9b23eb Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 17:50:44 +08:00
xiekaidong
99d6318442 bug修复 2023-04-25 17:50:41 +08:00
chenxi
9ae6d709e7 fix bug 2023-04-25 17:47:05 +08:00
chenxi
79b546d2f8 更新配置 2023-04-25 17:37:27 +08:00
chenxi
2600c22d08 更新配置 2023-04-25 16:21:21 +08:00
chenxi
d60a461a60 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 16:20:21 +08:00
chenxi
824841e6f1 buff破裂特效 2023-04-25 16:20:18 +08:00
xiekaidong
2f1f405a73 bug修复 2023-04-25 16:05:05 +08:00
xiekaidong
c1ed407a0f 显示修改 2023-04-25 15:49:24 +08:00
xiekaidong
bbcf5c20ea Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 15:24:11 +08:00
xiekaidong
87929514ea 界面退出时清除状态 2023-04-25 15:24:02 +08:00
chenxi
2742782204 配置 2023-04-25 15:20:05 +08:00