658 Commits

Author SHA1 Message Date
xiekaidong
942014ce6e 替换资源 2023-06-06 20:18:45 +08:00
xiekaidong
ef7d56d981 替换资源 2023-06-06 19:57:28 +08:00
chenxi
3c75dcf7c2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-06 18:52:10 +08:00
chenxi
c6e4978ff6 spine设置 2023-06-06 18:52:04 +08:00
dbaaf7a5ec Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 18:46:09 +08:00
chenxi
4e8ba9e38c ab name 2023-06-06 18:45:15 +08:00
7b47be3fd9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 18:45:15 +08:00
5b0cdcfd6c 111111 2023-06-06 18:45:00 +08:00
chenxi
88cb8a8538 字体 2023-06-06 18:42:02 +08:00
xiekaidong
7d605b1a26 资源改名 2023-06-06 14:22:14 +08:00
chenxi
c2b8fb84e2 loading 2023-06-06 11:56:03 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
chenxi
f91872672a 音效和ab 2023-06-06 11:30:15 +08:00
xiekaidong
a6f88ab4ad Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/sounds/sfx/ui/ui_summon_start.wav.meta
2023-06-06 11:08:41 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +08:00
xiekaidong
e487a6aaba 资源上传 2023-06-06 11:08:19 +08:00
xiekaidong
77d06b3e1e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
2023-06-06 11:02:55 +08:00
xiekaidong
b2f8e11059 音效 2023-06-06 11:01:33 +08:00
801ad5ee4f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 11:01:17 +08:00
ed3e988e03 1111 2023-06-06 11:01:05 +08:00
Fang
a320979c7e 替换结算界面失败动画 2023-06-06 11:00:16 +08:00
DESKTOP-5E92U9B\BigFoot
a4e64d1eab 主角修改 2023-06-06 10:53:49 +08:00
xiekaidong
d357e0c69b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 10:39:07 +08:00
xiekaidong
d56c7110d7 boss预警音效 2023-06-06 10:39:04 +08:00
chenxi
b409ab7e86 资源 2023-06-06 10:35:12 +08:00
CloudJ
ee24231070 替换界面 2023-06-06 10:16:30 +08:00
chenxi
d00eef7856 ab name 2023-06-05 21:33:26 +08:00
chenxi
c1b42c312f ziyuan 2023-06-05 21:31:45 +08:00
5e62155002 111 2023-06-05 21:19:54 +08:00
884470d997 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 21:09:40 +08:00
0c7981c28b 111 2023-06-05 21:09:26 +08:00
chenxi
e8cbf8ebc6 ui 2023-06-05 21:05:24 +08:00
chenxi
0e93f635ba 红点位置 2023-06-05 20:41:57 +08:00
chenxi
a1c7b18428 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 20:32:23 +08:00
chenxi
12ace817dd 战令 2023-06-05 20:08:57 +08:00
xiekaidong
a9baeccc0e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 20:07:13 +08:00
xiekaidong
9040c5d2ae 特效 2023-06-05 20:07:09 +08:00
chenxi
22b2bc9553 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 19:54:58 +08:00
chenxi
83363f4694 主城资源 2023-06-05 19:54:50 +08:00
xiekaidong
15bc158263 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 19:50:13 +08:00
xiekaidong
7a00b64dcf 音效资源上传 2023-06-05 19:50:10 +08:00
CloudJ
a004ed6065 替换贴图 2023-06-05 19:40:34 +08:00
chenxi
d1ec620837 资源自动处理和ab name 2023-06-05 19:19:17 +08:00
Fang
229690f71b 结算界面动画替换、每日挑战背景替换 2023-06-05 19:08:31 +08:00
7a33756b62 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 18:54:15 +08:00
b60720abc6 1111 2023-06-05 18:54:00 +08:00
Fang
123128ce1f 结算界面金猪动画 2023-06-05 18:30:16 +08:00
CloudJ
3df1cb16dc 宝箱spine替换 2023-06-05 18:31:05 +08:00
4b10af756d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 18:17:02 +08:00
d398094432 1111 2023-06-05 18:16:49 +08:00