234 Commits

Author SHA1 Message Date
xiekaidong
06d9d3168f 宝箱修改 2023-04-24 11:21:46 +08:00
3d6d0e919b 111111111 2023-04-23 21:42:38 +08:00
15600c12f8 1111111111 2023-04-23 21:32:07 +08:00
18053f841e 11111111 2023-04-23 20:57:18 +08:00
f2430550b7 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 20:33:56 +08:00
fc35bad92e 111111 2023-04-23 20:33:47 +08:00
chenxi
12279fc1fa 脚本处理 2023-04-23 20:33:47 +08:00
xiekaidong
9249bc74f7 消除技能特效 2023-04-23 19:03:00 +08:00
c884935c12 1111111 2023-04-23 18:13:36 +08:00
8a4b23393e 1111111 2023-04-23 17:42:17 +08:00
197b9a15d5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 16:09:16 +08:00
c24c10c2e4 111111 2023-04-23 16:09:03 +08:00
xiekaidong
e0291e4ee6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 15:29:52 +08:00
xiekaidong
c1e54bb671 动画 2023-04-23 15:29:49 +08:00
chenxi
02bafb2511 编译 2023-04-23 14:34:26 +08:00
chenxi
14a6a9e198 伤害数字 2023-04-23 11:44:56 +08:00
xiekaidong
8f4d906091 结算界面对齐方式 2023-04-22 00:53:02 +08:00
xiekaidong
524db7650d 动画修改 2023-04-22 00:27:13 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
40b4ce4bf4 结算界面 2023-04-21 22:42:16 +08:00
xiekaidong
1bbedf0181 引导适配 2023-04-21 20:36:46 +08:00
4500ec3b76 11111111111 2023-04-21 18:47:54 +08:00
908d5701b3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 18:27:11 +08:00
977e00a4ec 11111111 2023-04-21 18:27:02 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
chenxi
ad3f9961d7 编译 2023-04-21 16:30:58 +08:00
chenxi
ae20156744 battle ui 2023-04-21 16:27:46 +08:00
xiekaidong
51436d26f5 引导 2023-04-21 16:14:42 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
befacdd446 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 15:06:38 +08:00
5bc440aa5c 11111111 2023-04-21 15:06:28 +08:00
chenxi
72fd190f6a 适配 2023-04-21 11:58:11 +08:00
chenxi
62a3ba1905 红点 2023-04-21 11:57:11 +08:00
xiekaidong
c5d005f690 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 10:57:55 +08:00
xiekaidong
6c0307c660 动画 2023-04-21 10:57:51 +08:00
chenxi
a14d753aed 适配 2023-04-21 10:44:35 +08:00
1972974b31 111111111 2023-04-21 10:20:47 +08:00
chenxi
b1521fe8e4 删除特效资源 2023-04-21 10:15:35 +08:00
chenxi
e36099a0e7 编译 tips 2023-04-20 22:15:16 +08:00
71cfdd0644 111111111 2023-04-20 21:43:39 +08:00
xiekaidong
8e50d8a36a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 21:27:05 +08:00
xiekaidong
caf9f121dc 技能解锁 2023-04-20 21:27:02 +08:00
chenxi
eac9e5753a tips 2023-04-20 21:09:11 +08:00
xiekaidong
96cba83db9 动画调整 2023-04-20 20:30:56 +08:00
chenxi
429adb121e ui 2023-04-20 19:25:40 +08:00
chenxi
0cd0ba2366 伤害 2023-04-20 19:04:18 +08:00
xiekaidong
c1119c5b9a 修复 2023-04-20 18:50:27 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
xiekaidong
af244ed017 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/prefabs/ui/battle/cell/grid_cell.prefab
2023-04-20 18:14:27 +08:00
xiekaidong
0a38b7137a 特效 2023-04-20 18:14:11 +08:00