2414 Commits

Author SHA1 Message Date
chenxi
d46c26539d Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-26 22:09:59 +08:00
7efb97718f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 22:09:28 +08:00
6ce2c4c485 11111 2023-04-26 22:09:10 +08:00
chenxi
47d7cf0c66 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-26 22:02:02 +08:00
82787600fc 连击飘字二三段,数字加大 2023-04-26 21:59:06 +08:00
chenxi
f51f6f76f2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-26 21:57:40 +08:00
chenxi
44c3eddc00 特效 2023-04-26 21:57:35 +08:00
a2eb5105a8 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 21:56:53 +08:00
33e1af0767 连击飘字 2023-04-26 21:56:44 +08:00
xiekaidong
5e1365da88 刘海屏 2023-04-26 21:47:09 +08:00
eb96ead45f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 21:44:22 +08:00
e7c4ca2282 111111111111 2023-04-26 21:44:10 +08:00
chenxi
a3ee32d64c 编译 2023-04-26 21:36:01 +08:00
117839a47d 连击飘字动画 2023-04-26 21:35:08 +08:00
d310f397c7 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 21:22:08 +08:00
71bf9371b9 连击飘字动画 2023-04-26 21:21:47 +08:00
xiekaidong
e43a8ba436 刘海屏适配和伤害字层级 2023-04-26 21:19:52 +08:00
xiekaidong
069072e50c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 21:05:58 +08:00
xiekaidong
71064897c5 特效修改 2023-04-26 21:05:53 +08:00
chenxi
1de83c3dfb 节点 2023-04-26 21:00:58 +08:00
chenxi
acdc68528b ab name 2023-04-26 20:49:09 +08:00
chenxi
e81de3ea03 连击效果 2023-04-26 20:48:06 +08:00
b19d10c567 连击飘字背景动画 2023-04-26 20:27:20 +08:00
chenxi
cc406cece5 fix bug 2023-04-26 19:34:26 +08:00
chenxi
597b00d8ea 编译 2023-04-26 19:02:10 +08:00
chenxi
0c2f2edcfd 图集 2023-04-26 19:00:41 +08:00
chenxi
7b88da3dcb Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-26 18:58:37 +08:00
chenxi
a648cde9b5 启动 2023-04-26 18:58:34 +08:00
xiekaidong
6721e308e9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 18:48:25 +08:00
xiekaidong
8dd23fb8ce 特效丢失问题 2023-04-26 18:48:15 +08:00
chenxi
3f84b2c19a Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-26 18:45:03 +08:00
chenxi
f6ea2f2dbb 更新资源 2023-04-26 18:44:56 +08:00
xiekaidong
fe4ea6ec05 gm修改 2023-04-26 18:42:13 +08:00
xiekaidong
2c7f63baeb bug修复 2023-04-26 18:40:05 +08:00
chenxi
553141fce8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-26 18:28:07 +08:00
chenxi
83486450f0 item cell 2023-04-26 18:28:03 +08:00
xiekaidong
8ebcad8898 界面调整和gm修改 2023-04-26 18:25:25 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
chenxi
e564a8a4b2 编译 2023-04-26 18:08:48 +08:00
81da5b2d58 连击动画 2023-04-26 17:57:54 +08:00
dd4f26856a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 17:03:38 +08:00
4c736ab353 失败动画 2023-04-26 17:03:34 +08:00
chenxi
6c3bf12de0 结算界面 2023-04-26 16:59:21 +08:00
81e0c25bf5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 16:02:24 +08:00
b8a5e2776c 连击数字动画,战斗失败动画 2023-04-26 16:02:06 +08:00
chenxi
4a9625302d 结算界面 2023-04-26 16:01:57 +08:00
chenxi
1458c9c4a6 适配 2023-04-26 15:55:27 +08:00
c35e659a6c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 15:45:44 +08:00
8a065942e4 111111111111 2023-04-26 15:45:27 +08:00
xiekaidong
dcce4ec444 界面调整 2023-04-26 15:42:57 +08:00