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/HorseConfig.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/Core/GameEngine/Model/Config/HorseConfig.cs b/Core/GameEngine/Model/Config/HorseConfig.cs
index da1b095..4afc506 100644
--- a/Core/GameEngine/Model/Config/HorseConfig.cs
+++ b/Core/GameEngine/Model/Config/HorseConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, July 31, 2018
+// [ Date ]: Thursday, October 25, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -9,8 +9,8 @@
namespace TableConfig {
- public partial class HorseConfig : ConfigBase {
-
+ public partial class HorseConfig : ConfigBase {
+
public int HorseID { get ; private set ; }
public int ItemID { get ; private set ; }
public string Name { get ; private set; }
@@ -27,15 +27,16 @@
public int ShowFightPower { get ; private set ; }
public int Sort { get ; private set ; }
public int[] RideAudios;
+ public string DescribeIconKey { get ; private set; }
- public override string getKey()
- {
- return HorseID.ToString();
+ public override string getKey()
+ {
+ return HorseID.ToString();
}
public override void Parse() {
- try
- {
+ try
+ {
HorseID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
ItemID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
@@ -72,10 +73,12 @@
{
int.TryParse(RideAudiosStringArray[i],out RideAudios[i]);
}
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
+
+ DescribeIconKey = rawContents[16].Trim();
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
}
}
--
Gitblit v1.8.0