chenxi
|
173b47020f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-04-18 21:33:18 +08:00 |
|
chenxi
|
1d273ac45e
|
战斗ui
|
2023-04-18 21:33:15 +08:00 |
|
xiekaidong
|
f270facc6a
|
技能图标变形
|
2023-04-18 21:03:40 +08:00 |
|
xiekaidong
|
be2742a5b8
|
战斗场景
|
2023-04-18 20:48:04 +08:00 |
|
xiekaidong
|
657ea34bac
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-18 20:46:37 +08:00 |
|
xiekaidong
|
3561df066b
|
界面调整
|
2023-04-18 20:46:34 +08:00 |
|
chenxi
|
6e1cdfd16a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-04-18 20:37:56 +08:00 |
|
chenxi
|
534deaf72d
|
编译
|
2023-04-18 20:37:49 +08:00 |
|
xiekaidong
|
21f51521de
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-18 20:37:23 +08:00 |
|
xiekaidong
|
c121247df8
|
bug修改
|
2023-04-18 20:37:19 +08:00 |
|
chenxi
|
5c4ac71747
|
最新资源
|
2023-04-18 20:32:27 +08:00 |
|
chenxi
|
49128e8612
|
spine资源
|
2023-04-18 20:24:54 +08:00 |
|
chenxi
|
7024404d8f
|
编译
|
2023-04-18 20:10:27 +08:00 |
|
xiekaidong
|
5fad7fe709
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-18 19:52:57 +08:00 |
|
xiekaidong
|
77bdd90527
|
删除无用资源
|
2023-04-18 19:52:53 +08:00 |
|
chenxi
|
5c54e7077f
|
编译
|
2023-04-18 19:00:18 +08:00 |
|
xiekaidong
|
aa8de9d540
|
编译lua
|
2023-04-18 18:01:07 +08:00 |
|
xiekaidong
|
d5e5f57637
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-18 17:58:54 +08:00 |
|
xiekaidong
|
323749f238
|
界面调整
|
2023-04-18 17:58:50 +08:00 |
|
chenxi
|
eebce5736f
|
编译
|
2023-04-18 17:45:05 +08:00 |
|
chenxi
|
b93b195341
|
更新英雄资源
|
2023-04-18 16:08:10 +08:00 |
|
chenxi
|
5c8964148d
|
编译
|
2023-04-18 16:06:08 +08:00 |
|
chenxi
|
bdf196754d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-04-18 16:05:01 +08:00 |
|
chenxi
|
49b0499a43
|
关键伤害帧
|
2023-04-18 16:04:58 +08:00 |
|
xiekaidong
|
63af2403d4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-18 15:06:16 +08:00 |
|
xiekaidong
|
828631fdce
|
资源
|
2023-04-18 15:06:12 +08:00 |
|
chenxi
|
7e76d21958
|
编译
|
2023-04-18 12:18:45 +08:00 |
|
chenxi
|
e9cf5af678
|
援助攻击
|
2023-04-17 22:11:09 +08:00 |
|
chenxi
|
25a3b2a846
|
编译
|
2023-04-17 18:41:06 +08:00 |
|
chenxi
|
af8adbe236
|
编译
|
2023-04-17 16:53:55 +08:00 |
|
chenxi
|
670f09221d
|
资源
|
2023-04-17 16:46:13 +08:00 |
|
chenxi
|
b55aa3df89
|
英雄动作
|
2023-04-17 16:27:55 +08:00 |
|
xiekaidong
|
6c7b75abf2
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-04-17 15:19:47 +08:00 |
|
xiekaidong
|
5ba9c3a3ae
|
界面处理
|
2023-04-17 15:19:44 +08:00 |
|
chenxi
|
6538ebe5b6
|
怪物技能
|
2023-04-17 11:58:50 +08:00 |
|
chenxi
|
9e41e319b4
|
编译
|
2023-04-17 00:10:12 +08:00 |
|
chenxi
|
07dd3631c4
|
编译
|
2023-04-16 23:06:53 +08:00 |
|
xiekaidong
|
37c03ab8ab
|
一些细节调整
|
2023-04-15 16:47:28 +08:00 |
|
xiekaidong
|
57f67839af
|
开宝箱
|
2023-04-15 14:57:43 +08:00 |
|
xiekaidong
|
b301bf09fa
|
关卡宝箱
|
2023-04-15 14:45:52 +08:00 |
|
xiekaidong
|
87bd070b20
|
血条
|
2023-04-14 22:23:12 +08:00 |
|
xiekaidong
|
152c5177ea
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/arts/atlas/ui/battle.asset
# Assets/arts/textures/ui/battle/battle_progress_bg_1.png.meta
# Assets/prefabs/ui/battle/battle_ui.prefab
|
2023-04-14 22:19:56 +08:00 |
|
xiekaidong
|
adc551021d
|
一些界面修改和接入关卡结算
|
2023-04-14 22:19:40 +08:00 |
|
chenxi
|
0dc1481919
|
编译
|
2023-04-14 21:21:56 +08:00 |
|
chenxi
|
785c4484ac
|
资源
|
2023-04-14 21:21:38 +08:00 |
|
xiekaidong
|
4cd781beee
|
报错修改
|
2023-04-14 18:19:21 +08:00 |
|
xiekaidong
|
8d4c3f6ef3
|
界面调整
|
2023-04-14 18:04:36 +08:00 |
|
xiekaidong
|
a0e4002e55
|
更新配置
|
2023-04-14 18:02:24 +08:00 |
|
xiekaidong
|
10159333ea
|
战斗回合概念
|
2023-04-14 18:00:58 +08:00 |
|
xiekaidong
|
71ac52b3f3
|
修改对其方式
|
2023-04-14 16:10:00 +08:00 |
|