From 7a761b76a539114233ab710b5b9a46f45a09203a Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 22 八月 2018 16:45:27 +0800
Subject: [PATCH] 【1885】修改神兽装备评分计算方式

---
 System/KnapSack/Logic/PackModelInterface.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/System/KnapSack/Logic/PackModelInterface.cs b/System/KnapSack/Logic/PackModelInterface.cs
index 4dcf228..c76b092 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,7 +286,7 @@
         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;
@@ -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;
         }

--
Gitblit v1.8.0