From ddf1a89cd290398b09d58d19ac1b4f01cc2e63f1 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 30 八月 2018 11:14:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/DungeonConfig.cs |  214 +++++++++++++++++++++++++++--------------------------
 1 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/Core/GameEngine/Model/Config/DungeonConfig.cs b/Core/GameEngine/Model/Config/DungeonConfig.cs
index 5cb1fa3..bd97166 100644
--- a/Core/GameEngine/Model/Config/DungeonConfig.cs
+++ b/Core/GameEngine/Model/Config/DungeonConfig.cs
@@ -1,113 +1,117 @@
-锘�//--------------------------------------------------------
-//    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Friday, May 18, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-    
-	public partial class DungeonConfig : ConfigBase {
+锘�//--------------------------------------------------------
+//    [Author]:			绗簩涓栫晫
+//    [  Date ]:		   Thursday, August 30, 2018
+//--------------------------------------------------------
 
-		public int ID { get ; private set ; }
-		public int DataMapID { get ; private set ; }
-		public int LineID { get ; private set ; }
-		public int MapID { get ; private set ; }
-		public string FBName { get ; private set; } 
-		public int LVLimitMin { get ; private set ; }
-		public int LVLimitMax { get ; private set ; }
-		public int JobRankLimit { get ; private set ; }
-		public int TicketID { get ; private set ; }
-		public int[] TicketCostCnt;
-		public int TicketPrice { get ; private set ; }
-		public int SweepLVLimit { get ; private set ; }
-		public int SweepItemID { get ; private set ; }
-		public int SweepCostCnt { get ; private set ; }
-		public string StepTime { get ; private set; } 
-		public int[] BossActorID;
-		public int[] Rewards;
-		public string Description { get ; private set; } 
-		public int AutomaticATK { get ; private set ; }
-		public int MapButton { get ; private set ; }
-		public int ShowNewItemTip { get ; private set ; }
-
-		public override string getKey()
+using UnityEngine;
+using System;
+
+namespace TableConfig
+{
+
+    public partial class DungeonConfig : ConfigBase
+    {
+        public int ID { get; private set; }
+        public int DataMapID { get; private set; }
+        public int LineID { get; private set; }
+        public int MapID { get; private set; }
+        public string FBName { get; private set; }
+        public int LVLimitMin { get; private set; }
+        public int LVLimitMax { get; private set; }
+        public int JobRankLimit { get; private set; }
+        public int TicketID { get; private set; }
+        public int[] TicketCostCnt;
+        public int TicketPrice { get; private set; }
+        public int SweepLVLimit { get; private set; }
+        public int SweepItemID { get; private set; }
+        public int SweepCostCnt { get; private set; }
+        public string StepTime { get; private set; }
+        public int[] BossActorID;
+        public int[] Rewards;
+        public string[] RewardCountDescriptions;
+        public string Description { get; private set; }
+        public int AutomaticATK { get; private set; }
+        public int MapButton { get; private set; }
+        public int ShowNewItemTip { get; private set; }
+
+        public override string getKey()
         {
             return ID.ToString();
-        }
-
-		public override void Parse() {
-			try
+        }
+
+        public override void Parse()
+        {
+            try
             {
-                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
-			
-				DataMapID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
-			
-				LineID=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
-			
-				MapID=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
-			
-				FBName = rawContents[4].Trim();
-			
-				LVLimitMin=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
-			
-				LVLimitMax=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
-			
-				JobRankLimit=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
-			
-				TicketID=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
-			
-				string[] TicketCostCntStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-				TicketCostCnt = new int[TicketCostCntStringArray.Length];
-				for (int i=0;i<TicketCostCntStringArray.Length;i++)
-				{
-					 int.TryParse(TicketCostCntStringArray[i],out TicketCostCnt[i]);
-				}
-			
-				TicketPrice=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
-			
-				SweepLVLimit=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
-			
-				SweepItemID=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
-			
-				SweepCostCnt=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
-			
-				StepTime = rawContents[14].Trim();
-			
-				string[] BossActorIDStringArray = rawContents[15].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-				BossActorID = new int[BossActorIDStringArray.Length];
-				for (int i=0;i<BossActorIDStringArray.Length;i++)
-				{
-					 int.TryParse(BossActorIDStringArray[i],out BossActorID[i]);
-				}
-			
-				string[] RewardsStringArray = rawContents[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-				Rewards = new int[RewardsStringArray.Length];
-				for (int i=0;i<RewardsStringArray.Length;i++)
-				{
-					 int.TryParse(RewardsStringArray[i],out Rewards[i]);
-				}
-			
-				Description = rawContents[17].Trim();
-			
-				AutomaticATK=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0; 
-			
-				MapButton=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0; 
-			
-				ShowNewItemTip=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0; 
+                ID = IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]) : 0;
+
+                DataMapID = IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]) : 0;
+
+                LineID = IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]) : 0;
+
+                MapID = IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]) : 0;
+
+                FBName = rawContents[4].Trim();
+
+                LVLimitMin = IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]) : 0;
+
+                LVLimitMax = IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]) : 0;
+
+                JobRankLimit = IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]) : 0;
+
+                TicketID = IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]) : 0;
+
+                string[] TicketCostCntStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+                TicketCostCnt = new int[TicketCostCntStringArray.Length];
+                for (int i = 0; i < TicketCostCntStringArray.Length; i++)
+                {
+                    int.TryParse(TicketCostCntStringArray[i], out TicketCostCnt[i]);
+                }
+
+                TicketPrice = IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]) : 0;
+
+                SweepLVLimit = IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]) : 0;
+
+                SweepItemID = IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]) : 0;
+
+                SweepCostCnt = IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]) : 0;
+
+                StepTime = rawContents[14].Trim();
+
+                string[] BossActorIDStringArray = rawContents[15].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+                BossActorID = new int[BossActorIDStringArray.Length];
+                for (int i = 0; i < BossActorIDStringArray.Length; i++)
+                {
+                    int.TryParse(BossActorIDStringArray[i], out BossActorID[i]);
+                }
+
+                string[] RewardsStringArray = rawContents[16].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+                Rewards = new int[RewardsStringArray.Length];
+                for (int i = 0; i < RewardsStringArray.Length; i++)
+                {
+                    int.TryParse(RewardsStringArray[i], out Rewards[i]);
+                }
+
+                RewardCountDescriptions = rawContents[17].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+
+                Description = rawContents[18].Trim();
+
+                AutomaticATK = IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]) : 0;
+
+                MapButton = IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]) : 0;
+
+                ShowNewItemTip = IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]) : 0;
             }
             catch (Exception ex)
             {
                 DebugEx.Log(ex);
-            }
-		}
-	
-	}
-
-}
-
-
-
-
+            }
+        }
+
+    }
+
+}
+
+
+
+

--
Gitblit v1.8.0