2414 Commits

Author SHA1 Message Date
DESKTOP-5E92U9B\BigFoot
1402bac0a5 BOSS动画修改 2023-04-24 11:05:22 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
chenxi
9577713964 更新音效 2023-04-24 10:48:34 +08:00
xiekaidong
b0865a8918 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-24 10:14:41 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
chenxi
0141ca336e 包名调整 2023-04-24 10:03:41 +08:00
chenxi
6d38808ab4 战斗音效调整 2023-04-24 10:01:10 +08:00
chenxi
7dd03ca81b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-24 09:58:08 +08:00
chenxi
b6a573a24a 战斗bgm 2023-04-24 09:57:53 +08:00
xiekaidong
f099cf9228 第二次刷新棋盘时,不下落空元素的bug修复 2023-04-24 09:46:55 +08:00
chenxi
3eafb65fd0 编译 2023-04-23 22:09:24 +08:00
7fb6b28a28 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 21:42:48 +08:00
3d6d0e919b 111111111 2023-04-23 21:42:38 +08:00
chenxi
61e80a527e 特效bug 2023-04-23 21:37:55 +08:00
043d066245 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 21:32:16 +08:00
15600c12f8 1111111111 2023-04-23 21:32:07 +08:00
chenxi
f7d02d1a31 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-23 21:25:48 +08:00
chenxi
7868fa9aa5 编译 2023-04-23 21:25:41 +08:00
cb7b9606d3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 21:07:57 +08:00
8992465be1 英雄顿帧调节 2023-04-23 21:07:53 +08:00
chenxi
f0e8d00a1e 资源自动处理 2023-04-23 21:03:04 +08:00
chenxi
40c267bf5e Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-23 21:01:12 +08:00
chenxi
032f1a9bea 血条bug 2023-04-23 21:01:09 +08:00
f4e027107a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 20:57:39 +08:00
18053f841e 11111111 2023-04-23 20:57:18 +08:00
DESKTOP-5E92U9B\BigFoot
ce93ec10eb 小怪攻击修改 2023-04-23 20:42:43 +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
chenxi
915a6ab5a5 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-23 20:33:54 +08:00
fc35bad92e 111111 2023-04-23 20:33:47 +08:00
chenxi
12279fc1fa 脚本处理 2023-04-23 20:33:47 +08:00
323c6fd146 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 20:25:21 +08:00
f4ca7d14c7 角色技能攻击帧修改 2023-04-23 20:25:03 +08:00
DESKTOP-5E92U9B\BigFoot
d97607e4a6 小怪攻击动画修改 2023-04-23 20:19:36 +08:00
chenxi
db2029efec fix 背景bug 2023-04-23 19:34:29 +08:00
chenxi
2904212cb6 编译 2023-04-23 19:25:20 +08:00
chenxi
04c373fad1 技能音效 2023-04-23 19:21:15 +08:00
chenxi
543febea21 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-23 19:15:05 +08:00
chenxi
f4e8ee1300 更新音效 2023-04-23 19:14:59 +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
40b506d70e 音频 2023-04-23 18:47:32 +08:00
chenxi
f4c45df9aa 编译 2023-04-23 18:46:11 +08:00
662245ee12 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 18:13:46 +08:00
c884935c12 1111111 2023-04-23 18:13:36 +08:00
070639cd1f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 17:57:38 +08:00
68925aaf2b 英雄增加卡帧 2023-04-23 17:57:31 +08:00
a278a671c9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-23 17:42:27 +08:00
8a4b23393e 1111111 2023-04-23 17:42:17 +08:00
xiekaidong
dca6601d90 编译lua 2023-04-23 17:39:29 +08:00