From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/KnapSack/Logic/ItemTipsModel.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/System/KnapSack/Logic/ItemTipsModel.cs b/System/KnapSack/Logic/ItemTipsModel.cs
index 2ac37f2..cbc4551 100644
--- a/System/KnapSack/Logic/ItemTipsModel.cs
+++ b/System/KnapSack/Logic/ItemTipsModel.cs
@@ -33,7 +33,7 @@
public Dictionary<int, HorseConfig> unlockMountDict { get; private set; }
private Dictionary<int, Dictionary<int, int>> petSkillDict = new Dictionary<int, Dictionary<int, int>>(); // 缂栧彿 瑙ｉ攣闃剁骇 鎶�鑳�
private Dictionary<int, Dictionary<int, List<int>>> mountSkillDict = new Dictionary<int, Dictionary<int, List<int>>>(); // 缂栧彿 瑙ｉ攣闃剁骇 鎶�鑳�
-
+ public Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>();
public string expValueFormula = "";
public int[] guardAutoDrops;
@@ -415,6 +415,19 @@
FuncConfigConfig randomRuneConfig = Config.Instance.Get<FuncConfigConfig>("RandomRuneIDList");
randomRuneIds = ConfigParse.GetMultipleStr<int>(randomRuneConfig.Numerical1);
+
+ FuncConfigConfig petQuality = Config.Instance.Get<FuncConfigConfig>("PetQuality");
+ int[] qualitys = ConfigParse.GetMultipleStr<int>(petQuality.Numerical1);
+ string[] qualityNames = ConfigParse.GetMultipleStr(petQuality.Numerical2);
+ if (qualitys != null && qualityNames != null
+ && qualitys.Length == qualityNames.Length)
+ {
+ for(int i = 0; i < qualitys.Length; i++)
+ {
+ petAndMountQualityDict.Add(qualitys[i],qualityNames[i]);
+ }
+ }
+
}
public void OnBeforePlayerDataInitialize()
@@ -780,7 +793,7 @@
{
if(isOverdue)
{
- attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendRenewalQuest(ItemWinBtnType.renewal, attrData.index); });
+ attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendRenewalQuest(ItemWinBtnType.renewal, attrData.guid); });
}
}
}
@@ -1780,6 +1793,13 @@
return null;
}
+ public string GetQualityName(int quality)
+ {
+ string nameStr = string.Empty;
+ petAndMountQualityDict.TryGetValue(quality,out nameStr);
+ return nameStr;
+ }
+
public Dictionary<int,List<int>> GetMountSkillDict(int unlockId)
{
if(unlockMountDict.ContainsKey(unlockId))
--
Gitblit v1.8.0