From fb4b1ed3c3366f993136e1f9a442bb2dc6d758ab Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 26 九月 2018 22:35:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/InSevenDaysConfig.cs |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/Core/GameEngine/Model/Config/InSevenDaysConfig.cs b/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
index 104fc57..d25cebe 100644
--- a/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
+++ b/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Monday, March 05, 2018
+//    [  Date ]:		   Wednesday, September 26, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -11,10 +11,16 @@
     
 	public partial class InSevenDaysConfig : ConfigBase {
 
-		public int RewardID { get ; private set ; }
-		public string Reward { get ; private set; } 
-		public string ICON { get ; private set; } 
-		public int Money { get ; private set ; }
+		public int RewardID { get ; private set ; }
+		public string Reward { get ; private set; } 
+		public string ICON { get ; private set; } 
+		public string RewardName { get ; private set; } 
+		public string Image { get ; private set; } 
+		public string ImgTxt1 { get ; private set; } 
+		public string ImgTxt2 { get ; private set; } 
+		public string DayIcon { get ; private set; } 
+		public int Money { get ; private set ; }
+		public int IsTitle { get ; private set ; }
 
 		public override string getKey()
         {
@@ -24,13 +30,25 @@
 		public override void Parse() {
 			try
             {
-                RewardID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
-			
-				Reward = rawContents[1].Trim();
-			
-				ICON = rawContents[2].Trim();
-			
-				Money=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
+                RewardID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
+			
+				Reward = rawContents[1].Trim();
+			
+				ICON = rawContents[2].Trim();
+			
+				RewardName = rawContents[3].Trim();
+			
+				Image = rawContents[4].Trim();
+			
+				ImgTxt1 = rawContents[5].Trim();
+			
+				ImgTxt2 = rawContents[6].Trim();
+			
+				DayIcon = rawContents[7].Trim();
+			
+				Money=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
+			
+				IsTitle=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0