3200 Commits

Author SHA1 Message Date
xiekaidong
d127666db5 更新配置 2023-09-20 17:46:07 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
xiekaidong
07c3c5334a 替换资源 2023-09-20 17:24:21 +08:00
xiekaidong
97cc288db3 更新资源 2023-09-20 17:19:36 +08:00
zhangpengfei
c83be5ae7f 皮肤动画修改 2023-09-20 17:14:45 +08:00
Fang
4f9e75da7a 显示fix 2023-09-20 16:52:02 +08:00
xiekaidong
4821b24301 清除材质冗余属性 2023-09-20 16:42:28 +08:00
xiekaidong
ba57353ad0 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-20 16:41:28 +08:00
xiekaidong
41cfc6c2b9 更新特效 2023-09-20 16:41:25 +08:00
zhangpengfei
bb625cb8e8 皮肤动画修改 2023-09-20 16:29:59 +08:00
xiekaidong
59cf73eed0 编辑器 2023-09-20 16:25:23 +08:00
xiekaidong
e8447938f9 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-20 16:04:32 +08:00
xiekaidong
c429cb382b 替换资源 2023-09-20 16:04:28 +08:00
b72212aa71 p0011版权优化 2023-09-20 15:54:27 +08:00
f48cd9d74a p0039眼睛 2023-09-20 15:42:48 +08:00
xiekaidong
ea95ca7f2c 替换资源 2023-09-20 15:20:02 +08:00
xiekaidong
91e6c226a5 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-20 15:16:45 +08:00
xiekaidong
43d34f274e 试玩功能属性加成 2023-09-20 15:16:41 +08:00
cfd7a48e82 11111 2023-09-20 15:14:57 +08:00
Fang
e65320206a 优化自动淬炼的随机假数据 2023-09-20 14:30:29 +08:00
xiekaidong
f93c89c162 修改 2023-09-20 11:46:41 +08:00
xiekaidong
16b6f9b4bc bug修复 2023-09-20 11:27:32 +08:00
xiekaidong
8a961ae07b 复活优化 2023-09-20 11:16:41 +08:00
xiekaidong
eeede315a6 优化体验 2023-09-20 10:56:35 +08:00
xiekaidong
00e6d5389f 优化符文副本重生 2023-09-20 10:55:12 +08:00
xiekaidong
07fb378809 优化符文副本重生 2023-09-20 10:54:41 +08:00
7e4834769d 符文系统-淬炼属性 2023-09-20 10:20:07 +08:00
xiekaidong
81a5a71a20 bug修复 2023-09-20 10:19:32 +08:00
Fang
24dbb7aa0b 符文随到高品质出动效时,层级调整到最高 2023-09-20 09:51:53 +08:00
Fang
ba70479f0c 符文随机假数据不展示当前等级最高两个品质 2023-09-20 09:37:04 +08:00
xiekaidong
2460664dc9 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-20 09:36:31 +08:00
xiekaidong
71b7f13375 更新资源 2023-09-20 09:36:28 +08:00
Fang
6f3e35243a fix、符文淬炼检查等级修改 2023-09-20 00:11:21 +08:00
xiekaidong
8cf8056ef4 设置一下材质球 2023-09-19 22:02:32 +08:00
xiekaidong
da59410f2b Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 21:16:31 +08:00
xiekaidong
a071da067a 更新资源 2023-09-19 21:16:11 +08:00
Fang
22a2bb1a5e 新号圆月活动请求fix、符文材料个数显示修改 2023-09-19 20:53:05 +08:00
xiekaidong
d72c8beab6 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 20:17:26 +08:00
xiekaidong
930ea28eff 更新资源 2023-09-19 20:17:17 +08:00
xiekaidong
122043a733 删除资源 2023-09-19 20:16:48 +08:00
779c698170 结算胜利失败 2023-09-19 20:13:20 +08:00
Fang
01d6a4b439 圆月头像框上传 2023-09-19 20:02:37 +08:00
xiekaidong
55c5ad0741 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-19 19:41:48 +08:00
xiekaidong
c710842d63 资源修复 2023-09-19 19:41:44 +08:00
Fang
4756312d3c 超框处理 2023-09-19 18:45:28 +08:00
xiekaidong
70c822b986 更新资源 2023-09-19 18:36:21 +08:00
xiekaidong
798fb612d3 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
# Conflicts:
#	Assets/lua/app/config/strings/ja/global.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
2023-09-19 18:34:25 +08:00
xiekaidong
24a0670365 配置更新 2023-09-19 18:34:04 +08:00
Fang
f40b937012 更表、超框处理 2023-09-19 18:31:31 +08:00
xiekaidong
0d8a07e5fa Merge branch 'sdk_2' into dev_20230919 2023-09-19 18:24:09 +08:00