From 7da5f5b780af330ecda645f5538e0917bd9eeb01 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 19:37:20 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
Core/GameEngine/Model/Config/InSevenDaysConfig.cs | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Core/GameEngine/Model/Config/InSevenDaysConfig.cs b/Core/GameEngine/Model/Config/InSevenDaysConfig.cs
index 104fc57..97071ad 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,9 +11,14 @@
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 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 override string getKey()
@@ -24,13 +29,23 @@
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;
}
catch (Exception ex)
{
--
Gitblit v1.8.0