From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/Config/Configs/TreasureSetConfig.cs | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/Main/Config/Configs/TreasureSetConfig.cs b/Main/Config/Configs/TreasureSetConfig.cs
index 3e187a5..440cadd 100644
--- a/Main/Config/Configs/TreasureSetConfig.cs
+++ b/Main/Config/Configs/TreasureSetConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: Monday, December 29, 2025
+// [ Date ]: 2026骞�3鏈�5鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -17,8 +17,9 @@
}
public int TreasureType;
- public int PackType;
+ public int[] CheckPackList;
public int DailyMaxCount;
+ public int DailyMaxCountMoney;
public int DailyFreeCount;
public int[] TreasureCountList;
public int CostItemID;
@@ -50,19 +51,33 @@
string[] tables = input.Split('\t');
int.TryParse(tables[0],out TreasureType);
- int.TryParse(tables[1],out PackType);
-
- int.TryParse(tables[2],out DailyMaxCount);
-
- int.TryParse(tables[3],out DailyFreeCount);
-
- if (tables[4].Contains("["))
+ if (tables[1].Contains("["))
{
- TreasureCountList = JsonMapper.ToObject<int[]>(tables[4]);
+ CheckPackList = JsonMapper.ToObject<int[]>(tables[1]);
}
else
{
- string[] TreasureCountListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] CheckPackListStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ CheckPackList = new int[CheckPackListStringArray.Length];
+ for (int i=0;i<CheckPackListStringArray.Length;i++)
+ {
+ int.TryParse(CheckPackListStringArray[i],out CheckPackList[i]);
+ }
+ }
+
+ int.TryParse(tables[2],out DailyMaxCount);
+
+ int.TryParse(tables[3],out DailyMaxCountMoney);
+
+ int.TryParse(tables[4],out DailyFreeCount);
+
+ if (tables[5].Contains("["))
+ {
+ TreasureCountList = JsonMapper.ToObject<int[]>(tables[5]);
+ }
+ else
+ {
+ string[] TreasureCountListStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
TreasureCountList = new int[TreasureCountListStringArray.Length];
for (int i=0;i<TreasureCountListStringArray.Length;i++)
{
@@ -70,15 +85,15 @@
}
}
- int.TryParse(tables[5],out CostItemID);
+ int.TryParse(tables[6],out CostItemID);
- if (tables[6].Contains("["))
+ if (tables[7].Contains("["))
{
- CostItemCountList = JsonMapper.ToObject<int[]>(tables[6]);
+ CostItemCountList = JsonMapper.ToObject<int[]>(tables[7]);
}
else
{
- string[] CostItemCountListStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] CostItemCountListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
CostItemCountList = new int[CostItemCountListStringArray.Length];
for (int i=0;i<CostItemCountListStringArray.Length;i++)
{
@@ -86,15 +101,15 @@
}
}
- int.TryParse(tables[7],out CostMoneyType);
+ int.TryParse(tables[8],out CostMoneyType);
- if (tables[8].Contains("["))
+ if (tables[9].Contains("["))
{
- CostMoneyList = JsonMapper.ToObject<int[]>(tables[8]);
+ CostMoneyList = JsonMapper.ToObject<int[]>(tables[9]);
}
else
{
- string[] CostMoneyListStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] CostMoneyListStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
CostMoneyList = new int[CostMoneyListStringArray.Length];
for (int i=0;i<CostMoneyListStringArray.Length;i++)
{
@@ -102,29 +117,29 @@
}
}
- int.TryParse(tables[9],out EnsureCount);
+ int.TryParse(tables[10],out EnsureCount);
- int.TryParse(tables[10],out OnceLucky);
+ int.TryParse(tables[11],out OnceLucky);
- int.TryParse(tables[11],out LuckyGridNum);
+ int.TryParse(tables[12],out LuckyGridNum);
- GridNumMaxLimitInfo = ConfigParse.ParseIntDict(tables[12]);
+ GridNumMaxLimitInfo = ConfigParse.ParseIntDict(tables[13]);
- int.TryParse(tables[13],out AwardMoneyType);
+ int.TryParse(tables[14],out AwardMoneyType);
- int.TryParse(tables[14],out AwardMoneyValue);
+ int.TryParse(tables[15],out AwardMoneyValue);
- int.TryParse(tables[15],out WishOpen);
+ int.TryParse(tables[16],out WishOpen);
- int.TryParse(tables[16],out WishReset);
+ int.TryParse(tables[17],out WishReset);
- WishLibSelect = ConfigParse.ParseIntDict(tables[17]);
+ WishLibSelect = ConfigParse.ParseIntDict(tables[18]);
- WishLibPubFreeCnt = ConfigParse.ParseIntDict(tables[18]);
+ WishLibPubFreeCnt = ConfigParse.ParseIntDict(tables[19]);
- WishLibCard = ConfigParse.ParseIntDict(tables[19]);
+ WishLibCard = ConfigParse.ParseIntDict(tables[20]);
- ProbabilityDisplay = tables[20];
+ ProbabilityDisplay = tables[21];
}
catch (Exception exception)
{
--
Gitblit v1.8.0