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
|
ae20156744
|
battle ui
|
2023-04-21 16:27:46 +08:00 |
|
xiekaidong
|
51436d26f5
|
引导
|
2023-04-21 16:14:42 +08:00 |
|
xiekaidong
|
9a5c8c38f9
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/prefabs/ui/battle/battle_ui.prefab
|
2023-04-21 16:11:36 +08:00 |
|
xiekaidong
|
ff1da8c1b6
|
战斗引导
|
2023-04-21 16:11:13 +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
|
3cb237de48
|
fix bug
|
2023-04-21 14:53:28 +08:00 |
|
xiekaidong
|
4c7ff00f27
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-21 14:28:46 +08:00 |
|
xiekaidong
|
8744238499
|
替换资源
|
2023-04-21 14:28:42 +08:00 |
|
chenxi
|
de96f55850
|
编译
|
2023-04-21 14:27:39 +08:00 |
|
chenxi
|
5ba1ade099
|
编译
|
2023-04-21 14:22:34 +08:00 |
|
chenxi
|
72fd190f6a
|
适配
|
2023-04-21 11:58:11 +08:00 |
|
chenxi
|
ad11e4dd86
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-04-21 11:57:17 +08:00 |
|
chenxi
|
62a3ba1905
|
红点
|
2023-04-21 11:57:11 +08:00 |
|
|
|
4e43d8c78d
|
小怪优化
|
2023-04-21 11:56:56 +08:00 |
|
|
|
418cc2587c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-21 11:30:26 +08:00 |
|
|
|
14c6a816ab
|
小怪加move
|
2023-04-21 11:30:13 +08:00 |
|
xiekaidong
|
0b47632138
|
bug修复
|
2023-04-21 11:00:32 +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 |
|
chenxi
|
2f402182a7
|
资源自动处理
|
2023-04-21 10:37:19 +08:00 |
|
|
|
1972974b31
|
111111111
|
2023-04-21 10:20:47 +08:00 |
|
chenxi
|
b1521fe8e4
|
删除特效资源
|
2023-04-21 10:15:35 +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 |
|
|
|
a44567929a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-20 21:43:59 +08:00 |
|
|
|
71cfdd0644
|
111111111
|
2023-04-20 21:43:39 +08:00 |
|
xiekaidong
|
a564a7aba3
|
修改
|
2023-04-20 21:37:23 +08:00 |
|
xiekaidong
|
46818a52e9
|
技能解锁
|
2023-04-20 21:27:33 +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 |
|
chenxi
|
b402578058
|
编译
|
2023-04-20 20:54:58 +08:00 |
|
xiekaidong
|
96cba83db9
|
动画调整
|
2023-04-20 20:30:56 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
f1219289ab
|
UI动画上传
|
2023-04-20 20:26:40 +08:00 |
|
xiekaidong
|
e341b1dd6b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-20 19:57:07 +08:00 |
|
