From 356821032f10ee7076b1cd8ddb9b02a2a5ddfbb1 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期一, 24 六月 2019 13:35:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/DemonJarConfig.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs b/Core/GameEngine/Model/Config/DemonJarConfig.cs
index b77351d..f261d71 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: Fish
-// [ Date ]: Wednesday, June 19, 2019
+// [ Date ]: Monday, June 24, 2019
//--------------------------------------------------------
using System.Collections.Generic;
@@ -23,6 +23,7 @@
public readonly int SpecialItemMark;
public readonly int CanEnterTimes;
public readonly int AutoAttention;
+ public readonly int CancelAttentionAfterKill;
public readonly int[] Job1;
public readonly int[] Job2;
public readonly int[] Job3;
@@ -70,32 +71,34 @@
int.TryParse(tables[9],out AutoAttention);
- string[] Job1StringArray = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ int.TryParse(tables[10],out CancelAttentionAfterKill);
+
+ string[] Job1StringArray = tables[11].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 = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job2StringArray = tables[12].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 = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job3StringArray = tables[13].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]);
}
- int.TryParse(tables[13],out KillHurtMin);
+ int.TryParse(tables[14],out KillHurtMin);
- int.TryParse(tables[14],out KillHurtMax);
+ int.TryParse(tables[15],out KillHurtMax);
- RewardDescription = tables[15];
+ RewardDescription = tables[16];
}
catch (Exception ex)
{
--
Gitblit v1.8.0