642 Commits

Author SHA1 Message Date
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
xiekaidong
c2ddb208b9 更改一下死亡召唤触发时机 2023-06-03 17:46:24 +08:00
xiekaidong
83db836cb1 新增一个战斗用gm命令 2023-06-03 15:48:37 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
xiekaidong
fd4b60dfd2 多段伤害音效 2023-06-02 20:22:54 +08:00
xiekaidong
7151a033d7 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 20:13:41 +08:00
xiekaidong
1689436124 新增障碍物效果类型 2023-06-02 20:13:38 +08:00
chenxi
126807c97b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 19:20:23 +08:00
chenxi
bbf6b96d92 提示 2023-06-02 19:20:20 +08:00
xiekaidong
63b03dba2a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 19:01:36 +08:00
xiekaidong
14f51d2900 水泡动画 2023-06-02 19:01:33 +08:00
chenxi
dbff5a9565 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 19:00:29 +08:00
chenxi
ab68ef30a9 变量名错误 2023-06-02 19:00:26 +08:00
Fang
5ee2be8837 fix 2023-06-02 18:42:19 +08:00
Fang
b6936a2c4a 功能解锁飞行动画 2023-06-02 18:35:36 +08:00
chenxi
2f2a993c12 打完第二章后七天乐没有开启的bug 2023-06-02 18:20:15 +08:00
xiekaidong
5a9558184b 火箭动画 2023-06-02 17:58:18 +08:00
chenxi
c73734a068 更新配置 2023-06-02 17:20:31 +08:00
chenxi
8fccdca0c8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 17:07:12 +08:00
chenxi
ec5d5fbc82 gm 2023-06-02 17:07:09 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
chenxi
e02584c648 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 16:52:38 +08:00
xiekaidong
202e8e74c9 增加一个gm 2023-06-02 15:52:17 +08:00
chenxi
3eee5957f6 账号相关提示 2023-06-02 15:48:12 +08:00
xiekaidong
aaafadf812 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 15:15:13 +08:00
xiekaidong
dd86bf5283 战斗速度 2023-06-02 15:15:10 +08:00
chenxi
75a1352777 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 12:11:35 +08:00
chenxi
b609f796ba 只有主线关卡战斗结算显示金猪 2023-06-02 12:11:29 +08:00
xiekaidong
738a57f9f4 bug修复 2023-06-02 11:53:55 +08:00
xiekaidong
197fcb9518 过场动画 2023-06-02 11:07:23 +08:00
xiekaidong
09598b076b bug修复 2023-06-01 21:06:59 +08:00
xiekaidong
2adecefa79 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-01 18:19:01 +08:00
xiekaidong
143f67c2f3 特效问题修复 2023-06-01 18:18:54 +08:00
chenxi
f7de553771 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 18:09:36 +08:00
chenxi
80619b8e94 支付相关 2023-06-01 18:09:30 +08:00
xiekaidong
1198d7cd88 bug修复 2023-06-01 17:44:57 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
xiekaidong
2bc46d2d30 优化战斗中的table 2023-06-01 16:29:01 +08:00
xiekaidong
b74ed4efeb 每日战斗返回 2023-06-01 10:15:26 +08:00
CloudJ
e2f2f8ca70 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 10:00:13 +08:00
CloudJ
83753326b6 抽卡表现 先临时提一波 2023-06-01 10:00:10 +08:00
chenxi
2b4dc82363 账号相关 2023-05-31 22:38:15 +08:00
chenxi
35a6bc5fa7 账号绑定 2023-05-31 22:23:04 +08:00
xiekaidong
ebb4a77f18 每日挑战bug修复 2023-05-31 21:13:35 +08:00
xiekaidong
ededa19132 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 18:06:18 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
chenxi
c996e1414e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 17:53:44 +08:00
chenxi
fe3c8849b8 删除账号 2023-05-31 17:53:41 +08:00
xiekaidong
12d73fc941 特效反转 2023-05-31 17:22:48 +08:00
xiekaidong
10bd5a422d bug修复 2023-05-31 16:43:46 +08:00