784 Commits

Author SHA1 Message Date
chenxi
ebacac5b05 整理 2023-04-27 11:43:57 +08:00
xiekaidong
2ad2441a9e 更新图集 2023-04-27 11:04:45 +08:00
chenxi
c2ce86c24b 震屏bug 2023-04-27 11:02:57 +08:00
xiekaidong
0a3fbd1e2c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-27 10:18:57 +08:00
chenxi
735d2b9523 编译 2023-04-27 10:11:13 +08:00
xiekaidong
4b877d44fe 改一下执行顺序 2023-04-27 09:49:15 +08:00
chenxi
12db5b0b01 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-27 09:46:07 +08:00
chenxi
c22f24c519 刘海屏 2023-04-27 09:46:04 +08:00
xiekaidong
e4c3d3b172 调整一下bi打印逻辑 2023-04-27 09:45:26 +08:00
chenxi
cefd12b88e spine设置 2023-04-26 23:41:46 +08:00
chenxi
05d83e482d 刘海屏适配 2023-04-26 23:06:48 +08:00
chenxi
a7b2e951f5 资源 2023-04-26 22:37:16 +08:00
chenxi
d305b7c103 编译 2023-04-26 22:32:38 +08:00
chenxi
6812b2c80c 层级 2023-04-26 22:30:18 +08:00
chenxi
ee1f0b99e2 连击效果 2023-04-26 22:24:35 +08:00
f9e0566fe2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 22:15:10 +08:00
32622db90d 删除连击飘字一段背景版 2023-04-26 22:14:49 +08:00
4dd4d3969d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-26 22:13:43 +08:00
eeaec143c0 111111111 2023-04-26 22:13:33 +08:00
chenxi
888c78f19d facebook 2023-04-26 22:13:15 +08:00
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