From f115d8031d01bde81a29d76d13ab3a17d2f9cb59 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 16:57:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/ItemCompoundConfig.cs | 153 ++++++++++++++++++++++++++++++++------------------
1 files changed, 97 insertions(+), 56 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ItemCompoundConfig.cs b/Core/GameEngine/Model/Config/ItemCompoundConfig.cs
index 5138080..29d0241 100644
--- a/Core/GameEngine/Model/Config/ItemCompoundConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemCompoundConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Saturday, January 06, 2018
+// [ Date ]: Wednesday, October 31, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -11,24 +11,26 @@
public partial class ItemCompoundConfig : ConfigBase {
- public int id { get ; private set ; }
- public int firstType { get ; private set ; }
- public int levelNeed { get ; private set ; }
- public int secondType { get ; private set ; }
- public string secondTypeName { get ; private set; }
- public int thirdType { get ; private set ; }
- public string thirdTypeName { get ; private set; }
- public string makeID { get ; private set; }
- public string unfixedItemID { get ; private set; }
- public int unfixedItemCount { get ; private set ; }
- public string unfixedItemDisplay { get ; private set; }
- public string itemID { get ; private set; }
- public string itemCount { get ; private set; }
- public string itemDisplay { get ; private set; }
- public int money { get ; private set ; }
- public int successRate { get ; private set ; }
- public int successUpper { get ; private set ; }
- public int addonsCountMax { get ; private set ; }
+ public int id { get ; private set ; }
+ public int firstType { get ; private set ; }
+ public int levelNeed { get ; private set ; }
+ public int trailerLevel { get ; private set ; }
+ public int secondType { get ; private set ; }
+ public string secondTypeName { get ; private set; }
+ public int thirdType { get ; private set ; }
+ public string thirdTypeName { get ; private set; }
+ public int[] makeID;
+ public int[] unfixedItemID;
+ public int unfixedItemCount { get ; private set ; }
+ public int[] unfixedItemDisplay;
+ public int[] itemID;
+ public int[] itemCount;
+ public int[] itemDisplay;
+ public int money { get ; private set ; }
+ public int successRate { get ; private set ; }
+ public int successUpper { get ; private set ; }
+ public int[] successRateIncrease;
+ public int addonsCountMax { get ; private set ; }
public string helpDesc { get ; private set; }
public override string getKey()
@@ -39,43 +41,82 @@
public override void Parse() {
try
{
- id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
-
- firstType=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
-
- levelNeed=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
-
- secondType=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
-
- secondTypeName = rawContents[4].Trim();
-
- thirdType=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0;
-
- thirdTypeName = rawContents[6].Trim();
-
- makeID = rawContents[7].Trim();
-
- unfixedItemID = rawContents[8].Trim();
-
- unfixedItemCount=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
-
- unfixedItemDisplay = rawContents[10].Trim();
-
- itemID = rawContents[11].Trim();
-
- itemCount = rawContents[12].Trim();
-
- itemDisplay = rawContents[13].Trim();
-
- money=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
-
- successRate=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0;
-
- successUpper=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0;
-
- addonsCountMax=IsNumeric(rawContents[17]) ? int.Parse(rawContents[17]):0;
-
- helpDesc = rawContents[18].Trim();
+ id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
+
+ firstType=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
+
+ levelNeed=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+
+ trailerLevel=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
+
+ secondType=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
+
+ secondTypeName = rawContents[5].Trim();
+
+ thirdType=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
+
+ thirdTypeName = rawContents[7].Trim();
+
+ string[] makeIDStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ makeID = new int[makeIDStringArray.Length];
+ for (int i=0;i<makeIDStringArray.Length;i++)
+ {
+ int.TryParse(makeIDStringArray[i],out makeID[i]);
+ }
+
+ string[] unfixedItemIDStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ unfixedItemID = new int[unfixedItemIDStringArray.Length];
+ for (int i=0;i<unfixedItemIDStringArray.Length;i++)
+ {
+ int.TryParse(unfixedItemIDStringArray[i],out unfixedItemID[i]);
+ }
+
+ unfixedItemCount=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0;
+
+ string[] unfixedItemDisplayStringArray = rawContents[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ unfixedItemDisplay = new int[unfixedItemDisplayStringArray.Length];
+ for (int i=0;i<unfixedItemDisplayStringArray.Length;i++)
+ {
+ int.TryParse(unfixedItemDisplayStringArray[i],out unfixedItemDisplay[i]);
+ }
+
+ string[] itemIDStringArray = rawContents[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ itemID = new int[itemIDStringArray.Length];
+ for (int i=0;i<itemIDStringArray.Length;i++)
+ {
+ int.TryParse(itemIDStringArray[i],out itemID[i]);
+ }
+
+ string[] itemCountStringArray = rawContents[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ itemCount = new int[itemCountStringArray.Length];
+ for (int i=0;i<itemCountStringArray.Length;i++)
+ {
+ int.TryParse(itemCountStringArray[i],out itemCount[i]);
+ }
+
+ string[] itemDisplayStringArray = rawContents[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ itemDisplay = new int[itemDisplayStringArray.Length];
+ for (int i=0;i<itemDisplayStringArray.Length;i++)
+ {
+ int.TryParse(itemDisplayStringArray[i],out itemDisplay[i]);
+ }
+
+ money=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0;
+
+ successRate=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0;
+
+ successUpper=IsNumeric(rawContents[17]) ? int.Parse(rawContents[17]):0;
+
+ string[] successRateIncreaseStringArray = rawContents[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ successRateIncrease = new int[successRateIncreaseStringArray.Length];
+ for (int i=0;i<successRateIncreaseStringArray.Length;i++)
+ {
+ int.TryParse(successRateIncreaseStringArray[i],out successRateIncrease[i]);
+ }
+
+ addonsCountMax=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0;
+
+ helpDesc = rawContents[20].Trim();
}
catch (Exception ex)
{
--
Gitblit v1.8.0