2414 Commits

Author SHA1 Message Date
chenxi
b0e1f8a98f 道具资源 2023-07-23 18:05:39 +08:00
chenxi
431fad8874 武器资源 2023-07-23 15:45:47 +08:00
chenxi
351f6a2712 更新图标资源 2023-07-23 15:29:07 +08:00
xiekaidong
66d69032e6 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
xiekaidong
f8e0a914b0 更新配置 2023-07-22 14:02:47 +08:00
xiekaidong
7c9356cc91 更新资源 2023-07-22 13:57:41 +08:00
xiekaidong
658379acc1 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 18:14:17 +08:00
xiekaidong
f3a6a84fea 资源替换 2023-07-21 18:12:45 +08:00
Fang
37463a8704 材料获取显示修复 2023-07-21 18:04:40 +08:00
xiekaidong
18015279da Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 17:47:18 +08:00
xiekaidong
2bb3d99058 伤害公式bug修复 2023-07-21 17:47:07 +08:00
96102a9e8e Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 17:43:18 +08:00
dff189af22 1111111 2023-07-21 17:43:08 +08:00
xiekaidong
5b804f59f5 更新配置,上传资源 2023-07-21 17:18:21 +08:00
xiekaidong
59ea080c79 修改价格显示 2023-07-21 17:02:59 +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
xiekaidong
59a19800d6 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 11:37:52 +08:00
xiekaidong
c3742f2cb9 buff机制修改 2023-07-21 11:37:49 +08:00
Fang
28f1271fdb 通行证赛季更新 2023-07-21 11:19:56 +08:00
xiekaidong
0d981f611d 价格的字体都改为普通字体 2023-07-21 10:04:45 +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
陈希
3493550391 Merge branch 'fang/材料获取' into 'dev_20230725'
装备升级材料获取

See merge request b6-client/b6-unity!7
2023-07-21 01:52:09 +00: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
陈希
b3b3a1b192 Merge branch 'fang/礼包' into 'dev_20230725'
装备礼包

See merge request b6-client/b6-unity!8
2023-07-21 01:49:46 +00: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
13754e2505 更新资源和资源检查 2023-07-20 21:51:04 +08:00
xiekaidong
7011bbce34 支线副本 2023-07-20 21:47:56 +08:00
xiekaidong
e8e887d987 Merge branch 'dev_20230725' into dungeon 2023-07-20 21:47:31 +08:00
xiekaidong
69dfb8ca23 支线副本 2023-07-20 21:47:04 +08:00
Fang
69e0ea2db1 英雄升级显示、战斗报错fix 2023-07-20 21:23:42 +08:00
xiekaidong
a58933e708 支线副本战斗中的任务 2023-07-20 20:41:40 +08:00
Fang
2c7f90f837 英雄升级报错fix 2023-07-20 20:28:30 +08:00
Fang
26f13850c3 活动副本列表高度修改 2023-07-20 20:25:21 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
xiekaidong
2ac3c391a1 Merge branch 'dev_20230725' into dungeon 2023-07-20 19:45:03 +08:00
xiekaidong
2e3da36d8f 支线副本 2023-07-20 19:44:49 +08:00