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/ContactConfig.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ContactConfig.cs b/Core/GameEngine/Model/Config/ContactConfig.cs
index cb4e900..57e927a 100644
--- a/Core/GameEngine/Model/Config/ContactConfig.cs
+++ b/Core/GameEngine/Model/Config/ContactConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Monday, October 15, 2018
+// [ Date ]: Thursday, October 25, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -11,23 +11,29 @@
public partial class ContactConfig : ConfigBase {
+ public int id { get ; private set ; }
public string appid { get ; private set; }
+ public int branch { get ; private set ; }
public string qq { get ; private set; }
public string phone { get ; private set; }
public override string getKey()
{
- return appid.ToString();
+ return id.ToString();
}
public override void Parse() {
try
{
- appid = rawContents[0].Trim();
+ id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
- qq = rawContents[1].Trim();
+ appid = rawContents[1].Trim();
- phone = rawContents[2].Trim();
+ branch=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
+
+ qq = rawContents[3].Trim();
+
+ phone = rawContents[4].Trim();
}
catch (Exception ex)
{
--
Gitblit v1.8.0