From c9add585a6990f1beecb94a946eaa3f5d27dcbd1 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 14:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/EquipGem/EquipStrengthModel.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/System/EquipGem/EquipStrengthModel.cs b/System/EquipGem/EquipStrengthModel.cs
index c54367e..63cf1b6 100644
--- a/System/EquipGem/EquipStrengthModel.cs
+++ b/System/EquipGem/EquipStrengthModel.cs
@@ -47,6 +47,7 @@
public Dictionary<int, EquipStrengthClass> EquipStrengthDic = new Dictionary<int, EquipStrengthClass>();//寮哄寲鏁版嵁
public Dictionary<int, EquipMaxLvClass> EquipLevelMaxDic = new Dictionary<int, EquipMaxLvClass>();//寮哄寲绫诲瀷鐨勬渶澶х瓑绾т笂闄�
public Dictionary<int, int> PartTypeDic = new Dictionary<int, int>();//寮哄寲鐨勯儴浣嶇被鍨�
+ public Dictionary<int, int> EvolutionTypeMaxDic = new Dictionary<int, int>();
public event Action EquipStrengthUpdate;//寮哄寲鏁版嵁鍒锋柊
public event Action SelectEquipRefresh;//浜岀骇椤电鍒锋柊
public event Action SelectLevelRefresh;//涓�绾ч〉绛惧埛鏂�
@@ -94,6 +95,7 @@
var strengthenLevelLimit = FuncConfigConfig.Get("StrengthenLevelLimit").Numerical1;
PartTypeDic = ConfigParse.GetDic<int, int>(strengthenLevelLimit);
GetEquipLevelMax();
+ GetEvolutionTypeMax();
}
public void OnBeforePlayerDataInitialize()
@@ -142,9 +144,15 @@
CA301_tagEquipPlus CA301 = new CA301_tagEquipPlus();
CA301.PackType = (byte)packTyp;
CA301.ItemIndex = (ushort)equipIndex;
- GameNetSystem.Instance.SendInfo(CA301);//鍚戞湇鍔″櫒鍙戦�佽澶囦綅
+ GameNetSystem.Instance.SendInfo(CA301);
}
+ public void SendEquipPlusEvolve(int equipIndex)
+ {
+ CA316_tagCMEquipPlusEvolve CA316 = new CA316_tagCMEquipPlusEvolve();
+ CA316.ItemIndex =(ushort)equipIndex;
+ GameNetSystem.Instance.SendInfo(CA316);
+ }
private void GetEquipLevelMax()
{
var itemPlusMax = ItemPlusMaxConfig.GetValues();
@@ -235,7 +243,7 @@
return itemPlusConfig;
}
- public EquipPlusEvolveClass GetEquipPlusEvolve(int equipType, int equipLv=0)//鑾峰彇瑁呭杩涘寲鏁版嵁
+ public EquipPlusEvolveClass GetEquipPlusEvolve(int equipType, int equipLv = 0)//鑾峰彇瑁呭杩涘寲鏁版嵁
{
EquipPlusEvolveClass equipPlusEvolve = new EquipPlusEvolveClass();
var equipPlusEvolveConfig = EquipPlusEvolveConfig.GetEquipPlaceAndEvolveLV(equipType, equipLv);
@@ -258,25 +266,56 @@
if (config != null)
{
equipPlusEvolve.AttrName = config.Name;
- float value= Dic2[key];
+ float value = Dic2[key];
switch (config.ISPercentage)
{
case 0:
+ if (equipLv == 0)
+ {
+ equipPlusEvolve.AttrValue = 0.ToString();
+ }
equipPlusEvolve.AttrValue = value.ToString();
break;
case 1:
- equipPlusEvolve.AttrValue = (value/100).ToString()+"%";
+ if (equipLv == 0)
+ {
+ equipPlusEvolve.AttrValue = 0.ToString() + "%";
+ }
+ equipPlusEvolve.AttrValue = (value / 100).ToString() + "%";
break;
case 2:
- equipPlusEvolve.AttrValue = value.ToString()+"%";
+ if (equipLv == 0)
+ {
+ equipPlusEvolve.AttrValue = 0.ToString() + "%";
+ }
+ equipPlusEvolve.AttrValue = value.ToString() + "%";
break;
-
}
}
}
}
return equipPlusEvolve;
}
+
+ private void GetEvolutionTypeMax()
+ {
+ var evolveValues = EquipPlusEvolveConfig.GetValues();
+ foreach (var value in evolveValues)
+ {
+ if (EvolutionTypeMaxDic.ContainsKey(value.EquipPlace))
+ {
+ var lv = EvolutionTypeMaxDic[value.EquipPlace];
+ if (value.EvolveLV > lv)
+ {
+ EvolutionTypeMaxDic[value.EquipPlace] = value.EvolveLV;
+ }
+ }
+ else
+ {
+ EvolutionTypeMaxDic.Add(value.EquipPlace, value.EvolveLV);
+ }
+ }
+ }
}
--
Gitblit v1.8.0