1156 Commits

Author SHA1 Message Date
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
CloudJ
d2b99b7593 召唤表现调整 2023-06-01 15:42:17 +08:00
chenxi
03d2625a0c 侧边栏 2023-06-01 15:35:38 +08:00
chenxi
7fccb1c162 merge 2023-06-01 15:03:43 +08:00
chenxi
7ddcbad7fa 侧边栏spine逻辑调整 2023-06-01 15:03:22 +08:00
Fang
83143a0933 报错fix 2023-06-01 14:38:15 +08:00
CloudJ
859fb30001 抽卡表现 2023-06-01 14:34:50 +08:00
chenxi
d0108424b1 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 11:58:41 +08:00
chenxi
8f23516ad4 成就spine 2023-06-01 11:58:35 +08:00
chenxi
fd8151dfa6 成就可以领的时候的处理 2023-06-01 11:57:21 +08:00
Fang
22fa971494 spine动画报错fix 2023-06-01 11:46:45 +08:00
Fang
bd805dfa9a Merge branch 'fang/dev' into dev 2023-06-01 11:11:42 +08:00
Fang
77a15a260f 主界面成长礼包图标动画添加 2023-06-01 11:08:44 +08:00
xiekaidong
21963555f1 封装一下table方法 2023-06-01 10:41:36 +08:00
chenxi
f90220463d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 10:23:34 +08:00
chenxi
3f792038be 修复金猪bug和删掉不用的同步接口 2023-06-01 10:23:31 +08:00
CloudJ
9f6e66df43 fix 宝箱道具数量问题 2023-06-01 10:23:28 +08:00
xiekaidong
b74ed4efeb 每日战斗返回 2023-06-01 10:15:26 +08:00
xiekaidong
b4c4d01312 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-01 10:06:01 +08:00
xiekaidong
f76520f9e5 显示问题修复 2023-06-01 10:05:58 +08:00