From 4abd0610ce2cef4f43a829dca7438cad47726dfb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 29 三月 2019 17:30:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/PetEatEquipConfig.cs |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Core/GameEngine/Model/Config/PetEatEquipConfig.cs b/Core/GameEngine/Model/Config/PetEatEquipConfig.cs
index 9ecbeee..c676979 100644
--- a/Core/GameEngine/Model/Config/PetEatEquipConfig.cs
+++ b/Core/GameEngine/Model/Config/PetEatEquipConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Thursday, February 14, 2019
+//    [  Date ]:           Friday, March 29, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -17,7 +17,6 @@
 	public readonly int EquipColor;
 	public readonly int EquipClass;
 	public readonly int Exp;
-	public readonly int integrate;
 
 	public PetEatEquipConfig()
     {
@@ -36,8 +35,6 @@
 			int.TryParse(tables[2],out EquipClass); 
 
 			int.TryParse(tables[3],out Exp); 
-
-			int.TryParse(tables[4],out integrate); 
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0