From 2b32c1203f307905b0b5e646291137c44d067f4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 10 十一月 2018 15:06:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/ItemTipsModel.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/System/KnapSack/Logic/ItemTipsModel.cs b/System/KnapSack/Logic/ItemTipsModel.cs
index cbc4551..0409ccc 100644
--- a/System/KnapSack/Logic/ItemTipsModel.cs
+++ b/System/KnapSack/Logic/ItemTipsModel.cs
@@ -2205,7 +2205,7 @@
/// <summary>
/// 璁剧疆寮哄寲鏁版嵁
/// </summary>
- private ItemPlusConfig itemPlus;
+ private ItemPlusConfig.ItemPlusData itemPlus;
public int StrengthLV { get; private set; }
public void SetStrengthData(int lv, int type)
{
@@ -2214,11 +2214,11 @@
if (lv <= 0) return;
strengthDataDict = new Dictionary<int, int>();
- itemPlus = ItemPlusConfig.GetTypeAndGrade(type,lv);
+ itemPlus = ItemPlusConfig.GetItemPlusData(type,lv);
if (itemPlus != null)
{
- int[] attrIDs = ConfigParse.GetMultipleStr<int>(itemPlus.attType);
- int[] attrValues = ConfigParse.GetMultipleStr<int>(itemPlus.attValue);
+ int[] attrIDs = itemPlus.attrIds;
+ int[] attrValues = itemPlus.attrValues;
int i = 0;
for (i = 0; i < attrIDs.Length; i++)
{
@@ -2572,18 +2572,20 @@
public ItemSuitAttrData(int groupType,int suitType,int suitLv,int equipJob)
{
- this.suitAttrConfig = EquipSuitAttrConfig.GetSuitAttrConfig(groupType,suitType,suitLv,equipJob);
- if (suitAttrConfig != null)
+ var suitAttrData = EquipSuitAttrConfig.GetSuitAttrData(groupType, suitType, suitLv, equipJob);
+ if (suitAttrData != null)
{
- this.firstSuitAttrs = ConfigParse.GetMultipleStr<int>(this.suitAttrConfig.propList1);
- this.firstSuitAttrValues = ConfigParse.GetMultipleStr<int>(this.suitAttrConfig.propValueList1);
- this.secondSuitAttrs = ConfigParse.GetMultipleStr<int>(this.suitAttrConfig.propList2);
- this.secondSuitAttrValues = ConfigParse.GetMultipleStr<int>(this.suitAttrConfig.propValueList2);
- this.thirdSuitAttrs = ConfigParse.GetMultipleStr<int>(this.suitAttrConfig.propList3);
- this.thirdSuitAttrValues = ConfigParse.GetMultipleStr<int>(this.suitAttrConfig.propValueList3);
+ this.suitAttrConfig = suitAttrData.attrConfig;
+ this.firstSuitAttrs = suitAttrData.attr1Ids;
+ this.firstSuitAttrValues = suitAttrData.attr1Values;
+ this.secondSuitAttrs = suitAttrData.attr2Ids;
+ this.secondSuitAttrValues = suitAttrData.attr2Values;
+ this.thirdSuitAttrs = suitAttrData.attr3Ids;
+ this.thirdSuitAttrValues = suitAttrData.attr3Values;
}
else
{
+ this.suitAttrConfig = null;
this.firstSuitAttrs = null;
this.firstSuitAttrValues = null;
this.secondSuitAttrs = null;
--
Gitblit v1.8.0