599 Commits

Author SHA1 Message Date
xiekaidong
77cd8d33ac 编译lua 2023-06-06 15:06:56 +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
29a6483899 编译 2023-06-06 12:01:23 +08:00
xiekaidong
85eff9cbec 调快速度 2023-06-06 11:56:34 +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
e7d278de0c 编译 2023-06-06 11:15:26 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +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
chenxi
f867b77aa2 编译 2023-06-06 10:49:52 +08:00
Fang
bb89a17fc4 编译 2023-06-06 10:49:02 +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
chenxi
c692089e1f 编译 2023-06-05 22:18:27 +08:00
chenxi
163ff77186 编译 2023-06-05 21:33:50 +08:00
xiekaidong
9a6732acdd 增加棋盘查看字段 2023-06-05 21:08:16 +08:00
xiekaidong
5bc73b98ab 消除显示优化 2023-06-05 20:53:19 +08:00
chenxi
0e93f635ba 红点位置 2023-06-05 20:41:57 +08:00
chenxi
585f501282 任务红点 2023-06-05 20:32:58 +08:00
CloudJ
7bb5e7c18d 编译 2023-06-05 20:17:55 +08:00
xiekaidong
9040c5d2ae 特效 2023-06-05 20:07:09 +08:00
CloudJ
6e6bbb013b 编译 2023-06-05 19:43:50 +08:00
chenxi
d1ec620837 资源自动处理和ab name 2023-06-05 19:19:17 +08:00
chenxi
312e1d66e9 编译 2023-06-05 19:09:06 +08:00
chenxi
818cef2b0f 英雄详情界面 2023-06-05 18:53:25 +08:00
chenxi
7224512691 充值后提示绑定 2023-06-05 18:33:48 +08:00
Fang
123128ce1f 结算界面金猪动画 2023-06-05 18:30:16 +08:00
xiekaidong
f2a67512f8 显示bug修复 2023-06-05 18:26:27 +08:00
chenxi
54919c6898 七天乐界面 2023-06-05 18:08:18 +08:00
chenxi
7963b91bbd 七天乐换界面 2023-06-05 17:57:32 +08:00
Fang
70bb61e9b6 更表 2023-06-05 17:30:58 +08:00
CloudJ
958822d6a2 编译 2023-06-05 17:25:21 +08:00
Fang
0216eabf3b 战斗结算界面动画 2023-06-05 17:17:26 +08:00
chenxi
afa6a8f156 英雄详情 2023-06-05 17:03:12 +08:00
chenxi
38a431cedf 奖励界面 2023-06-05 16:53:16 +08:00
CloudJ
57b4d1064f 编译 2023-06-05 16:51:17 +08:00
CloudJ
b703d32c49 编译 2023-06-05 16:28:27 +08:00
chenxi
8ea8688321 侧边栏调整位置 2023-06-05 16:26:38 +08:00
xiekaidong
9a48380ba2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 16:24:51 +08:00
xiekaidong
88042cfd50 音效容错 2023-06-05 16:24:40 +08:00
chenxi
9a169f666e 侧边栏优化 2023-06-05 16:24:28 +08:00