1520 Commits

Author SHA1 Message Date
Fang
f25b6ceb6c fix 2023-06-30 18:46:11 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
Fang
f8a386d933 ui动画、结算界面逻辑 2023-06-30 16:50:29 +08:00
xiekaidong
c2a5538386 战斗处理 2023-06-30 16:04:06 +08:00
xiekaidong
ad57cef6ea 竞技场节奏调整 2023-06-30 14:46:02 +08:00
xiekaidong
cbca95b111 战斗bug修复 2023-06-29 21:25:44 +08:00
xiekaidong
09b9d170bb 竞技场敌方自动战斗 2023-06-29 20:52:15 +08:00
Fang
b9132c8cd5 动画文件修改 2023-06-29 16:29:04 +08:00
Fang
54d0156a08 anim 2023-06-29 16:14:05 +08:00
Fang
aae1ec0c8c 完善逻辑 2023-06-29 16:10:22 +08:00
xiekaidong
333df2ba7b 界面调整 2023-06-29 15:22:33 +08:00
xiekaidong
beeba7c094 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-unity into arena 2023-06-29 14:24:46 +08:00
xiekaidong
699a1aaa8f 竞技场战斗 2023-06-29 14:24:42 +08:00
CloudJ
c55f297bec 战令替换spine 2023-06-29 10:42:14 +08:00
xiekaidong
e3af176f17 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-unity into arena 2023-06-28 21:26:23 +08:00
xiekaidong
61ffa86b63 竞技场战斗界面 2023-06-28 21:26:20 +08:00
Fang
764645f4d5 逻辑补充 2023-06-28 18:36:07 +08:00
CloudJ
db4dcef851 战令 2023-06-28 14:22:48 +08:00
CloudJ
3010d6023e Merge branch 'arena' of git.juzugame.com:b6-client/b6-unity into arena
# Conflicts:
#	Assets/proto/protocol.bytes
2023-06-28 09:39:19 +08:00
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
CloudJ
7662d504d3 Merge branch 'dev' into arena 2023-06-27 17:25:54 +08:00
CloudJ
43dde38958 入门礼包 2023-06-27 17:24:53 +08:00
xiekaidong
4cd6868ac4 pvp 2023-06-26 15:29:06 +08:00
CloudJ
c444d3bea0 Merge branch 'arena_bounty' into arena 2023-06-26 11:27:10 +08:00
CloudJ
0b3ad13751 竞技场战令 2023-06-26 11:26:48 +08:00
3fa445189e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-21 15:36:29 +08:00
6e18d4a997 11 2023-06-21 15:36:18 +08:00
Fang
38619144f6 显示fix 2023-06-21 15:17:57 +08:00
xiekaidong
0eb672b1e2 Merge branch 'dev' into arena 2023-06-21 15:07:00 +08:00
chenxi
420d627962 ab name 2023-06-21 14:10:15 +08:00
xiekaidong
a3bfc439fc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-21 11:49:55 +08:00
xiekaidong
2f5501281c 审核模式下屏蔽兑换码按钮 2023-06-21 11:49:45 +08:00
chenxi
61bc84c827 针对底部导航栏上移一点 2023-06-21 11:48:56 +08:00
chenxi
f15e3f6c11 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-21 10:12:54 +08:00
chenxi
0c521e961f 特效 2023-06-21 10:12:44 +08:00
Fang
2ca53d8eb7 超框 2023-06-21 10:04:22 +08:00
chenxi
5e0e8d6b1c Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-21 09:58:20 +08:00
chenxi
9f9f0a2b1a 特效时间计算 2023-06-21 09:58:14 +08:00
7098c49f45 66,67小怪 2023-06-21 09:48:30 +08:00
chenxi
71c28be410 ab name 2023-06-20 22:21:42 +08:00
0f2dbd12c3 1111 2023-06-20 22:05:01 +08:00
b56400ab69 111 2023-06-20 21:58:36 +08:00
Fang
5ae07a4beb 超框 2023-06-20 21:40:25 +08:00
Fang
9810b012e0 超框 2023-06-20 21:08:40 +08:00
xiekaidong
5f8409ad58 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 21:03:48 +08:00
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
44cd2c76b5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 21:00:20 +08:00
9bf036d5d0 1111 2023-06-20 21:00:03 +08:00
Fang
f702a32add ui调整 2023-06-20 20:42:04 +08:00
Fang
81bf681bf5 超框 2023-06-20 20:25:48 +08:00