975 Commits

Author SHA1 Message Date
xiekaidong
8b4a69cb90 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-24 20:55:07 +08:00
xiekaidong
0a7c4c5170 bug修复 2023-07-24 20:55:03 +08:00
xiekaidong
8c3abfac91 bug修复 2023-07-26 00:18:57 +08:00
Fang
4b93fa1335 修复装备升级后,总属性显示错误 2023-07-24 20:33:56 +08:00
xiekaidong
53af8c65af 调整一下逻辑 2023-07-24 18:48:32 +08:00
xiekaidong
aaf9e7520c Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
#	Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
2023-07-24 18:48:16 +08:00
xiekaidong
3cfb991ee9 调整一下逻辑 2023-07-24 18:48:04 +08:00
Fang
04730d1ad9 装备属性加成计算fix 2023-07-24 18:38:23 +08:00
xiekaidong
b4ddfb7945 一些报错修复 2023-07-24 18:32:51 +08:00
xiekaidong
f760328136 修复一下报错问题 2023-07-24 18:02:04 +08:00
xiekaidong
894c979aa9 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-24 17:11:03 +08:00
xiekaidong
a3ab8f74fa 副本引导 2023-07-24 17:10:59 +08:00
Fang
79fbc712f3 商城特惠加装备banner、装备礼包弹出规则fix 2023-07-24 17:08:28 +08:00
Fang
7879d441bd 道具获取扫荡文案修改、武器界面加anim组件 2023-07-24 15:59:13 +08:00
Fang
704dac4fa7 礼包资源上传、bug_fix 2023-07-24 15:13:32 +08:00
Fang
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
xiekaidong
288379dbc2 字段修改 2023-07-24 14:10:39 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
xiekaidong
b6116656d7 显示修改 2023-07-24 11:40:30 +08:00
xiekaidong
3506bc596f 修改描述 2023-07-24 11:22:42 +08:00
xiekaidong
fb8aee8370 新增道具宝箱显示 2023-07-24 11:18:48 +08:00
xiekaidong
b1bb2f0302 处理界面显示 2023-07-24 10:36:45 +08:00
xiekaidong
66d69032e6 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
Fang
37463a8704 材料获取显示修复 2023-07-21 18:04:40 +08:00
xiekaidong
2bb3d99058 伤害公式bug修复 2023-07-21 17:47:07 +08:00
xiekaidong
5b804f59f5 更新配置,上传资源 2023-07-21 17:18:21 +08:00
xiekaidong
0d6c9542a1 试玩弹窗优化 2023-07-21 16:24:12 +08:00
xiekaidong
8bf2ff1968 界面调整 2023-07-21 16:16:46 +08:00
xiekaidong
5cb6ae349b 优化技能的释放位置逻辑 2023-07-21 15:36:27 +08:00
xiekaidong
cb4147e794 bug修复 2023-07-21 15:15:28 +08:00
xiekaidong
06cee2197a bug修复 2023-07-21 15:07:21 +08:00
xiekaidong
b38cc4acca 新增buff和叠加方式优化 2023-07-21 14:40:39 +08:00
xiekaidong
70591027b2 更新配置,英雄排序问题 2023-07-21 11:47:26 +08:00
xiekaidong
1824bc2470 优化 2023-07-21 11:41:45 +08:00
xiekaidong
ef7fed0faa buff机制修改 2023-07-21 11:39:02 +08:00
Fang
28f1271fdb 通行证赛季更新 2023-07-21 11:19:56 +08:00
xiekaidong
7af5978fad bug修复 2023-07-21 10:00:35 +08:00
xiekaidong
16425b276a Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 09:55:57 +08:00
xiekaidong
10653fa887 修改评价弹窗关卡 2023-07-21 09:55:39 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
0c9cf3f6c9 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 09:50:19 +08:00
xiekaidong
dd538a387f 优化 2023-07-21 09:50:03 +08:00
Fang
3397f8d017 装备礼包 2023-07-20 22:23:44 +08:00
xiekaidong
f052906d83 结算界面异常处理 2023-07-20 22:05:03 +08:00
xiekaidong
7a3cda1a1b 支线副本 2023-07-20 21:56:34 +08:00
xiekaidong
7011bbce34 支线副本 2023-07-20 21:47:56 +08:00
Fang
69e0ea2db1 英雄升级显示、战斗报错fix 2023-07-20 21:23:42 +08:00
Fang
2c7f90f837 英雄升级报错fix 2023-07-20 20:28:30 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
Fang
622234139b review 2023-07-20 19:35:17 +08:00