1170 Commits

Author SHA1 Message Date
chenxi
2f2a993c12 打完第二章后七天乐没有开启的bug 2023-06-02 18:20:15 +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
CloudJ
995f474b4a 宝箱动画 2023-06-02 14:46:18 +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
CloudJ
6bd53ebfa2 召唤表现 2023-06-02 12:01:57 +08:00
xiekaidong
12f51be781 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 11:53:57 +08:00
xiekaidong
738a57f9f4 bug修复 2023-06-02 11:53:55 +08:00
chenxi
09fb4c1fb7 登录的一个参数 2023-06-02 11:20:22 +08:00
chenxi
7e658583cf Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 11:14:54 +08:00
chenxi
7a039b6139 处理断线 2023-06-02 11:14:51 +08:00
xiekaidong
db2c3938f1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 11:07:26 +08:00
xiekaidong
197fcb9518 过场动画 2023-06-02 11:07:23 +08:00
chenxi
0240cf81ef Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 10:22:40 +08:00
chenxi
c4ba1807bf 战令奖励预览数字显示了双份 2023-06-02 10:22:34 +08:00
xiekaidong
3b36d944c9 去掉boss停帧 2023-06-02 09:37:09 +08:00
xiekaidong
9b0a928b35 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-01 22:10:05 +08:00
xiekaidong
09e4b06ccd 显示优化 2023-06-01 22:10:01 +08:00
CloudJ
5f7a3e733b 商城UI替换 2023-06-01 21:09:06 +08:00
xiekaidong
6b3734e703 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-01 21:07:02 +08:00
xiekaidong
09598b076b bug修复 2023-06-01 21:06:59 +08:00
chenxi
b9a6f17c11 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 20:58:32 +08:00
chenxi
08535b5eee 设置界面 2023-06-01 20:58:29 +08:00
CloudJ
9194824490 替换一波ui 2023-06-01 20:46:22 +08:00
CloudJ
9286537e65 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 20:46:11 +08:00
chenxi
58e5bbc33d 主界面点击音效 2023-06-01 20:34:41 +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
bab3e8218e 登录 2023-06-01 18:15:32 +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
CloudJ
0c1255a8f8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 17:56:57 +08:00
xiekaidong
886a533bce Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-01 17:45:27 +08:00
xiekaidong
1198d7cd88 bug修复 2023-06-01 17:44:57 +08:00
chenxi
b031da285f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 17:42:28 +08:00
chenxi
8aaa2565cf 删除无用代码 2023-06-01 17:42:25 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
xiekaidong
9429f79a1e bug修复 2023-06-01 16:35:23 +08:00
xiekaidong
30908425ca Merge branch 'battle' into dev 2023-06-01 16:31:14 +08:00
xiekaidong
2bc46d2d30 优化战斗中的table 2023-06-01 16:29:01 +08:00
Fang
4f34c587ba 【玩家升级】界面表现动效 2023-06-01 16:09:21 +08:00
CloudJ
aa20c3455e 召唤表现临时版 2023-06-01 15:42:38 +08:00