2021 Commits

Author SHA1 Message Date
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
b46d8de73a 奖励界面默认排序 2023-07-25 15:50:14 +08:00
Fang
5fcf27a659 基金ad奖励显示fix 2023-07-25 15:44:10 +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
xiekaidong
c58bb1b185 bug修复 2023-07-25 15:35:55 +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
xiekaidong
434272d8aa Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 21:20:14 +08:00
xiekaidong
933e402b85 bug修复 2023-07-24 21:20:06 +08:00
Fang
9ea10ea0c7 防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画 2023-07-24 21:07:05 +08:00
xiekaidong
75e9012bba Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 20:54:50 +08:00
xiekaidong
78704c6e35 bug修复 2023-07-24 20:54:47 +08:00
xiekaidong
03febf108a Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-26 00:16:40 +08:00
xiekaidong
7d9265a831 bug修复 2023-07-26 00:16:32 +08:00
Fang
62a22b86c6 修复装备升级后,总属性显示错误 2023-07-24 20:33:08 +08:00
Fang
5bfb500ed8 装备阶段计算fix 2023-07-24 20:10:10 +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
98dafc1c05 修复一下报错问题 2023-07-24 18:01:07 +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
xiekaidong
6bc0ce7738 添加一些容错 2023-07-24 17:04:40 +08:00
Fang
fd863d414c 道具获取扫荡文案修改 2023-07-24 15:57:58 +08:00
Fang
8ad4b580e0 礼包资源上传、bug_fix 2023-07-24 15:13:21 +08:00
Fang
fddf41fca5 bug fix 2023-07-24 14:34:52 +08:00
xiekaidong
e42990673e Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 14:08:49 +08:00
xiekaidong
a963053416 字段修改 2023-07-24 14:08:39 +08:00
陈希
4516150564 Merge branch 'fang/支线基金' into 'dev_20230725'
支线基金

See merge request b6-client/b6-lua!9
2023-07-24 05:19:41 +00:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
xiekaidong
13851fb403 显示修改 2023-07-24 11:40:19 +08:00
xiekaidong
1ca93be7f6 修改描述 2023-07-24 11:22:32 +08:00
xiekaidong
dc84eb073d 新增道具宝箱显示 2023-07-24 11:18:21 +08:00
xiekaidong
d7ed50ab8c 处理界面显示 2023-07-24 10:36:25 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
xiekaidong
e429f716c7 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-22 14:02:31 +08:00
xiekaidong
035fde1360 更新配置 2023-07-22 14:02:27 +08:00
Fang
eac7f683c6 材料获取显示修复 2023-07-21 18:04:13 +08:00
xiekaidong
bfff21b619 伤害公式bug修复 2023-07-21 17:46:56 +08:00