1563 Commits

Author SHA1 Message Date
Fang
9dc58eea91 奖励显示逻辑补充 2023-06-12 18:33:28 +08:00
Fang
f1f805feaf 修改预制体 2023-06-12 17:14:36 +08:00
xiekaidong
43f5e32691 Merge branch 'dev' into fang/dungeon 2023-06-12 16:56:24 +08:00
xiekaidong
47ddf4f7c7 更新协议 2023-06-12 16:53:24 +08:00
xiekaidong
c5965f2315 Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-unity into fang/dungeon
# Conflicts:
#	Assets/prefabs/ui/main_city/dungeon_comp.prefab
2023-06-12 15:44:57 +08:00
Fang
6aa23549f5 活动副本 2023-06-12 15:40:03 +08:00
xiekaidong
f48f17db38 攻击距离可配置 2023-06-12 10:38:07 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
Fang
2f6f69e513 活动副本 2023-06-09 18:45:12 +08:00
xiekaidong
05ab7ad8e2 Merge branch 'board_editor' into dev 2023-06-09 17:35:44 +08:00
xiekaidong
a79d051903 地图编辑器第一版 2023-06-09 17:35:27 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
chenxi
a7dda023d9 调整一下层级 2023-06-08 17:31:56 +08:00
chenxi
a43936224b Merge branch 'dev_20230607_hotupdate' into dev 2023-06-07 20:57:12 +08:00
chenxi
52ad339930 fix bug v0.2.1_android 2023-06-07 19:50:16 +08:00
a13ae659ab Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-07 11:15:55 +08:00
fdd78904af 1 2023-06-07 11:07:18 +08:00
xiekaidong
a0f67c414a 主界面关卡宝箱领取显示bug修复 2023-06-07 10:31:24 +08:00
chenxi
1fcad3fab3 ab v0.2.0_android 2023-06-06 21:37:55 +08:00
xiekaidong
36490e20fa Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 21:26:51 +08:00
xiekaidong
1996dbf284 界面处理 2023-06-06 21:26:48 +08:00
chenxi
e44e390e88 编译 2023-06-06 21:13:13 +08:00
chenxi
18fb8a6bd1 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-06 21:12:18 +08:00
chenxi
0f1588059e 登录界面 2023-06-06 21:12:12 +08:00
xiekaidong
8ccfae34f3 登陆界面复制账号 2023-06-06 21:06:13 +08:00
xiekaidong
de19bdfa8b 显示bug修复 2023-06-06 20:37:54 +08:00
xiekaidong
942014ce6e 替换资源 2023-06-06 20:18:45 +08:00
xiekaidong
ef7d56d981 替换资源 2023-06-06 19:57:28 +08:00
chenxi
fad9baa5d3 ab name 2023-06-06 18:53:45 +08:00
chenxi
3c75dcf7c2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-06 18:52:10 +08:00
chenxi
c6e4978ff6 spine设置 2023-06-06 18:52:04 +08:00
dbaaf7a5ec Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 18:46:09 +08:00
c8d325e418 111 2023-06-06 18:45:47 +08:00
chenxi
4e8ba9e38c ab name 2023-06-06 18:45:15 +08:00
7b47be3fd9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 18:45:15 +08:00
5b0cdcfd6c 111111 2023-06-06 18:45:00 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
chenxi
88cb8a8538 字体 2023-06-06 18:42:02 +08:00
chenxi
aef3b9834a 战令界面微调 2023-06-06 18:39:34 +08:00
CloudJ
700804df00 编译 2023-06-06 18:22:26 +08:00
xiekaidong
de983ee4e5 战斗bi日志上报 2023-06-06 18:07:07 +08:00
CloudJ
4b7294b8ad 编译 2023-06-06 17:51:48 +08:00
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