From f830df47deeef8b302569fd83a5b7cedf2db8106 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 11:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/DemonJarConfig.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs b/Core/GameEngine/Model/Config/DemonJarConfig.cs
index 9f954db..b52b89d 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, July 20, 2018
+// [ Date ]: Tuesday, August 14, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -15,6 +15,7 @@
public int LineID { get ; private set ; }
public int Time { get ; private set ; }
public int[] MustItemID;
+ public string[] MustItemDescriptions;
public int[] RareItemID;
public string PortraitID { get ; private set; }
public int SpecialItemMark { get ; private set ; }
@@ -47,45 +48,47 @@
int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
}
- string[] RareItemIDStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemDescriptions = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ string[] RareItemIDStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
RareItemID = new int[RareItemIDStringArray.Length];
for (int i=0;i<RareItemIDStringArray.Length;i++)
{
int.TryParse(RareItemIDStringArray[i],out RareItemID[i]);
}
- PortraitID = rawContents[5].Trim();
+ PortraitID = rawContents[6].Trim();
- SpecialItemMark=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
+ SpecialItemMark=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0;
- CanEnterTimes=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0;
+ CanEnterTimes=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
- AutoAttention=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
+ AutoAttention=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
- string[] Job1StringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job1StringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Job1 = new int[Job1StringArray.Length];
for (int i=0;i<Job1StringArray.Length;i++)
{
int.TryParse(Job1StringArray[i],out Job1[i]);
}
- string[] Job2StringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job2StringArray = rawContents[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Job2 = new int[Job2StringArray.Length];
for (int i=0;i<Job2StringArray.Length;i++)
{
int.TryParse(Job2StringArray[i],out Job2[i]);
}
- string[] Job3StringArray = rawContents[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job3StringArray = rawContents[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Job3 = new int[Job3StringArray.Length];
for (int i=0;i<Job3StringArray.Length;i++)
{
int.TryParse(Job3StringArray[i],out Job3[i]);
}
- KillHurtMin=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
+ KillHurtMin=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
- KillHurtMax=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
+ KillHurtMax=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
}
catch (Exception ex)
{
--
Gitblit v1.8.0