From 96c625cf59fa4b68aa7e32285e3df88cc6930799 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 10 九月 2018 15:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Dogz/DogzModel.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index 03f761a..464e662 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -9,6 +9,7 @@
     public class DogzModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
     {
         PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
+        GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }
 
         public override void Init()
         {
@@ -308,7 +309,8 @@
             m_DogzEquipAttrDict.Clear();
             DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId);
             int[] baseAttrIds = dogzConfig.BaseAttrTypes;
-            for(int i = 0; i < baseAttrIds.Length; i++)
+            Dictionary<int, int> dogzStrenDict = beastModel.AllEnhancedProperties(dogzId);
+            for (int i = 0; i < baseAttrIds.Length; i++)
             {
                 int attrValue = 0;
                 List<ItemModel> itemModels = GetDogzEquips(dogzId);
@@ -340,7 +342,10 @@
                         }
                     }
                 }
-
+                if(dogzStrenDict.ContainsKey(baseAttrIds[i]))
+                {
+                    attrValue += dogzStrenDict[baseAttrIds[i]];
+                }
                 m_DogzEquipAttrDict.Add(baseAttrIds[i], attrValue);
             }
             return m_DogzEquipAttrDict;

--
Gitblit v1.8.0