509 Commits

Author SHA1 Message Date
xiekaidong
c100a36de5 bug修复 2023-04-25 17:52:09 +08:00
chenxi
176fa1f3a7 编译 2023-04-25 17:49:16 +08:00
d36f563dd1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 17:33:43 +08:00
fc307bf7e0 p0007 2023-04-25 17:33:28 +08:00
chenxi
faaac6ca20 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-25 17:28:10 +08:00
chenxi
ba84647dc1 lua 2023-04-25 17:28:06 +08:00
fa20e8111e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 17:13:02 +08:00
aecf282bd9 p0007技能优化 2023-04-25 17:12:59 +08:00
chenxi
44fcc31653 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-25 17:08:31 +08:00
chenxi
eeab311c66 icon 2023-04-25 17:08:24 +08:00
5f3e634ad1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 16:44:34 +08:00
6d98c4d529 11111111111 2023-04-25 16:43:44 +08:00
4e6f88bf59 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 16:42:46 +08:00
ad3a2e79ba 调整p0002攻击节奏 2023-04-25 16:42:42 +08:00
chenxi
aa7b47357d 编译 2023-04-25 16:22:11 +08:00
chenxi
401b4c9e2e 编译 2023-04-25 16:20:47 +08:00
chenxi
aaef04562a Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-25 16:09:22 +08:00
chenxi
212561b908 adjust 2023-04-25 16:09:17 +08:00
xiekaidong
de0eea04d7 更新配置 2023-04-25 16:07:33 +08:00
xiekaidong
c1836e701c bug修复 2023-04-25 16:05:17 +08:00
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
macmini
5ef9faadda 资源 2023-04-25 15:38:00 +08:00
xiekaidong
d77e728228 界面退出时清除状态 2023-04-25 15:24:20 +08:00
xiekaidong
5f6d63fef3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/prefabs/ui/battle/battle_ui.prefab
2023-04-25 15:11:10 +08:00
xiekaidong
b23fee04b2 战斗界面 2023-04-25 15:10:15 +08:00
xiekaidong
33d42bf07d 技能生成特效 2023-04-25 15:08:59 +08:00
chenxi
9f97e78cf7 胜利失败音效 2023-04-25 15:06:05 +08:00
chenxi
48a7ff65e1 战斗界面 2023-04-25 14:43:50 +08:00
xiekaidong
66e4eb5229 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 14:41:21 +08:00
xiekaidong
1b051206e2 删除下落动画 2023-04-25 14:41:07 +08:00
chenxi
9afe9a1af0 编译 2023-04-25 14:40:59 +08:00
xiekaidong
27c55946a6 特效 2023-04-25 13:02:05 +08:00
xiekaidong
9092adfefa 特效 2023-04-25 13:01:41 +08:00
xiekaidong
2dfc5f97aa Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 12:10:14 +08:00
xiekaidong
9314b54909 速度调整 2023-04-25 12:10:06 +08:00
chenxi
cc2dc24479 编译 2023-04-25 12:09:30 +08:00
DESKTOP-5E92U9B\BigFoot
b8fe887a76 UI动画上传 2023-04-25 12:04:45 +08:00
chenxi
d17282cfd0 编译 2023-04-25 11:58:49 +08:00
xiekaidong
269b1e8463 棋盘消除特效 2023-04-25 11:51:09 +08:00
xiekaidong
f2eee43d33 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 11:50:25 +08:00
xiekaidong
791dd296a2 棋盘消除特效 2023-04-25 11:50:22 +08:00
chenxi
d2d8bc9e79 ui 2023-04-25 11:38:46 +08:00
chenxi
6200cbf3f4 编译 2023-04-25 11:09:03 +08:00
7a9326aa56 11111111111 2023-04-25 11:02:27 +08:00
707f711254 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 10:59:20 +08:00
bf07dd6a0e 11111111111 2023-04-25 10:59:07 +08:00
55129abea1 111111111 2023-04-25 10:56:56 +08:00
chenxi
5a827f14e9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-25 10:49:00 +08:00
chenxi
8a12f83d20 编译 2023-04-25 10:48:52 +08:00
adee78e7e5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-25 10:44:25 +08:00