2011 Commits

Author SHA1 Message Date
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
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
chenxi
2d47aa5288 编译 2023-06-20 22:20:16 +08:00
xiekaidong
a6c85e6741 容错 2023-06-20 22:09:40 +08:00
0f2dbd12c3 1111 2023-06-20 22:05:01 +08:00
b56400ab69 111 2023-06-20 21:58:36 +08:00
DESKTOP-5E92U9B\BigFoot
ac3e484094 主角动画修改 2023-06-20 21:46:51 +08:00
DESKTOP-5E92U9B\BigFoot
7629cf8bdc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 21:44:14 +08:00
DESKTOP-5E92U9B\BigFoot
d4a5b0d867 主角动画修改 2023-06-20 21:44:06 +08:00
Fang
5ae07a4beb 超框 2023-06-20 21:40:25 +08:00
DESKTOP-5E92U9B\BigFoot
40fcfc9008 boss动画修改 2023-06-20 21:38:11 +08:00
xiekaidong
59895e47bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 21:18:32 +08:00
xiekaidong
4f3dc135a2 显示·问题 2023-06-20 21:18:14 +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
chenxi
ceb967f8da 编译 2023-06-20 20:57:30 +08:00
chenxi
246ae23ae4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-20 20:57:00 +08:00
chenxi
2d6e3dd268 字体 2023-06-20 20:56:52 +08:00
Fang
f702a32add ui调整 2023-06-20 20:42:04 +08:00
Fang
81bf681bf5 超框 2023-06-20 20:25:48 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
chenxi
165b3e332e 完善一下lua脚本中文检查工具 2023-06-20 20:19:05 +08:00
chenxi
86949e1dc5 ab name 2023-06-20 19:59:48 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00
chenxi
8cc2096977 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-20 19:54:03 +08:00
chenxi
00430ce558 更新字体 2023-06-20 19:53:57 +08:00