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/HeroSkinConfig.cs | 88 ++++++++++----------------------------------
1 files changed, 20 insertions(+), 68 deletions(-)
diff --git a/Main/Config/Configs/HeroSkinConfig.cs b/Main/Config/Configs/HeroSkinConfig.cs
index fded4ef..0deff42 100644
--- a/Main/Config/Configs/HeroSkinConfig.cs
+++ b/Main/Config/Configs/HeroSkinConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2026骞�2鏈�13鏃�
+// [ Date ]: 2026骞�3鏈�13鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -17,14 +17,14 @@
}
public int SkinID;
- public int[] WearAttrIDList;
- public int[] WearAttrValueList;
- public int[] AllBatAttrIDList;
- public int[] AllBatAttrValueList;
+ public string SkinName;
+ public string BG;
+ public int AudioID;
public string Tachie;
public float[] TachieParam;
public string SquareIcon;
public string RectangleIcon;
+ public string CardPic;
public string SpineRes;
public string InitialSkinName;
public string ApearMotionName;
@@ -43,71 +43,21 @@
string[] tables = input.Split('\t');
int.TryParse(tables[0],out SkinID);
- if (tables[1].Contains("["))
+ SkinName = tables[1];
+
+ BG = tables[2];
+
+ int.TryParse(tables[3],out AudioID);
+
+ Tachie = tables[4];
+
+ if (tables[5].Contains("["))
{
- WearAttrIDList = JsonMapper.ToObject<int[]>(tables[1]);
+ TachieParam = JsonMapper.ToObject<float[]>(tables[5]);
}
else
{
- string[] WearAttrIDListStringArray = tables[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- WearAttrIDList = new int[WearAttrIDListStringArray.Length];
- for (int i=0;i<WearAttrIDListStringArray.Length;i++)
- {
- int.TryParse(WearAttrIDListStringArray[i],out WearAttrIDList[i]);
- }
- }
-
- if (tables[2].Contains("["))
- {
- WearAttrValueList = JsonMapper.ToObject<int[]>(tables[2]);
- }
- else
- {
- string[] WearAttrValueListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- WearAttrValueList = new int[WearAttrValueListStringArray.Length];
- for (int i=0;i<WearAttrValueListStringArray.Length;i++)
- {
- int.TryParse(WearAttrValueListStringArray[i],out WearAttrValueList[i]);
- }
- }
-
- if (tables[3].Contains("["))
- {
- AllBatAttrIDList = JsonMapper.ToObject<int[]>(tables[3]);
- }
- else
- {
- string[] AllBatAttrIDListStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AllBatAttrIDList = new int[AllBatAttrIDListStringArray.Length];
- for (int i=0;i<AllBatAttrIDListStringArray.Length;i++)
- {
- int.TryParse(AllBatAttrIDListStringArray[i],out AllBatAttrIDList[i]);
- }
- }
-
- if (tables[4].Contains("["))
- {
- AllBatAttrValueList = JsonMapper.ToObject<int[]>(tables[4]);
- }
- else
- {
- string[] AllBatAttrValueListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- AllBatAttrValueList = new int[AllBatAttrValueListStringArray.Length];
- for (int i=0;i<AllBatAttrValueListStringArray.Length;i++)
- {
- int.TryParse(AllBatAttrValueListStringArray[i],out AllBatAttrValueList[i]);
- }
- }
-
- Tachie = tables[5];
-
- if (tables[6].Contains("["))
- {
- TachieParam = JsonMapper.ToObject<float[]>(tables[6]);
- }
- else
- {
- string[] TachieParamStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] TachieParamStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
TachieParam = new float[TachieParamStringArray.Length];
for (int i=0;i<TachieParamStringArray.Length;i++)
{
@@ -115,9 +65,11 @@
}
}
- SquareIcon = tables[7];
+ SquareIcon = tables[6];
- RectangleIcon = tables[8];
+ RectangleIcon = tables[7];
+
+ CardPic = tables[8];
SpineRes = tables[9];
--
Gitblit v1.8.0