2594 Commits

Author SHA1 Message Date
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
CloudJ
694f8c3f87 pb 2023-06-28 09:39:07 +08:00
Fang
7057f23dd3 Merge branch 'fang/arena' into arena 2023-06-27 18:27:50 +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
chenxi
7ba917ed4d 热更提升版本号 v0.1.1_ios v0.3.1_android 2023-06-25 15:13:23 +08:00
zhangpengfei
f042d0a515 动画资源修改 2023-06-25 11:42:26 +08:00
zhangpengfei
e3b1361dcd 动画资源修改 2023-06-25 11:36:46 +08:00
xiekaidong
8231fc3cc5 添加容错 2023-06-25 10:31:05 +08:00
chenxi
55d5d06505 提升版本含 v0.1.0_ios v0.3.0_android 2023-06-21 22:35:18 +08:00
xiekaidong
5a5bb5c19e 棋盘编辑器 2023-06-21 22:20:58 +08:00
Fang
14790f04b8 审核处理 2023-06-21 21:21:22 +08:00
chenxi
9b053e6392 打包脚本 2023-06-21 17:26:55 +08:00
xiekaidong
06191c7e8c bug修复 2023-06-21 17:16:12 +08:00
chenxi
dc9dd8e969 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-21 16:13:27 +08:00
chenxi
3940532114 ios打包设置 2023-06-21 16:13:21 +08:00
xiekaidong
46d7ebb42e 调整格子效果生效顺序 2023-06-21 16:03:04 +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
946a83eec3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-21 14:43:40 +08:00
ddbebc7677 新增move 2023-06-21 14:43:31 +08:00
xiekaidong
4106e910e0 资源检查 2023-06-21 14:39:28 +08:00
aacabf68e5 新增动画 2023-06-21 14:31:48 +08:00
xiekaidong
0d35f0923b 删除多余资源 2023-06-21 14:27:08 +08:00
xiekaidong
1db8fc4f28 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-21 14:17:42 +08:00
xiekaidong
45b92fde2b spine资源检查 2023-06-21 14:17:37 +08:00
chenxi
420d627962 ab name 2023-06-21 14:10:15 +08:00
chenxi
0bb3ddcf72 编译 2023-06-21 12:13:42 +08:00
chenxi
b97fbbd5e2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-21 12:05:11 +08:00
chenxi
84e4b9ff5e ios 2023-06-21 12:05:06 +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
b56dc5fe04 白名单和审核模式 2023-06-21 11:36:31 +08:00
chenxi
5f9898ee06 更新配置 2023-06-21 11:21:41 +08:00
chenxi
8c7642c41d 编译 2023-06-21 11:18:38 +08:00
xiekaidong
d5fb0e68a0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/prefabs/effects/battle/sfx_common_ice_b01.prefab
#	Assets/prefabs/effects/battle/sfx_common_xy_b01.prefab
2023-06-21 11:13:15 +08:00
xiekaidong
7b00379cc5 特效资源检查修复工具 2023-06-21 11:12:54 +08:00
chenxi
e61e18c9a0 ios版本号 2023-06-21 10:37:42 +08:00
chenxi
22549903c5 数数和AF打通 2023-06-21 10:30:45 +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