From 6b81bbed0f2b090e7b849d0dc4e3b1d32c7d07f5 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 28 九月 2018 20:13:51 +0800
Subject: [PATCH] 3937 【前端】封魔坛伤害第一提示分段
---
Core/GameEngine/Model/Config/DemonJarConfig.cs.meta | 2 +-
System/FindPrecious/DemonJarWin.cs | 5 ++---
Core/GameEngine/Model/Config/DemonJarConfig.cs | 5 ++++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs b/Core/GameEngine/Model/Config/DemonJarConfig.cs
index d0cbc53..c870ae0 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, August 28, 2018
+// [ Date ]: Friday, September 28, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -26,6 +26,7 @@
public int[] Job3;
public int KillHurtMin { get ; private set ; }
public int KillHurtMax { get ; private set ; }
+ public string RewardDescription { get ; private set; }
public override string getKey()
{
@@ -84,6 +85,8 @@
KillHurtMin=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
KillHurtMax=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
+
+ RewardDescription = rawContents[15].Trim();
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
index 1cbe5ff..5277fdc 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: 1535448421
+timeCreated: 1538136681
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/System/FindPrecious/DemonJarWin.cs b/System/FindPrecious/DemonJarWin.cs
index d6186d2..c13f0f6 100644
--- a/System/FindPrecious/DemonJarWin.cs
+++ b/System/FindPrecious/DemonJarWin.cs
@@ -383,15 +383,14 @@
m_BossIntroduce.Display(_bossId, false);
m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(_bossId);
- var npcConfig = Config.Instance.Get<NPCConfig>(_bossId);
- m_RewardDescription.text = Language.Get(npcConfig.NPCLV >= GeneralConfig.Instance.demonJarLevelLimit ? "FindPrecious_13" : "FindPrecious_18");
-
DemonJarBossData bossData;
model.TryGetBossData(_bossId, out bossData);
var npcDropConfig = Config.Instance.Get<NPCDropItemConfig>(bossData.id);
m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);
var demonJarConfig = Config.Instance.Get<DemonJarConfig>(model.selectedBoss);
+ m_RewardDescription.text = Language.Get(demonJarConfig.RewardDescription);
+
var doubleShowable = demonJarConfig.CanEnterTimes == 0;
m_ContainerDouble.gameObject.SetActive(doubleShowable);
if (doubleShowable)
--
Gitblit v1.8.0