From 1c4c5c5cb829334303bff98837a69a9653dca714 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 17:09:49 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
Core/GameEngine/Model/Config/TrialExchangeConfig.cs | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TrialExchangeConfig.cs b/Core/GameEngine/Model/Config/TrialExchangeConfig.cs
index 8d83e39..49855c9 100644
--- a/Core/GameEngine/Model/Config/TrialExchangeConfig.cs
+++ b/Core/GameEngine/Model/Config/TrialExchangeConfig.cs
@@ -1,35 +1,40 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Thursday, August 02, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, August 20, 2018
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
public partial class TrialExchangeConfig : ConfigBase {
public int id { get ; private set ; }
- public int exchangeItemID { get ; private set ; }
+ public int[] exchangeItemID;
public int exchangeItemCount { get ; private set ; }
public int exchangeItemIsBind { get ; private set ; }
public int tokenId { get ; private set ; }
public int tokenCount { get ; private set ; }
public string description { get ; private set; }
-
+
public override string getKey()
{
return id.ToString();
- }
-
- public override void Parse() {
+ }
+
+ public override void Parse() {
try
{
id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
- exchangeItemID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
+ string[] exchangeItemIDStringArray = rawContents[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ exchangeItemID = new int[exchangeItemIDStringArray.Length];
+ for (int i=0;i<exchangeItemIDStringArray.Length;i++)
+ {
+ int.TryParse(exchangeItemIDStringArray[i],out exchangeItemID[i]);
+ }
exchangeItemCount=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
@@ -44,13 +49,13 @@
catch (Exception ex)
{
DebugEx.Log(ex);
- }
- }
-
- }
-
-}
-
-
-
-
+ }
+ }
+
+ }
+
+}
+
+
+
+
--
Gitblit v1.8.0