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/TitleConfig.cs | 175 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 95 insertions(+), 80 deletions(-)
diff --git a/Main/Config/Configs/TitleConfig.cs b/Main/Config/Configs/TitleConfig.cs
index b73297e..4acf228 100644
--- a/Main/Config/Configs/TitleConfig.cs
+++ b/Main/Config/Configs/TitleConfig.cs
@@ -1,69 +1,74 @@
-锘�//--------------------------------------------------------
-// [Author]: YYL
-// [ Date ]: 2025骞�11鏈�18鏃�
-//--------------------------------------------------------
-
-using System.Collections.Generic;
-using System;
-using UnityEngine;
-using LitJson;
-
-public partial class TitleConfig : ConfigBase<int, TitleConfig>
-{
- static TitleConfig()
- {
- // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
- visit = true;
- }
-
- public int TitleID;
- public int TabType;
- public string Name;
- public int ResourceType;
- public string ResourceValue;
- public int ExpireMinutes;
- public int UnlockWay;
- public int UnlockValue;
- public int UnlockNeedCnt;
- public int UpNeedCnt;
- public int StarMax;
- public int[] AttrIDList;
- public int[] InitAttrValueList;
- public int[] AttrPerStarAddList;
- public string GetWayString;
-
- public override int LoadKey(string _key)
- {
- int key = GetKey(_key);
- return key;
- }
-
- public override void LoadConfig(string input)
- {
- try {
- string[] tables = input.Split('\t');
- int.TryParse(tables[0],out TitleID);
-
- int.TryParse(tables[1],out TabType);
-
- Name = tables[2];
-
- int.TryParse(tables[3],out ResourceType);
-
- ResourceValue = tables[4];
-
- int.TryParse(tables[5],out ExpireMinutes);
-
- int.TryParse(tables[6],out UnlockWay);
-
- int.TryParse(tables[7],out UnlockValue);
-
- int.TryParse(tables[8],out UnlockNeedCnt);
-
- int.TryParse(tables[9],out UpNeedCnt);
-
- int.TryParse(tables[10],out StarMax);
-
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2026骞�3鏈�17鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class TitleConfig : ConfigBase<int, TitleConfig>
+{
+ static TitleConfig()
+ {
+ // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
+ visit = true;
+ }
+
+ public int TitleID;
+ public int TabType;
+ public string Name;
+ public int ResourceType;
+ public string ResourceValue;
+ public int ExpireMinutes;
+ public int UnlockWay;
+ public int UnlockValue;
+ public int UnlockNeedCnt;
+ public int UpNeedCnt;
+ public int StarMax;
+ public int[] AttrIDList;
+ public int[] InitAttrValueList;
+ public int[] AttrPerStarAddList;
+ public int EffType;
+ public int EffTypeValue;
+ public int EffValue;
+ public int EffPerStarAdd;
+ public string GetWayString;
+ public int SortIndex;
+
+ public override int LoadKey(string _key)
+ {
+ int key = GetKey(_key);
+ return key;
+ }
+
+ public override void LoadConfig(string input)
+ {
+ try {
+ string[] tables = input.Split('\t');
+ int.TryParse(tables[0],out TitleID);
+
+ int.TryParse(tables[1],out TabType);
+
+ Name = tables[2];
+
+ int.TryParse(tables[3],out ResourceType);
+
+ ResourceValue = tables[4];
+
+ int.TryParse(tables[5],out ExpireMinutes);
+
+ int.TryParse(tables[6],out UnlockWay);
+
+ int.TryParse(tables[7],out UnlockValue);
+
+ int.TryParse(tables[8],out UnlockNeedCnt);
+
+ int.TryParse(tables[9],out UpNeedCnt);
+
+ int.TryParse(tables[10],out StarMax);
+
if (tables[11].Contains("["))
{
AttrIDList = JsonMapper.ToObject<int[]>(tables[11]);
@@ -76,8 +81,8 @@
{
int.TryParse(AttrIDListStringArray[i],out AttrIDList[i]);
}
- }
-
+ }
+
if (tables[12].Contains("["))
{
InitAttrValueList = JsonMapper.ToObject<int[]>(tables[12]);
@@ -90,8 +95,8 @@
{
int.TryParse(InitAttrValueListStringArray[i],out InitAttrValueList[i]);
}
- }
-
+ }
+
if (tables[13].Contains("["))
{
AttrPerStarAddList = JsonMapper.ToObject<int[]>(tables[13]);
@@ -104,13 +109,23 @@
{
int.TryParse(AttrPerStarAddListStringArray[i],out AttrPerStarAddList[i]);
}
- }
-
- GetWayString = tables[14];
- }
- catch (Exception exception)
- {
- Debug.LogError(exception);
- }
- }
-}
+ }
+
+ int.TryParse(tables[14],out EffType);
+
+ int.TryParse(tables[15],out EffTypeValue);
+
+ int.TryParse(tables[16],out EffValue);
+
+ int.TryParse(tables[17],out EffPerStarAdd);
+
+ GetWayString = tables[18];
+
+ int.TryParse(tables[19],out SortIndex);
+ }
+ catch (Exception exception)
+ {
+ Debug.LogError(exception);
+ }
+ }
+}
--
Gitblit v1.8.0