From 4e616a2019e83cd9d14d09e0190ba4fdb224fab1 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 28 八月 2018 16:29:15 +0800
Subject: [PATCH] 2968 【前端】封魔坛必定掉落、几率掉落根据职业显示不同
---
Core/GameEngine/Model/Config/DemonJarConfig.cs.meta | 2
Core/GameEngine/Model/Config/DemonJarConfig.cs | 95 +++++++++++++++++--------------
System/FindPrecious/BossIntroduceBehaviour.cs | 11 +++
System/FindPrecious/DemonJarBossIntroduceBehaviour.cs | 15 ++++
4 files changed, 77 insertions(+), 46 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs b/Core/GameEngine/Model/Config/DemonJarConfig.cs
index 87b2692..5b4f13b 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs
@@ -1,21 +1,23 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, August 14, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Tuesday, August 28, 2018
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
public partial class DemonJarConfig : ConfigBase {
public int NPCID { get ; private set ; }
public int LineID { get ; private set ; }
public int Time { get ; private set ; }
- public int[] MustItemID;
- public string[] MustItemDescriptions;
+ public int[] MustItemIDJob1;
+ public string[] MustItemDescriptionsJob1;
+ public int[] MustItemIDJob2;
+ public string[] MustItemDescriptionsJob2;
public int[] RareItemID;
public string PortraitID { get ; private set; }
public int SpecialItemMark { get ; private set ; }
@@ -26,13 +28,13 @@
public int[] Job3;
public int KillHurtMin { get ; private set ; }
public int KillHurtMax { get ; private set ; }
-
+
public override string getKey()
{
return NPCID.ToString();
- }
-
- public override void Parse() {
+ }
+
+ public override void Parse() {
try
{
NPCID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
@@ -41,65 +43,74 @@
Time=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
- string[] MustItemIDStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- MustItemID = new int[MustItemIDStringArray.Length];
- for (int i=0;i<MustItemIDStringArray.Length;i++)
+ string[] MustItemIDJob1StringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemIDJob1 = new int[MustItemIDJob1StringArray.Length];
+ for (int i=0;i<MustItemIDJob1StringArray.Length;i++)
{
- int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
+ int.TryParse(MustItemIDJob1StringArray[i],out MustItemIDJob1[i]);
}
- MustItemDescriptions = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemDescriptionsJob1 = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- string[] RareItemIDStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] MustItemIDJob2StringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemIDJob2 = new int[MustItemIDJob2StringArray.Length];
+ for (int i=0;i<MustItemIDJob2StringArray.Length;i++)
+ {
+ int.TryParse(MustItemIDJob2StringArray[i],out MustItemIDJob2[i]);
+ }
+
+ MustItemDescriptionsJob2 = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ string[] RareItemIDStringArray = rawContents[7].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[6].Trim();
+ PortraitID = rawContents[8].Trim();
- SpecialItemMark=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0;
+ SpecialItemMark=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
- CanEnterTimes=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
+ CanEnterTimes=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0;
- AutoAttention=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
+ AutoAttention=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0;
- string[] Job1StringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job1StringArray = rawContents[12].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[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job2StringArray = rawContents[13].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[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job3StringArray = rawContents[14].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[13]) ? int.Parse(rawContents[13]):0;
+ KillHurtMin=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0;
- KillHurtMax=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
+ KillHurtMax=IsNumeric(rawContents[16]) ? int.Parse(rawContents[16]):0;
}
catch (Exception ex)
{
DebugEx.Log(ex);
- }
- }
-
- }
-
-}
-
-
-
-
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
index 4d5781d..c289ab1 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7e442059ea96745478dd5787f9e84ef5
-timeCreated: 1534212554
+timeCreated: 1535444125
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/System/FindPrecious/BossIntroduceBehaviour.cs b/System/FindPrecious/BossIntroduceBehaviour.cs
index a2b67a4..07933f7 100644
--- a/System/FindPrecious/BossIntroduceBehaviour.cs
+++ b/System/FindPrecious/BossIntroduceBehaviour.cs
@@ -120,7 +120,16 @@
break;
case FindPreciousType.DemonJar:
var demonJarConfig = Config.Instance.Get<DemonJarConfig>(bossId);
- undoubtedlyRewards = demonJarConfig.MustItemID;
+ switch (PlayerDatas.Instance.baseData.Job)
+ {
+ case 1:
+ undoubtedlyRewards = demonJarConfig.MustItemIDJob1;
+ break;
+ case 2:
+ undoubtedlyRewards = demonJarConfig.MustItemIDJob2;
+ break;
+ }
+
unusualRewards = demonJarConfig.RareItemID;
break;
}
diff --git a/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs b/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs
index f6e1b40..efa3bb1 100644
--- a/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs
+++ b/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs
@@ -22,13 +22,24 @@
if (m_FindPreciousType == FindPreciousType.DemonJar)
{
var demonJarConfig = Config.Instance.Get<DemonJarConfig>(bossId);
+ string[] descriptions = null;
+ switch (PlayerDatas.Instance.baseData.Job)
+ {
+ case 1:
+ descriptions = demonJarConfig.MustItemDescriptionsJob1;
+ break;
+ case 2:
+ descriptions = demonJarConfig.MustItemDescriptionsJob2;
+ break;
+ }
+
for (int i = 0; i < m_UndoubtedlyRewardDescription.Length; i++)
{
var behaviour = m_UndoubtedlyRewardDescription[i];
- if (i < demonJarConfig.MustItemDescriptions.Length)
+ if (i < descriptions.Length)
{
behaviour.gameObject.SetActive(true);
- behaviour.text = demonJarConfig.MustItemDescriptions[i];
+ behaviour.text = descriptions[i];
}
else
{
--
Gitblit v1.8.0