From e20c814cbf924dd52287dd81e0c672ba4bbdb4e6 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 07 七月 2026 16:56:48 +0800
Subject: [PATCH] 695 充值和玄玉的关系调整
---
Main/Config/ConfigManager.cs | 10 +---------
Main/Config/Configs/OrderInfoConfig.cs | 9 ++++++---
Main/SDK/SDKUtils.cs | 19 +++++++++++--------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Main/Config/ConfigManager.cs b/Main/Config/ConfigManager.cs
index 965e50e..0e8bd9e 100644
--- a/Main/Config/ConfigManager.cs
+++ b/Main/Config/ConfigManager.cs
@@ -37,15 +37,7 @@
isLoadFinished = false;
// 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
- // 鍔犺浇閰嶇疆鏂囦欢
+
HashSet<Type> configTypes = new HashSet<Type>() {
typeof(ActBillboardAwardConfig),
typeof(ActHeroAppearArtConfig),
diff --git a/Main/Config/Configs/OrderInfoConfig.cs b/Main/Config/Configs/OrderInfoConfig.cs
index 10ed6bf..5cccb20 100644
--- a/Main/Config/Configs/OrderInfoConfig.cs
+++ b/Main/Config/Configs/OrderInfoConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: Tuesday, March 24, 2026
+// [ Date ]: Tuesday, July 7, 2026
//--------------------------------------------------------
using System.Collections.Generic;
@@ -22,6 +22,7 @@
public float PayRMBNum; //鎵撴姌璇蜂娇鐢� PayRMBNumOnSale锛�0.1鎶橈級
public int CTGID;
public float UsdMoney;
+ public float PayCoin;
public string StoreOrderInfo;
public string StoreOrderInfo2;
@@ -47,9 +48,11 @@
float.TryParse(tables[5],out UsdMoney);
- StoreOrderInfo = tables[6];
+ float.TryParse(tables[6],out PayCoin);
- StoreOrderInfo2 = tables[7];
+ StoreOrderInfo = tables[7];
+
+ StoreOrderInfo2 = tables[8];
}
catch (Exception exception)
{
diff --git a/Main/SDK/SDKUtils.cs b/Main/SDK/SDKUtils.cs
index 6f8e957..0ea8d50 100644
--- a/Main/SDK/SDKUtils.cs
+++ b/Main/SDK/SDKUtils.cs
@@ -945,7 +945,7 @@
if (ctgID != 0)
{
var payType = CTGConfig.Get(ctgID).PayType;
- isBuyGameCash = (payType == 17 || payType == 27);
+ isBuyGameCash = payType == 17 || payType == 27;
}
if (isBuyGameCash)
@@ -954,13 +954,16 @@
return;
}
- long needMoney = (long)(money * 100); // money鏄厓锛宯eedMoney鏄垎
+ //浠ｆ墸鐨勪唬閲戝埜棰濆害鐢卞悇妗ｄ綅閰嶇疆鍐冲畾 涓嶆槸鍥哄畾姣斾緥money * 100
+ OrderInfoConfig orderInfo;
+ RechargeManager.Instance.TryGetOrderInfoByOrderInfo(cpInfo, out orderInfo);
+ long needDJQMoney = (long)orderInfo.PayCoin; // money鏄厓锛宯eedMoney鏄垎
long cashVoucher = UIHelper.GetMoneyCnt(97);
long diamond = UIHelper.GetMoneyCnt(99);
var availableMoneyTypes = GeneralDefine.GetPayMethodAvailableMoneyTypes();
- bool hasEnoughVoucher = availableMoneyTypes.Contains(97) && cashVoucher >= needMoney;
- bool hasEnoughDiamond = availableMoneyTypes.Contains(99) && diamond >= needMoney;
+ bool hasEnoughVoucher = availableMoneyTypes.Contains(97) && cashVoucher >= needDJQMoney;
+ bool hasEnoughDiamond = availableMoneyTypes.Contains(99) && diamond >= needDJQMoney;
if (hasEnoughVoucher || hasEnoughDiamond)
{
@@ -968,10 +971,10 @@
UIManager.Instance.CloseWindow<GotoChargeWin>();
int defaultMoneyType = hasEnoughVoucher ? 97 : 99;
ConfirmCancel.ShowPayMethodConfirm(
- 97, (int)needMoney, Language.Get("Recharge8"), // 鐜伴噾绀煎埜
- 99, (int)needMoney, Language.Get("Recharge7"), // 鐜勭帀
- Language.Get("Recharge6", UIHelper.GetIconNameWithMoneyType(defaultMoneyType), money, title),
- money, title,
+ 97, (int)needDJQMoney, Language.Get("Recharge8"), // 鐜伴噾绀煎埜
+ 99, (int)needDJQMoney, Language.Get("Recharge7"), // 鐜勭帀
+ Language.Get("Recharge6", UIHelper.GetIconNameWithMoneyType(defaultMoneyType), needDJQMoney, title),
+ needDJQMoney, title,
(bool isOk, int selectedMoneyType) =>
{
if (isOk)
--
Gitblit v1.8.0