From bf4e1051ef18bf57299d3c830f921864b6fda444 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 十二月 2018 10:38:10 +0800
Subject: [PATCH] Merge branch 'master' into 【1.4】聚魂功能
---
Core/GameEngine/Model/Config/ResourcesBackConfig.cs | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
index e8ad383..dbd2e2c 100644
--- a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
+++ b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, January 17, 2018
+// [ Date ]: Wednesday, December 19, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -11,14 +11,15 @@
public partial class ResourcesBackConfig : ConfigBase {
- public int ID { get ; private set ; }
- public int RelatedID { get ; private set ; }
- public int CanBackTimes { get ; private set ; }
- public int NormalCostJade { get ; private set ; }
- public int VipCostJade { get ; private set ; }
- public string JadeReward { get ; private set; }
- public int CostCopper { get ; private set ; }
- public string CopperReward { get ; private set; }
+ public int ID { get ; private set ; }
+ public int RelatedID { get ; private set ; }
+ public int CanBackTimes { get ; private set ; }
+ public int NormalCostJade { get ; private set ; }
+ public int VipCostJade { get ; private set ; }
+ public string JadeReward { get ; private set; }
+ public int CostCopper { get ; private set ; }
+ public string CopperReward { get ; private set; }
+ public string JobItem { get ; private set; }
public string RewardList { get ; private set; }
public override string getKey()
@@ -29,23 +30,25 @@
public override void Parse() {
try
{
- ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
-
- RelatedID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
-
- CanBackTimes=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
-
- NormalCostJade=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
-
- VipCostJade=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
-
- JadeReward = rawContents[5].Trim();
-
- CostCopper=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
-
- CopperReward = rawContents[7].Trim();
-
- RewardList = rawContents[8].Trim();
+ ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
+
+ RelatedID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
+
+ CanBackTimes=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+
+ NormalCostJade=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
+
+ VipCostJade=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
+
+ JadeReward = rawContents[5].Trim();
+
+ CostCopper=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
+
+ CopperReward = rawContents[7].Trim();
+
+ JobItem = rawContents[8].Trim();
+
+ RewardList = rawContents[9].Trim();
}
catch (Exception ex)
{
--
Gitblit v1.8.0