From 365adebaa2a0ea75a83d80c23411475b9b8495b0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 04 九月 2018 11:54:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/ItemConfig.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Config/ItemConfig.cs b/Core/GameEngine/Model/Config/ItemConfig.cs
index 2a21780..b7a0b4d 100644
--- a/Core/GameEngine/Model/Config/ItemConfig.cs
+++ b/Core/GameEngine/Model/Config/ItemConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, August 31, 2018
+// [ Date ]: Tuesday, September 04, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -21,7 +21,7 @@
public int UseLV { get ; private set ; }
public int CanSell { get ; private set ; }
public int CanTrade { get ; private set ; }
- public int ComposeID { get ; private set ; }
+ public int[] JumpComposeCondi;
public int CanDrop { get ; private set ; }
public int CanBind { get ; private set ; }
public int CDType { get ; private set ; }
@@ -110,7 +110,12 @@
CanTrade=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
- ComposeID=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0;
+ string[] JumpComposeCondiStringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ JumpComposeCondi = new int[JumpComposeCondiStringArray.Length];
+ for (int i=0;i<JumpComposeCondiStringArray.Length;i++)
+ {
+ int.TryParse(JumpComposeCondiStringArray[i],out JumpComposeCondi[i]);
+ }
CanDrop=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
--
Gitblit v1.8.0