350 Commits

Author SHA1 Message Date
xiekaidong
cc0eebfad8 英雄排序bug修复 2023-04-23 15:48:52 +08:00
xiekaidong
5dd14eb4db Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 15:29:24 +08:00
xiekaidong
495f02084d 动画 2023-04-23 15:29:22 +08:00
chenxi
8575d48b37 护盾 2023-04-23 15:15:50 +08:00
xiekaidong
d8bf6274d8 动画 2023-04-23 14:19:44 +08:00
xiekaidong
73ad9f50f3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 12:10:27 +08:00
xiekaidong
106a3b4065 删除冗余代码 2023-04-23 12:10:20 +08:00
chenxi
e9d797c582 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 12:09:46 +08:00
chenxi
53d639cc3f 主城底部动画 2023-04-23 12:09:43 +08:00
xiekaidong
c4801087bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 12:07:45 +08:00
xiekaidong
153cf72fb2 优化排序 2023-04-23 12:07:42 +08:00
chenxi
087618ab84 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 11:44:02 +08:00
chenxi
15226b6b0e 伤害数字 2023-04-23 11:43:59 +08:00
xiekaidong
26fab280b3 随机棋盘bug修复 2023-04-23 11:35:20 +08:00
xiekaidong
8ced267a7f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 10:53:22 +08:00
xiekaidong
56745e7a0f bug修复 2023-04-23 10:53:18 +08:00
chenxi
6dac30d394 更新配置 2023-04-23 10:35:26 +08:00
chenxi
133625a519 技能 2023-04-23 10:34:30 +08:00
chenxi
95a07316d8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 10:17:48 +08:00
chenxi
df6d39a984 第一个主英雄的排序规则改一下 2023-04-23 10:17:44 +08:00
xiekaidong
1a8007c8e6 资源替换 2023-04-23 09:56:05 +08:00
xiekaidong
c2bfaf937f 增加容错 2023-04-23 09:55:01 +08:00
xiekaidong
f6b7f954c2 延迟结算 2023-04-22 00:58:27 +08:00
chenxi
ec0bf60144 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-22 00:46:56 +08:00
chenxi
5dd25a3e3f . 2023-04-22 00:46:52 +08:00
xiekaidong
34312754ef 修改特效,消除影响改为十字形 2023-04-22 00:46:36 +08:00
xiekaidong
965af02e94 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-22 00:26:57 +08:00
xiekaidong
92766aa8cd 动画修改 2023-04-22 00:26:54 +08:00
chenxi
6224483fe9 屏蔽bi 2023-04-22 00:19:27 +08:00
chenxi
4e61053dcb 处理 2023-04-22 00:18:22 +08:00
chenxi
794deae7a0 更新配置 2023-04-22 00:06:58 +08:00
chenxi
e4edcfcf69 被动技能 2023-04-22 00:05:49 +08:00
chenxi
9a6f2ad5e0 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-21 23:31:52 +08:00
chenxi
d65f0021e1 icon frame 2023-04-21 23:31:49 +08:00
xiekaidong
7642dbc8f0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 23:16:44 +08:00
xiekaidong
e7c262c34b 死局随机棋盘 2023-04-21 23:16:41 +08:00
chenxi
7851d2a5d2 2023-04-21 23:10:29 +08:00
chenxi
594d5ac6c6 伤害统计 2023-04-21 22:41:32 +08:00
chenxi
902db9d49b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-21 22:15:01 +08:00
chenxi
af56d4b400 伤害统计 2023-04-21 22:14:57 +08:00
xiekaidong
a6f3a64b07 bug修复 2023-04-21 21:45:47 +08:00
xiekaidong
a4951d9f89 bug修复 2023-04-21 21:45:03 +08:00
xiekaidong
0be49bdc32 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 21:40:47 +08:00
xiekaidong
8fafdba7fc 战斗音效 2023-04-21 21:40:44 +08:00
chenxi
7c2e50a338 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-21 21:21:54 +08:00
chenxi
b378de406c fix bug 2023-04-21 21:21:51 +08:00
xiekaidong
754bf06d69 节奏调整 2023-04-21 21:20:51 +08:00
xiekaidong
55894f0bc5 表现修改 2023-04-21 21:03:01 +08:00
xiekaidong
70058e8cc6 bug修复 2023-04-21 20:50:52 +08:00
xiekaidong
ac9bea5776 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 20:43:52 +08:00