From 3f4c55d9b7b669619a6dd9f80fd03bd3f1ab74f6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 13 十一月 2018 16:13:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/MarketConfig.cs | 72 ++++++++++++++++--------------------
1 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/Core/GameEngine/Model/Config/MarketConfig.cs b/Core/GameEngine/Model/Config/MarketConfig.cs
index a73a1f2..40d9434 100644
--- a/Core/GameEngine/Model/Config/MarketConfig.cs
+++ b/Core/GameEngine/Model/Config/MarketConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Saturday, January 06, 2018
+// [ Date ]: Tuesday, November 13, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -11,16 +11,15 @@
public partial class MarketConfig : ConfigBase {
- public int type { get ; private set ; }
- public string name { get ; private set; }
- public int limitLv { get ; private set ; }
- public int[] queryType;
- public int[] ChooseType;
- public string[] ChooseName;
- public int[] ChooseItem1;
- public int[] ChooseItem2;
- public int[] ChooseItem3;
- public string[] itemTypeName;
+ public int type { get ; private set ; }
+ public string name { get ; private set; }
+ public int limitLv { get ; private set ; }
+ public int[] queryType;
+ public string[] ChooseName;
+ public int[] ChooseItem1;
+ public int[] ChooseItem2;
+ public int[] ChooseItem3;
+ public string[] itemTypeName;
public string[] itemTypeIcon;
public override string getKey()
@@ -31,52 +30,45 @@
public override void Parse() {
try
{
- type=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
-
- name = rawContents[1].Trim();
-
- limitLv=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
-
+ type=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
+
+ name = rawContents[1].Trim();
+
+ limitLv=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+
string[] queryTypeStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
queryType = new int[queryTypeStringArray.Length];
for (int i=0;i<queryTypeStringArray.Length;i++)
{
int.TryParse(queryTypeStringArray[i],out queryType[i]);
- }
-
- string[] ChooseTypeStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- ChooseType = new int[ChooseTypeStringArray.Length];
- for (int i=0;i<ChooseTypeStringArray.Length;i++)
- {
- int.TryParse(ChooseTypeStringArray[i],out ChooseType[i]);
- }
-
- ChooseName = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-
- string[] ChooseItem1StringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ }
+
+ ChooseName = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ string[] ChooseItem1StringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
ChooseItem1 = new int[ChooseItem1StringArray.Length];
for (int i=0;i<ChooseItem1StringArray.Length;i++)
{
int.TryParse(ChooseItem1StringArray[i],out ChooseItem1[i]);
- }
-
- string[] ChooseItem2StringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ }
+
+ string[] ChooseItem2StringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
ChooseItem2 = new int[ChooseItem2StringArray.Length];
for (int i=0;i<ChooseItem2StringArray.Length;i++)
{
int.TryParse(ChooseItem2StringArray[i],out ChooseItem2[i]);
- }
-
- string[] ChooseItem3StringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ }
+
+ string[] ChooseItem3StringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
ChooseItem3 = new int[ChooseItem3StringArray.Length];
for (int i=0;i<ChooseItem3StringArray.Length;i++)
{
int.TryParse(ChooseItem3StringArray[i],out ChooseItem3[i]);
- }
-
- itemTypeName = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-
- itemTypeIcon = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ }
+
+ itemTypeName = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ itemTypeIcon = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
}
catch (Exception ex)
{
--
Gitblit v1.8.0