625 Commits

Author SHA1 Message Date
CloudJ
9fc8ad0a0b 替换UI 2023-06-05 11:46:29 +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
chenxi
07613ca215 购买体力界面 2023-06-05 10:26:33 +08:00
chenxi
4582299d87 英雄展示界面 2023-06-05 10:24:53 +08:00
chenxi
d4b5e843f0 资源自动修复 2023-06-05 10:05:44 +08:00
chenxi
d286327501 资源处理 2023-06-05 10:03:45 +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
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
CloudJ
55f324b410 添加动画 2023-06-03 22:42:31 +08:00
cccaa3ebe6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 21:52:03 +08:00
1df7800e97 11 2023-06-03 21:51:49 +08:00
chenxi
ea994bb2b3 商城 2023-06-03 21:14:07 +08:00
chenxi
c55be49f22 战斗几个底板替换 2023-06-03 21:09:37 +08:00
chenxi
8e3db7071d 确认框 2023-06-03 21:03:43 +08:00
chenxi
253fa7f308 待机界面 2023-06-03 20:50:00 +08:00
chenxi
759bcedf74 任务界面 2023-06-03 20:30:20 +08:00
chenxi
900bea3586 英雄列表界面 2023-06-03 19:59:22 +08:00
chenxi
43d8b62b4d tips 2023-06-03 19:52:13 +08:00
chenxi
a8eeb96d77 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-03 19:50:42 +08:00
chenxi
8f740dd397 账号删除界面 2023-06-03 19:50:26 +08:00
chenxi
88585f29b0 设置界面 2023-06-03 19:48:30 +08:00
chenxi
8c1e33d0b8 选择语言界面替换 2023-06-03 19:47:22 +08:00
3e8ebb2957 1111111 2023-06-03 19:44:38 +08:00
7062f98d05 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 19:19:14 +08:00
61555cc6e2 11111 2023-06-03 19:19:02 +08:00
xiekaidong
86180bf126 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 19:12:36 +08:00
xiekaidong
e6a28c8acd 修改bug,优化战斗流程逻辑 2023-06-03 19:12:33 +08:00
9d9411bf85 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 19:00:32 +08:00
e843189a47 11 2023-06-03 19:00:21 +08:00
chenxi
54dc9e8622 战令spine动画 2023-06-03 18:59:59 +08:00
749ef57854 111 2023-06-03 17:27:04 +08:00
0778ad36d3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-03 17:26:10 +08:00
752a36b516 1111 2023-06-03 17:25:58 +08:00
chenxi
0daec4cbaa 标题 2023-06-03 15:47:43 +08:00
ce2c70cc05 换影子 2023-06-03 14:41:35 +08:00
95fd4a9f95 daxiao 2023-06-03 11:49:14 +08:00
xiekaidong
3e84aebb20 层级修改 2023-06-02 22:33:49 +08:00
chenxi
5b92d350e6 特效改名 2023-06-02 22:14:35 +08:00
chenxi
c44ef5afba 调整一下资源名 2023-06-02 22:07:00 +08:00
chenxi
0270759629 调整界面 2023-06-02 21:23:00 +08:00
1c92f87fc3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 20:36:26 +08:00
d44d237be1 111 2023-06-02 20:36:14 +08:00
CloudJ
30388af01b 编译 2023-06-02 20:26:57 +08:00
0ebf410c9a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-02 20:22:08 +08:00
00fec789d2 1111 2023-06-02 20:21:55 +08:00
CloudJ
13ade98dec 主界面调整 2023-06-02 19:59:02 +08:00
CloudJ
a52fae7a7e 替换主界面 2023-06-02 19:32:52 +08:00