695 充值和玄玉的关系调整, 修复编辑器才会触发充值bug增加不同ctgid引发的
# Conflicts:
# Main/System/Recharge/RechargeManager.cs
| | |
| | | //代扣的代金券额度由各档位配置决定 不是固定比例money * 100 |
| | | OrderInfoConfig orderInfo; |
| | | RechargeManager.Instance.TryGetOrderInfoByOrderInfo(cpInfo, out orderInfo); |
| | | long needDJQMoney = (long)orderInfo.PayCoin; // money是元,needMoney是分 |
| | | long needDJQMoney = (long)orderInfo.PayCoin * 100; // 与服务端约定 乘以100使用,兼容不同版本小数点情况 |
| | | long cashVoucher = UIHelper.GetMoneyCnt(97); |
| | | long diamond = UIHelper.GetMoneyCnt(99); |
| | | |
| | |
| | | ConfirmCancel.ShowPayMethodConfirm( |
| | | 97, (int)needDJQMoney, Language.Get("Recharge8"), // 现金礼券 |
| | | 99, (int)needDJQMoney, Language.Get("Recharge7"), // 玄玉 |
| | | Language.Get("Recharge6", UIHelper.GetIconNameWithMoneyType(defaultMoneyType), needDJQMoney, title), |
| | | needDJQMoney, title, |
| | | Language.Get("Recharge6", UIHelper.GetIconNameWithMoneyType(defaultMoneyType), orderInfo.PayCoin, title), |
| | | orderInfo.PayCoin, title, |
| | | (bool isOk, int selectedMoneyType) => |
| | | { |
| | | if (isOk) |