142 Commits

Author SHA1 Message Date
4fad3e682e Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-15 11:15:38 +08:00
fa3a1aa9f6 11111111 2023-08-15 11:15:28 +08:00
Fang
212c93632b 活动等级达到最大报错fix 2023-08-15 10:28:42 +08:00
chenxi
e7a1fd2b0c Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815 2023-08-14 22:21:00 +08:00
chenxi
8ddf543092 资源 2023-08-14 22:20:51 +08:00
186684915b 11111111 2023-08-14 22:05:22 +08:00
961e69e534 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-14 21:33:27 +08:00
3567e19797 11111111 2023-08-14 21:33:17 +08:00
Fang
0aba4ec004 更表 2023-08-14 09:50:16 +08:00
a63efe7ae5 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-11 18:53:42 +08:00
68f8fb28f4 111 2023-08-11 18:53:29 +08:00
Fang
5f53448c75 新加颜色生命值加成 2023-08-11 18:16:16 +08:00
28d7ce9184 1111111 2023-08-11 17:45:31 +08:00
287361e39a Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-11 14:53:09 +08:00
834d12bda4 1111 2023-08-11 14:53:00 +08:00
Fang
bdcfb12f52 导入素材 2023-08-11 12:00:02 +08:00
80392308a9 111111111 2023-08-11 10:29:23 +08:00
xiekaidong
5906b8053b 资源检查,设置abName 2023-07-25 23:18:24 +08:00
Fang
ccacd36da3 更新特效 2023-07-25 22:55:31 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
2af5fb2301 资源检查,更新配置,编译lua,更新pb 2023-07-25 22:09:41 +08:00
xiekaidong
2104d20eed 资源检查 2023-07-25 22:06:48 +08:00
Fang
298a77cb44 显示修复、导入特效文件 2023-07-25 21:02:08 +08:00
e52240330f 111111 2023-07-24 11:56:47 +08:00
Fang
f01c611d72 导表 2023-07-20 19:35:17 +08:00
d0c6df253f 111111 2023-07-20 11:16:09 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00
chenxi
c6103b2945 ab name 2023-06-20 17:12:48 +08:00
chenxi
030bf3f315 先屏蔽泰语 2023-06-20 15:45:20 +08:00
760ecfcc63 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 15:31:34 +08:00
33a53921ea 111111 2023-06-20 15:31:24 +08:00
chenxi
505c25a640 资源检查 2023-06-20 14:31:12 +08:00
chenxi
d9befbff7a 开几个语言 2023-06-20 10:08:24 +08:00
17b2276308 11111 2023-06-19 21:46:28 +08:00
chenxi
8d9b16604b 资源修复 2023-06-16 21:53:59 +08:00
fdd78904af 1 2023-06-07 11:07:18 +08:00
5b0cdcfd6c 111111 2023-06-06 18:45:00 +08:00
chenxi
f91872672a 音效和ab 2023-06-06 11:30:15 +08:00
ed3e988e03 1111 2023-06-06 11:01:05 +08:00
chenxi
c1b42c312f ziyuan 2023-06-05 21:31:45 +08:00
5e62155002 111 2023-06-05 21:19:54 +08:00
0c7981c28b 111 2023-06-05 21:09:26 +08:00
chenxi
d1ec620837 资源自动处理和ab name 2023-06-05 19:19:17 +08:00
b60720abc6 1111 2023-06-05 18:54:00 +08:00
d398094432 1111 2023-06-05 18:16:49 +08:00
90fe73510c 11111 2023-06-05 16:53:12 +08:00
a933740783 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-05 16:22:18 +08:00
a596d8cd17 111 2023-06-05 16:22:04 +08:00
489b87dd90 11 2023-06-05 15:54:29 +08:00
chenxi
3739698944 替换界面 2023-06-05 15:51:13 +08:00