chenxi
|
26a7e3915b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-04-21 20:38:08 +08:00 |
|
chenxi
|
e2d6673810
|
资源
|
2023-04-21 20:37:42 +08:00 |
|
xiekaidong
|
1bbedf0181
|
引导适配
|
2023-04-21 20:36:46 +08:00 |
|
xiekaidong
|
67e1428e45
|
更新配置
|
2023-04-21 19:49:33 +08:00 |
|
chenxi
|
56859eb886
|
FB设置
|
2023-04-21 19:22:38 +08:00 |
|
|
|
2a1c37c51d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-21 18:48:06 +08:00 |
|
|
|
4500ec3b76
|
11111111111
|
2023-04-21 18:47:54 +08:00 |
|
chenxi
|
a2419d68cf
|
bianyi
|
2023-04-21 18:38:59 +08:00 |
|
|
|
908d5701b3
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-21 18:27:11 +08:00 |
|
|
|
977e00a4ec
|
11111111
|
2023-04-21 18:27:02 +08:00 |
|
chenxi
|
2eb797b0ed
|
编译
|
2023-04-21 18:23:00 +08:00 |
|
xiekaidong
|
09f97143a6
|
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 18:16:55 +08:00 |
|
xiekaidong
|
fbeee8a970
|
引导和报错
|
2023-04-21 18:16:42 +08:00 |
|
chenxi
|
43eb5ba803
|
编译
|
2023-04-21 17:59:18 +08:00 |
|
chenxi
|
a2173b0565
|
编译
|
2023-04-21 17:44:37 +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
|
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 |
|
