1015 Commits

Author SHA1 Message Date
chenxi
5f71cef0f1 编译 2023-04-27 19:09:12 +08:00
chenxi
0cbfa8841c 编译 2023-04-27 18:39:24 +08:00
chenxi
fa8715a3e2 替换资源 2023-04-27 18:29:31 +08:00
xiekaidong
db7896e13b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-27 18:07:08 +08:00
9d47c04bc0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-27 18:06:37 +08:00
xiekaidong
c8caf1396f 日志上报修改 2023-04-27 18:06:34 +08:00
1a8fcdd45b 连击飘字 2023-04-27 18:06:33 +08:00
chenxi
1327f70567 替换资源 2023-04-27 17:57:41 +08:00
chenxi
472cd41247 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-27 17:55:58 +08:00
chenxi
f9ecb5248c 加一个音效 2023-04-27 17:55:46 +08:00
xiekaidong
41eeee3e2a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-27 17:43:44 +08:00
xiekaidong
379f98d728 技能回收最多3个 2023-04-27 17:43:41 +08:00
chenxi
786937833b 更新配置 2023-04-27 17:29:45 +08:00
chenxi
8df4a4c033 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-27 16:35:23 +08:00
chenxi
51e9b75ccc . 2023-04-27 16:33:15 +08:00
chenxi
648700b7bf . 2023-04-27 16:32:52 +08:00
xiekaidong
45a449c4df 暂停界面显示修改 2023-04-27 16:30:22 +08:00
xiekaidong
97b99f6675 时间bug修复 2023-04-27 16:16:31 +08:00
chenxi
f3e3ca3ddd Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-27 15:44:43 +08:00
chenxi
266923f486 bufftips层级 2023-04-27 15:44:37 +08:00
xiekaidong
05965fa97e bug修复 2023-04-27 15:24:50 +08:00
chenxi
177490d2c1 多语言适配 2023-04-27 14:50:35 +08:00
chenxi
aa5c443e91 刘海 2023-04-27 14:41:04 +08:00
xiekaidong
e6b56b51ec bug修复 2023-04-27 14:25:00 +08:00
chenxi
46f9462b79 回血加盾不算combo 2023-04-27 14:22:21 +08:00
chenxi
a53ebdbd05 刘海屏适配 2023-04-27 14:13:12 +08:00
chenxi
2c9269737a 刘海屏 2023-04-27 14:12:09 +08:00
chenxi
8a3ab0edfb 删除不用的资源 2023-04-27 11:48:57 +08:00
chenxi
802e639c4c 整理 2023-04-27 11:47:54 +08:00
chenxi
45b094d236 整理 2023-04-27 11:45:37 +08:00
chenxi
ec25f0d35e 整理 2023-04-27 11:44:58 +08:00
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