From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Dogz/DogzModel.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index ee2d4b6..25fc8c0 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -448,16 +448,22 @@
GameNetSystem.Instance.SendInfo(buyCnt);
}
- public void SendDogzEquipStrength(int index,List<int>indexlist,int isDouble)
+ public void SendDogzEquipStrength(int index,List<int>indexlist,List<int> IndexUseCountList, int isDouble)
{
CA5C4_tagCMDogzEquipPlus dogzStren = new CA5C4_tagCMDogzEquipPlus();
dogzStren.EquipIndex = (byte)index;
dogzStren.IndexCount = (byte)indexlist.Count;
byte[] indexByte = new byte[indexlist.Count];
- for(int i = 0; i < indexByte.Length; i++)
+ uint[] indexUseCountList = new uint[indexlist.Count];
+ for (int i = 0; i < indexByte.Length; i++)
{
indexByte[i] = (byte)indexlist[i];
}
+ for (int i = 0; i < indexUseCountList.Length; i++)
+ {
+ indexUseCountList[i] = (uint)IndexUseCountList[i];
+ }
+ dogzStren.IndexUseCountList = indexUseCountList;
dogzStren.IndexList = indexByte;
dogzStren.IsDouble = (byte)isDouble;
GameNetSystem.Instance.SendInfo(dogzStren);
@@ -490,7 +496,7 @@
public bool IsReachSelectCondi(int itemId)
{
ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(itemId);
- if (itemConfig == null) return false;
+ if (itemConfig == null || itemConfig.EquipPlace == 0) return false;
if (SelectDogzItemQuality == 0 && SelectDogzItemStart == 0) return true;
--
Gitblit v1.8.0