1677 Commits

Author SHA1 Message Date
489b87dd90 11 2023-06-05 15:54:29 +08:00
chenxi
3739698944 替换界面 2023-06-05 15:51:13 +08:00
xiekaidong
dbc4b35bdd 更新资源 2023-06-05 15:42:41 +08:00
xiekaidong
d49ef8314b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 15:38:42 +08:00
CloudJ
c89fd760e4 商城宝箱spine替换 2023-06-05 15:38:34 +08:00
xiekaidong
92876d1fcd 更改奖励上报 2023-06-05 15:38:30 +08:00
c6d1e5c6e0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 15:31:57 +08:00
d5db0f4ac6 11111 2023-06-05 15:31:38 +08:00
CloudJ
5008ac9a76 编译 2023-06-05 15:21:06 +08:00
CloudJ
5d8c4f3736 调整spine 2023-06-05 15:20:48 +08:00
chenxi
6890295cab 替换资源 2023-06-05 15:09:26 +08:00
chenxi
2f6f2861b8 金猪动画 2023-06-05 15:08:25 +08:00
CloudJ
868bae9fed 礼包UI调整 2023-06-05 14:52:43 +08:00
CloudJ
e22dcf7a06 商城礼包UI 2023-06-05 14:50:26 +08:00
CloudJ
9c2745302f 编译 2023-06-05 14:21:57 +08:00
CloudJ
4661996247 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 14:10:59 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
chenxi
18b19f93a4 金猪bug 2023-06-05 12:09:27 +08:00
CloudJ
b46065772c 编译 2023-06-05 11:48:01 +08:00
Fang
1f3b0257f7 Merge branch 'fang/victory_anim' into dev 2023-06-05 11:47:44 +08:00
Fang
6bb2ec2e85 主界面按钮spine替换 2023-06-05 11:47:32 +08:00
Fang
4d914f84b0 每日挑战替图 2023-06-05 11:47:32 +08:00
CloudJ
274046809f Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 11:46:31 +08:00
CloudJ
9fc8ad0a0b 替换UI 2023-06-05 11:46:29 +08:00
xiekaidong
431fb21513 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 11:05:20 +08:00
xiekaidong
f7a16c8b5c 每日挑战引导 2023-06-05 11:05:17 +08:00
CloudJ
aa04bc028b 编译 2023-06-05 10:58:59 +08:00
CloudJ
4258abd474 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/atlas/ui/shop.asset
2023-06-05 10:58:33 +08:00
CloudJ
4d5ad2f87a 替换UI 2023-06-05 10:58:24 +08:00
xiekaidong
120258758a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 10:46:41 +08:00
xiekaidong
e2e071c73d 技能选择规则优化 2023-06-05 10:46:37 +08:00
Fang
fea1fa2ff9 Merge branch 'fang/victory_anim' into dev 2023-06-05 10:43:20 +08:00
Fang
6c637656e5 编译 2023-06-05 10:43:13 +08:00
chenxi
cad2a74311 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 10:40:30 +08:00
chenxi
509194f3cb 资源替换 2023-06-05 10:40:23 +08:00
xiekaidong
59aa0bd83c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 10:39:09 +08:00
xiekaidong
9d25c123c5 bug修复 2023-06-05 10:37:15 +08:00
chenxi
67a51ed237 更新pb 2023-06-05 10:36:45 +08:00
chenxi
07613ca215 购买体力界面 2023-06-05 10:26:33 +08:00
chenxi
4582299d87 英雄展示界面 2023-06-05 10:24:53 +08:00
chenxi
cdd9d6183b 更新配置 2023-06-05 10:08:06 +08:00
chenxi
d4b5e843f0 资源自动修复 2023-06-05 10:05:44 +08:00
chenxi
a316d5c1cb Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 10:03:52 +08:00
chenxi
d286327501 资源处理 2023-06-05 10:03:45 +08:00
ef5fc88ad6 HIT帧数 2023-06-05 09:57:05 +08:00
chenxi
54916a961e tips 2023-06-04 22:56:16 +08:00
chenxi
33edfece08 替换战令界面 2023-06-04 22:38:12 +08:00
chenxi
e879baf47b 替换ui 2023-06-04 22:19:28 +08:00
chenxi
042e8f8f58 登录的参数 2023-06-04 20:13:44 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00