599 Commits

Author SHA1 Message Date
chenxi
25b8aa4bcf 挂机界面 2023-06-03 20:48:46 +08:00
chenxi
f42fec5e4d 任务界面 2023-06-03 20:29:39 +08:00
chenxi
a7a189bcbb Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-03 19:58:54 +08:00
chenxi
3755f870bc 英雄列表界面 2023-06-03 19:58:47 +08:00
chenxi
47242af939 替换设置界面 2023-06-03 19:45:07 +08:00
xiekaidong
b15f97c522 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-03 19:11:22 +08:00
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
chenxi
4ffad9e059 战令spine效果 2023-06-03 18:59:15 +08:00
xiekaidong
83db836cb1 新增一个战斗用gm命令 2023-06-03 15:48:37 +08:00
chenxi
9f0b6fbeb3 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-03 11:58:25 +08:00
chenxi
f22fedb926 英雄位置和金猪spine 2023-06-03 11:58:18 +08:00
xiekaidong
b4f23a1b61 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 22:28:25 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
chenxi
336e713fb1 英雄升级特效位置 2023-06-02 22:24:25 +08:00
chenxi
74ba59f107 调整一下货币顺序 2023-06-02 21:30:30 +08:00
chenxi
fa63de8ad9 英雄icon资源大小 2023-06-02 21:03:34 +08:00
CloudJ
d16e46676b 增加一个跳转 2023-06-02 20:34:15 +08:00
CloudJ
8b17dabbf1 主界面 2023-06-02 20:26:05 +08:00
CloudJ
4e1cc05c3a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 19:58:07 +08:00
CloudJ
6ff90dafa4 主界面调整 2023-06-02 19:58:05 +08:00
CloudJ
9e46d3e3ec Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 19:32:41 +08:00
CloudJ
5b667ffc0b 替换主界面 2023-06-02 19:32:39 +08:00
Fang
398602f773 修复每日挑战boss模型重叠 2023-06-02 19:32:24 +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
CloudJ
92b5b3655a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 18:40:53 +08:00
CloudJ
3e0beb4500 侧边栏礼包替换spine 2023-06-02 18:40:51 +08:00
Fang
b6936a2c4a 功能解锁飞行动画 2023-06-02 18:35:36 +08:00
xiekaidong
5a9558184b 火箭动画 2023-06-02 17:58:18 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
202e8e74c9 增加一个gm 2023-06-02 15:52:17 +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
chenxi
7a039b6139 处理断线 2023-06-02 11:14:51 +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
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
CloudJ
0c1255a8f8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 17:56: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