126 Commits

Author SHA1 Message Date
xiekaidong
891d0d35ed 消除bug修复 2023-04-24 20:50:18 +08:00
xiekaidong
b78493fc7a 修复一些bug 2023-04-24 20:18:32 +08:00
xiekaidong
751202994f 死局问题修复 2023-04-24 19:30:18 +08:00
xiekaidong
7fec730792 bug修复 2023-04-24 18:08:28 +08:00
xiekaidong
f59f19e609 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-24 18:02:00 +08:00
xiekaidong
078022596b 烟雾特效 2023-04-24 18:01:57 +08:00
chenxi
a39b333d38 fix bug 2023-04-24 17:49:17 +08:00
chenxi
01ec336b13 编译 2023-04-24 17:39:40 +08:00
xiekaidong
dc519e9f36 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-24 17:38:57 +08:00
xiekaidong
461cc41ac4 修改主界面 2023-04-24 17:38:44 +08:00
chenxi
14a9a938c7 fix bug 2023-04-24 17:25:11 +08:00
xiekaidong
39e9ba43a0 动画 2023-04-24 17:21:12 +08:00
chenxi
0bae4aa36d 伤害数字 2023-04-24 15:37:48 +08:00
xiekaidong
800d806ef5 英雄界面特效 2023-04-24 15:17:48 +08:00
chenxi
4835b670ba 编译 2023-04-24 14:56:58 +08:00
xiekaidong
79f39ede70 界面调整 2023-04-24 14:21:23 +08:00
xiekaidong
9184710970 显示优化 2023-04-24 14:16:44 +08:00
xiekaidong
31950885ef 宝箱修改 2023-04-24 11:22:05 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
chenxi
3eafb65fd0 编译 2023-04-23 22:09:24 +08:00
chenxi
61e80a527e 特效bug 2023-04-23 21:37:55 +08:00
chenxi
7868fa9aa5 编译 2023-04-23 21:25:41 +08:00
chenxi
2904212cb6 编译 2023-04-23 19:25:20 +08:00
chenxi
04c373fad1 技能音效 2023-04-23 19:21:15 +08:00
xiekaidong
1da0916885 编译lua 2023-04-23 19:03:58 +08:00
xiekaidong
63a02c14ca Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/module/battle/battle_const.lua.bytes
2023-04-23 19:03:12 +08:00
xiekaidong
9249bc74f7 消除技能特效 2023-04-23 19:03:00 +08:00
chenxi
f4c45df9aa 编译 2023-04-23 18:46:11 +08:00
xiekaidong
dca6601d90 编译lua 2023-04-23 17:39:29 +08:00
xiekaidong
fd6eb94de4 bug和显示优化 2023-04-23 17:22:33 +08:00
xiekaidong
34477a609f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 16:18:35 +08:00
xiekaidong
f5168863a3 引导特效消失得问题 2023-04-23 16:18:25 +08:00
chenxi
fd1576bec8 编译 2023-04-23 16:16:35 +08:00
xiekaidong
b2fb08e435 英雄排序bug修复 2023-04-23 15:49:10 +08:00
xiekaidong
9370ac6715 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 12:08:05 +08:00
xiekaidong
b1835f1da3 优化排序 2023-04-23 12:08:00 +08:00
chenxi
14a6a9e198 伤害数字 2023-04-23 11:44:56 +08:00
xiekaidong
7c9158fa00 随机棋盘bug修复 2023-04-23 11:35:40 +08:00
xiekaidong
17c38bf2c0 bug修复 2023-04-23 10:53:47 +08:00
xiekaidong
fa08d49955 资源替换 2023-04-23 09:56:15 +08:00
xiekaidong
49f2398106 延迟结算 2023-04-22 00:58:52 +08:00
xiekaidong
97f473eb2c 修改特效,消除影响改为十字形 2023-04-22 00:47:15 +08:00
chenxi
1059ad3c48 编译 2023-04-22 00:33:31 +08:00
chenxi
8771751211 编译 2023-04-22 00:06:20 +08:00
chenxi
7354b90491 编译 2023-04-21 23:33:09 +08:00
chenxi
8c4fb9c3c9 . 2023-04-21 23:11:05 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
40b4ce4bf4 结算界面 2023-04-21 22:42:16 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00