From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/KnapSack/Logic/PackModelInterface.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/System/KnapSack/Logic/PackModelInterface.cs b/System/KnapSack/Logic/PackModelInterface.cs
index 4dcf228..be80686 100644
--- a/System/KnapSack/Logic/PackModelInterface.cs
+++ b/System/KnapSack/Logic/PackModelInterface.cs
@@ -105,7 +105,7 @@
/// 寰楀埌鐗规畩灞炴�х殑瀛楀吀
/// </summary>
private Dictionary<AttrEnum, int> specAttrDic = new Dictionary<AttrEnum, int>();
- public int SetEquipScore(int itemId,Dictionary<int, List<int>> useDataDic = null,bool isPreview = false)
+ public int SetEquipScore(PackType type,int itemId,Dictionary<int, List<int>> useDataDic = null,bool isPreview = false)
{
specAttrDic.Clear();
int id = itemId;
@@ -178,7 +178,7 @@
}
}
}
- return GetEquipScore(id,specAttrDic);
+ return GetEquipScore(type,id,specAttrDic);
}
@@ -286,10 +286,10 @@
private Dictionary<AttrEnum, int> _tagGsProValueDict;
private Dictionary<string, string> _equipGSFormulaDict = new Dictionary<string, string>(); //key 鍏紡鍙傛暟 value 鍙傛暟鏁板��
private float curProValue = 0;
- private int GetEquipScore(int itemId, Dictionary<AttrEnum, int> specAttrDict)
+ private int GetEquipScore(PackType type,int itemId, Dictionary<AttrEnum, int> specAttrDict)
{
tagChinModel = Config.Instance.Get<ItemConfig>(itemId);
- if (tagChinModel == null || tagChinModel.EquipPlace == 0) return 0;
+ if (tagChinModel == null || !GeneralConfig.Instance.CompareEquipPlaces.Contains(tagChinModel.EquipPlace)) return 0;
Equation.Instance.Clear();
_tagGsProValueDict = EquipGSParamConfig.GetTagGsProValueDict(tagChinModel.LV, tagChinModel.ItemColor,tagChinModel.StarLevel);
@@ -387,7 +387,14 @@
Equation.Instance.AddKeyValue("AtkSpeedC",0);
}
DebugEx.Log("璇勫垎锛�" + Equation.Instance.Eval<double>(_equipGSFormula.Numerical1));
- return Equation.Instance.Eval<int>(_equipGSFormula.Numerical1);
+ if(type == PackType.rptDogzEquip || type == PackType.rptDogzItem)
+ {
+ return Equation.Instance.Eval<int>(_equipGSFormula.Numerical3);
+ }
+ else
+ {
+ return Equation.Instance.Eval<int>(_equipGSFormula.Numerical1);
+ }
}
return 0;
}
@@ -1166,7 +1173,8 @@
for (i = 0; i < itemlist.Count; i++)
{
bool isOverdue = IsOverdue(itemlist[i].itemInfo.ItemGUID, itemlist[i].itemInfo.ItemID, itemlist[i].useDataDict);
- if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue)
+ bool isRealm = PlayerDatas.Instance.baseData.realmLevel >= itemlist[i].chinItemModel.RealmLimit ? true : false;
+ if (itemlist[i].equipScore > putOnDic[key].equipScore && !isOverdue && isRealm)
{
return true;
}
--
Gitblit v1.8.0