1025 Commits

Author SHA1 Message Date
xiekaidong
63269b6af6 Merge branch 'dev_20230728_hotupdate' of http://git.juzugame.com/b6-client/b6-lua into dev_20230728_hotupdate 2023-07-28 10:49:18 +08:00
xiekaidong
0fd125dcfc 增加容错 2023-07-28 10:49:14 +08:00
Fang
29a149dab5 英雄收集文案fix、武器升级动效显示fix 2023-07-28 09:50:16 +08:00
Fang
9740e4b4f6 红点修改 2023-07-27 12:02:48 +08:00
Fang
7ffd2ee992 英雄图鉴红点fix 2023-07-27 10:32:52 +08:00
xiekaidong
e2e17b28c6 显示优化 2023-07-27 09:51:12 +08:00
Fang
e688bfd26d 英雄红点fix 2023-07-26 18:23:12 +08:00
Fang
9a3850c145 添加英雄升级标签红点,标签红点更新fix 2023-07-26 16:14:24 +08:00
Fang
a80e0b5e90 装备红点、文案 2023-07-26 15:14:44 +08:00
xiekaidong
52bc10db15 显示优化 2023-07-26 11:47:45 +08:00
Fang
6d3a0748a1 fix 2023-07-25 23:32:59 +08:00
xiekaidong
25bb8df7df Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 23:14:06 +08:00
xiekaidong
c71e0cd4d0 bug修复 2023-07-25 23:13:59 +08:00
Fang
0448dd5fa2 支线基金跨阶段fix 2023-07-25 23:10:35 +08:00
Fang
11624308ea 动效、fix 2023-07-25 22:33:51 +08:00
xiekaidong
84b0d6111f Merge branch 'master' into dev_20230725 2023-07-25 22:07:48 +08:00
xiekaidong
fd73d1b27e 优化显示 2023-07-25 21:52:29 +08:00
Fang
3dbb432b51 显示fix 2023-07-25 21:01:32 +08:00
Fang
01c2ed492c 拼写错误fix 2023-07-25 20:28:20 +08:00
Fang
4fe57bcfe8 装备界面显示fix 2023-07-25 19:59:31 +08:00
Fang
a5d2749ede 支线基金看完广告直接领奖 2023-07-25 19:59:31 +08:00
xiekaidong
a47d66626e 审核模式不显示基金 2023-07-25 19:31:58 +08:00
Fang
093decfeeb 显示fix 2023-07-25 18:16:44 +08:00
Fang
b2d2b65e73 显示fix 2023-07-25 18:11:05 +08:00
Fang
27affc743b 装备数值显示与计算分开处理 2023-07-25 17:18:43 +08:00
xiekaidong
03c6bdd523 bug修复 2023-07-25 17:16:54 +08:00
xiekaidong
cda0708069 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:36:28 +08:00
xiekaidong
b6d66aa8be 多语言 2023-07-25 16:36:25 +08:00
Fang
668fbe6611 副本扫荡fix 2023-07-25 16:12:45 +08:00
xiekaidong
3cd1b81e8f Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:06:07 +08:00
xiekaidong
74ccb9ac05 韩国社区跳转处理 2023-07-25 16:06:04 +08:00
Fang
6753303909 界面跳转未关闭fix 2023-07-25 15:44:10 +08:00
Fang
ce1e2f557d 收集奖励报错fix 2023-07-25 15:44:10 +08:00
Fang
6a220afca8 属性计算修复 2023-07-25 15:44:10 +08:00
Fang
14e94589ee 显示fix 2023-07-25 10:24:35 +08:00
xiekaidong
441a42c087 显示调整 2023-07-24 22:00:59 +08:00
xiekaidong
d8c8591e40 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 21:47:52 +08:00
xiekaidong
e4647b17dc 优化 2023-07-24 21:47:45 +08:00
Fang
0d04b99d3e 显示fix 2023-07-24 21:39:18 +08:00
Fang
9ea10ea0c7 防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画 2023-07-24 21:07:05 +08:00
Fang
2d655fbb4f 切换英雄按钮显示fix 2023-07-24 20:01:27 +08:00
xiekaidong
e59b7f1ccb Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 18:47:54 +08:00
xiekaidong
c6d10d8825 调整一下逻辑 2023-07-24 18:47:46 +08:00
Fang
d10b9049f7 装备属性加成计算fix 2023-07-24 18:37:43 +08:00
xiekaidong
0e2bb42a25 一些报错修复 2023-07-24 18:32:41 +08:00
xiekaidong
1ecd45294f Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 17:10:46 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
Fang
f99f54b8f8 装备礼包弹出规则fix 2023-07-24 17:07:05 +08:00
Fang
0a0fc7c127 商城特惠加装备banner 2023-07-24 17:07:05 +08:00
xiekaidong
65c580fb87 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 17:04:44 +08:00