From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
index 9381ccb..5d3ee26 100644
--- a/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasurePrivilegeConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Monday, September 03, 2018
+// [ Date ]: Thursday, September 20, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -20,6 +20,7 @@
public string itemAward { get ; private set; }
public int[] successList;
public int treasureId { get ; private set ; }
+ public int sort { get ; private set ; }
public string Icon { get ; private set; }
public string Name { get ; private set; }
public string targetDescription { get ; private set; }
@@ -56,13 +57,15 @@
treasureId=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
- Icon = rawContents[9].Trim();
+ sort=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
- Name = rawContents[10].Trim();
+ Icon = rawContents[10].Trim();
- targetDescription = rawContents[11].Trim();
+ Name = rawContents[11].Trim();
- effectId=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
+ targetDescription = rawContents[12].Trim();
+
+ effectId=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
}
catch (Exception ex)
{
--
Gitblit v1.8.0