From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Core/GameEngine/Model/Config/PetInfoConfig.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/Core/GameEngine/Model/Config/PetInfoConfig.cs b/Core/GameEngine/Model/Config/PetInfoConfig.cs
index aee5ddf..00f3ccb 100644
--- a/Core/GameEngine/Model/Config/PetInfoConfig.cs
+++ b/Core/GameEngine/Model/Config/PetInfoConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, July 17, 2018
+// [ Date ]: Thursday, October 25, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -9,8 +9,8 @@
namespace TableConfig {
- public partial class PetInfoConfig : ConfigBase {
-
+ public partial class PetInfoConfig : ConfigBase {
+
public int ID { get ; private set ; }
public string Name { get ; private set; }
public int Quality { get ; private set ; }
@@ -28,15 +28,16 @@
public string InitFightPower { get ; private set; }
public int ShowFightPower { get ; private set ; }
public int Sort { get ; private set ; }
+ public string DescribeIconKey { get ; private set; }
- public override string getKey()
- {
- return ID.ToString();
+ public override string getKey()
+ {
+ return ID.ToString();
}
public override void Parse() {
- try
- {
+ try
+ {
ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
Name = rawContents[1].Trim();
@@ -75,10 +76,12 @@
ShowFightPower=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0;
Sort=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0;
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
+
+ DescribeIconKey = rawContents[17].Trim();
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
}
}
--
Gitblit v1.8.0