672 Commits

Author SHA1 Message Date
CloudJ
d20aa78385 配置表 2023-06-05 14:10:27 +08:00
chenxi
5d3f0c1bf7 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 12:03:46 +08:00
chenxi
447456612e 金猪bug 2023-06-05 12:03:37 +08:00
Fang
1ed63af6ed 主界面按钮spine替换 2023-06-05 11:45:51 +08:00
CloudJ
aa3bb714ac Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 11:45:42 +08:00
CloudJ
f2c8b0317b 替换宝箱UI 2023-06-05 11:45:39 +08:00
xiekaidong
523397f39a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 11:05:03 +08:00
xiekaidong
c43e51b3d4 每日挑战引导 2023-06-05 11:05:00 +08:00
Fang
5d9e8d33de 容错处理 2023-06-05 10:59:10 +08:00
CloudJ
1cf9b182d0 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 10:56:45 +08:00
Fang
827c282c62 首次进入每日挑战未显示任务弹窗fix 2023-06-05 10:41:20 +08:00
Fang
a8f727c014 每日挑战首次解锁显示fix 2023-06-05 10:41:20 +08:00
chenxi
38b099a0ec 英雄展示界面 2023-06-05 10:24:26 +08:00
CloudJ
98a9658bca 抽卡跳过 2023-06-05 10:24:01 +08:00
chenxi
6e65ce411f tips 2023-06-04 22:55:36 +08:00
chenxi
dc32cdfd38 战令界面 2023-06-04 22:37:25 +08:00
chenxi
40f09ed39f 战令界面 2023-06-04 22:31:11 +08:00
chenxi
29e23ea88a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-03 23:52:25 +08:00
chenxi
e3e0b5c761 邮箱 2023-06-03 23:52:18 +08:00
CloudJ
954d4c317d 商城跳转功能 2023-06-03 23:29:23 +08:00
CloudJ
1d7603ac2e 首充侧边栏替换 2023-06-03 22:55:39 +08:00
CloudJ
a48651b348 抽卡动画添加战令宝箱部分 2023-06-03 22:42:09 +08:00
chenxi
0fc3edfe24 确认框 2023-06-03 21:03:13 +08:00
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