chenxi
|
a53e1ec49c
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-06 17:33:05 +08:00 |
|
chenxi
|
b88815d16f
|
战令界面
|
2023-06-06 17:32:58 +08:00 |
|
Fang
|
49af10d8a9
|
战斗退出后显示主界面控制
|
2023-06-06 17:31:34 +08:00 |
|
CloudJ
|
a7756805cb
|
编译
|
2023-06-06 17:12:25 +08:00 |
|
xiekaidong
|
cb667f4e9c
|
bug修复
|
2023-06-06 16:45:39 +08:00 |
|
|
|
859cb32947
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-06 16:00:21 +08:00 |
|
|
|
be9f1b76eb
|
1111
|
2023-06-06 16:00:08 +08:00 |
|
chenxi
|
3483961cc5
|
超过5秒提示网络断开连接
|
2023-06-06 15:30:54 +08:00 |
|
xiekaidong
|
f3c87a786f
|
修改上报
|
2023-06-06 15:25:51 +08:00 |
|
chenxi
|
8cc37aba08
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-06 15:10:38 +08:00 |
|
chenxi
|
19ebceb54b
|
刷新一下
|
2023-06-06 15:10:31 +08:00 |
|
xiekaidong
|
77cd8d33ac
|
编译lua
|
2023-06-06 15:06:56 +08:00 |
|
xiekaidong
|
7d605b1a26
|
资源改名
|
2023-06-06 14:22:14 +08:00 |
|
xiekaidong
|
641afee2f7
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-06 14:13:10 +08:00 |
|
xiekaidong
|
ffcfe93299
|
切换波次时自动关闭buff弹窗
|
2023-06-06 14:13:07 +08:00 |
|
chenxi
|
c1b2c1a90e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-06 12:01:30 +08:00 |
|
chenxi
|
29a6483899
|
编译
|
2023-06-06 12:01:23 +08:00 |
|
CloudJ
|
e03249461c
|
编译
|
2023-06-06 12:01:15 +08:00 |
|
xiekaidong
|
85eff9cbec
|
调快速度
|
2023-06-06 11:56:34 +08:00 |
|
chenxi
|
c2b8fb84e2
|
loading
|
2023-06-06 11:56:03 +08:00 |
|
chenxi
|
f245ce203c
|
编译
|
2023-06-06 11:46:17 +08:00 |
|
chenxi
|
8a8eb8c14b
|
编译
|
2023-06-06 11:45:49 +08:00 |
|
CloudJ
|
f170e50ed8
|
宝箱UI还原
|
2023-06-06 11:46:16 +08:00 |
|
xiekaidong
|
247f64e371
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/lua/app/common/audio_manager.lua.bytes
|
2023-06-06 11:32:34 +08:00 |
|
xiekaidong
|
c10a2e6b71
|
显示优化
|
2023-06-06 11:32:22 +08:00 |
|
chenxi
|
f91872672a
|
音效和ab
|
2023-06-06 11:30:15 +08:00 |
|
CloudJ
|
6f2576095e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-06 11:15:32 +08:00 |
|
CloudJ
|
e7d278de0c
|
编译
|
2023-06-06 11:15:26 +08:00 |
|
chenxi
|
9761c6fc83
|
任务bug
|
2023-06-06 11:12:17 +08:00 |
|
CloudJ
|
f413a2fadb
|
音效
|
2023-06-06 11:09:18 +08:00 |
|
xiekaidong
|
a6f88ab4ad
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/arts/sounds/sfx/ui/ui_summon_start.wav.meta
|
2023-06-06 11:08:41 +08:00 |
|
xiekaidong
|
e487a6aaba
|
资源上传
|
2023-06-06 11:08:19 +08:00 |
|
xiekaidong
|
77d06b3e1e
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
|
2023-06-06 11:02:55 +08:00 |
|
xiekaidong
|
b2f8e11059
|
音效
|
2023-06-06 11:01:33 +08:00 |
|
|
|
801ad5ee4f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-06 11:01:17 +08:00 |
|
|
|
ed3e988e03
|
1111
|
2023-06-06 11:01:05 +08:00 |
|
Fang
|
a320979c7e
|
替换结算界面失败动画
|
2023-06-06 11:00:16 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
ee90c8082f
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-06 10:53:58 +08:00 |
|
DESKTOP-5E92U9B\BigFoot
|
a4e64d1eab
|
主角修改
|
2023-06-06 10:53:49 +08:00 |
|
chenxi
|
f867b77aa2
|
编译
|
2023-06-06 10:49:52 +08:00 |
|
Fang
|
bb89a17fc4
|
编译
|
2023-06-06 10:49:02 +08:00 |
|
chenxi
|
99880f6a32
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-06 10:48:06 +08:00 |
|
chenxi
|
6a54f6a01b
|
删除不用的资源
|
2023-06-06 10:48:00 +08:00 |
|
Fang
|
a85373b5fb
|
编译
|
2023-06-06 10:40:02 +08:00 |
|
xiekaidong
|
d357e0c69b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-06 10:39:07 +08:00 |
|
xiekaidong
|
d56c7110d7
|
boss预警音效
|
2023-06-06 10:39:04 +08:00 |
|
chenxi
|
b409ab7e86
|
资源
|
2023-06-06 10:35:12 +08:00 |
|
CloudJ
|
ade6fd169a
|
编译
|
2023-06-06 10:22:05 +08:00 |
|
CloudJ
|
ee24231070
|
替换界面
|
2023-06-06 10:16:30 +08:00 |
|
chenxi
|
919ffe9427
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-05 22:18:30 +08:00 |
|
