1709 Commits

Author SHA1 Message Date
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
dce63f5fab ab name 2023-04-21 23:03:02 +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
xiekaidong
a1ca05dbb9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 21:40:57 +08:00
xiekaidong
2152e1e755 战斗音效 2023-04-21 21:40:55 +08:00
chenxi
dd040045c9 编译 2023-04-21 21:25:02 +08:00
xiekaidong
dfdb8ce4e8 节奏调整 2023-04-21 21:21:07 +08:00
xiekaidong
2311761568 表现修改 2023-04-21 21:03:21 +08:00
xiekaidong
06b54d8f34 bug修复 2023-04-21 20:50:58 +08:00
xiekaidong
415fecdf8f bug修复 2023-04-21 20:45:15 +08:00
xiekaidong
36a8f3c066 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
2023-04-21 20:44:49 +08:00
xiekaidong
9f0b9e921d bug修复 2023-04-21 20:44:09 +08:00
chenxi
e2d6673810 资源 2023-04-21 20:37:42 +08:00
xiekaidong
67e1428e45 更新配置 2023-04-21 19:49:33 +08:00
chenxi
a2419d68cf bianyi 2023-04-21 18:38:59 +08:00
chenxi
2eb797b0ed 编译 2023-04-21 18:23:00 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
xiekaidong
2665fe4a50 i18nbug修复 2023-04-21 17:37:33 +08:00
xiekaidong
cf15eb8953 初始化数据 2023-04-21 17:05:52 +08:00
xiekaidong
b9511a8d4b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
2023-04-21 16:49:55 +08:00
xiekaidong
53a33007d9 关卡固定肉鸽技能、技能可以开始就任意链接 2023-04-21 16:49:46 +08:00
chenxi
77c5806104 merge 2023-04-21 16:32:08 +08:00
chenxi
ad3f9961d7 编译 2023-04-21 16:30:58 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
chenxi
3cb237de48 fix bug 2023-04-21 14:53:28 +08:00
chenxi
de96f55850 编译 2023-04-21 14:27:39 +08:00
chenxi
5ba1ade099 编译 2023-04-21 14:22:34 +08:00
chenxi
62a3ba1905 红点 2023-04-21 11:57:11 +08:00
xiekaidong
0b47632138 bug修复 2023-04-21 11:00:32 +08:00
xiekaidong
6c0307c660 动画 2023-04-21 10:57:51 +08:00
xiekaidong
e4fe7b4882 关卡数据容错 2023-04-21 09:57:02 +08:00
chenxi
2cbc5582f5 战斗加速 2023-04-20 23:09:00 +08:00
chenxi
c603125410 编译 2023-04-20 22:52:59 +08:00
chenxi
a065253b43 编译 2023-04-20 22:42:51 +08:00
chenxi
e36099a0e7 编译 tips 2023-04-20 22:15:16 +08:00
xiekaidong
9f35910fc6 英雄解锁逻辑 2023-04-20 21:53:22 +08:00
chenxi
3e0f6af2da 编译 2023-04-20 21:49:28 +08:00
xiekaidong
a564a7aba3 修改 2023-04-20 21:37:23 +08:00
xiekaidong
46818a52e9 技能解锁 2023-04-20 21:27:33 +08:00
chenxi
eac9e5753a tips 2023-04-20 21:09:11 +08:00
chenxi
b402578058 编译 2023-04-20 20:54:58 +08:00
xiekaidong
96cba83db9 动画调整 2023-04-20 20:30:56 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
xiekaidong
c1119c5b9a 修复 2023-04-20 18:50:27 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00