2322 Commits

Author SHA1 Message Date
xiekaidong
eece88ddce 更新配置 2023-07-25 22:09:55 +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
xiekaidong
ca3ab5bf39 bug修复 2023-07-25 21:18:32 +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
22a26bcda0 导表 2023-07-25 20:18:15 +08:00
Fang
1cfc1c5631 审核模式侧边栏不显示装备礼包入口 2023-07-25 20:16:49 +08:00
Fang
1fe31d8035 装备礼包每次战斗后重复弹出 2023-07-25 20:14:33 +08:00
Fang
4fe57bcfe8 装备界面显示fix 2023-07-25 19:59:31 +08:00
Fang
6f18d573a9 防具属性只用计算一次 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
xiekaidong
2f84455356 更新配置 2023-07-25 19:28:47 +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
53d7e103ec Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:50:45 +08:00
xiekaidong
1071013356 更新配置 2023-07-25 16:50:38 +08:00
Fang
8f01d97ea5 修复英雄首次升级装备报错 2023-07-25 16:48:19 +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
e56378d804 修复报错 2023-07-25 16:32:37 +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
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