From f2cd8cf71a54e251e5f507c7d69c6f91f90e5074 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Pet/PlayerPetDatas.cs | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/System/Pet/PlayerPetDatas.cs b/System/Pet/PlayerPetDatas.cs
index 8310f78..ef0090d 100644
--- a/System/Pet/PlayerPetDatas.cs
+++ b/System/Pet/PlayerPetDatas.cs
@@ -66,6 +66,7 @@
public int petUpgradeToolId { get; set; }
public event Action PlayerLoginOkData;
+ private Dictionary<int, int> DicDefaultPet = new Dictionary<int, int>();
public override void Init()
{
@@ -95,6 +96,8 @@
{
ListEffectSkill.Add(listeffect[i]);
}
+ string PetRedDotstr = Config.Instance.Get<FuncConfigConfig>("MountPetRedDot").Numerical2;
+ DicDefaultPet = ConfigParse.GetDic<int, int>(PetRedDotstr);
}
public override void UnInit()
@@ -104,7 +107,7 @@
PetAttributeWin.IsRedPointCultivate -= IsRedPointCultivate;
}
-
+
public void OnBeforePlayerDataInitialize()
{
@@ -141,7 +144,7 @@
if (!Wait)
{
TimeSpan timeS = DateTime.Now - dateTimeA;
- if (timeS.Seconds>= 2f)
+ if (timeS.Seconds >= 2f)
{
Wait = true;
}
@@ -172,7 +175,7 @@
}
}
- public void SendPetTrainQuest(int petIndex,int number)
+ public void SendPetTrainQuest(int petIndex, int number)
{
CA704_tagCMPetClassUP _tagCA704 = new CA704_tagCMPetClassUP();
_tagCA704.PetItemIndex = (byte)petIndex;
@@ -353,10 +356,20 @@
}
}
int itemCount = playerPack.GetItemCountByID(PackType.rptItem, 4151);
+ foreach (var key in _DicPetBack.Keys)//鍥犱负鏈夋垚灏变换鍔￠檺鍒舵墍鏈� 绗竴鍙潗楠戠孩鐐归�昏緫鐗规畩鍐�
+ {
+ if (DicDefaultPet.ContainsKey(key) && DicDefaultPet[key] > _DicPetBack[key].PetClass
+ && itemCount > 0 && CultivateRedPoint.ContainsKey(key))
+ {
+ CultivateRedPoint[key].state = RedPointState.Simple;
+ CanEssence = true;
+ return;
+ }
+ }
PetInfoConfig petinfo = Config.Instance.Get<PetInfoConfig>(GetPetId);
if (PlayerDatas.Instance.baseData.LV >= 1500)
{
- if (CultivateRedPoint.ContainsKey(GetPetId) && itemCount > 0 && RedPointMaxLv && petinfo.MaxRank> petLv)
+ if (CultivateRedPoint.ContainsKey(GetPetId) && itemCount > 0 && RedPointMaxLv && petinfo.MaxRank > petLv)
{
CultivateRedPoint[GetPetId].state = RedPointState.Simple;
CanEssence = true;
@@ -369,7 +382,7 @@
CultivateRedPoint[GetPetId].state = RedPointState.Simple;
CanEssence = true;
}
- }
+ }
}
public int GetMinPetLv()
@@ -404,8 +417,8 @@
PetInfoConfig petInfo = Config.Instance.Get<PetInfoConfig>(PetID);
if (petInfo != null)
{
- curPetUnlocks= ConfigParse.GetMultipleStr<int>(petInfo.SkillUnLock);
- maxskillLV = curPetUnlocks[(curPetUnlocks.Length)-1];
+ curPetUnlocks = ConfigParse.GetMultipleStr<int>(petInfo.SkillUnLock);
+ maxskillLV = curPetUnlocks[(curPetUnlocks.Length) - 1];
}
return maxskillLV;
}
@@ -519,7 +532,7 @@
{
Event_H0704Add();
}
-
+
}
else
{
@@ -658,7 +671,7 @@
}
}
- public int IsPetPanelRedPointState()//鐢ㄤ簬鍒ゆ柇褰撳墠鐏靛疇椤电鏄惁鏈夌孩鐐逛寒璧�
+ public int IsPetPanelRedPointState()//鐢ㄤ簬鍒ゆ柇褰撳墠鐏靛疇椤电鏄惁鏈夌孩鐐逛寒璧�
{
int Type = 0;
foreach (var value in DeblockingRedPoint.Values)
@@ -668,7 +681,7 @@
Type = 2;
return Type;
}
- }
+ }
if (MainRedDot.Instance.redPonintPetFunc2.state == RedPointState.Simple)
{
Type = 1;
@@ -680,20 +693,20 @@
#region 棰勮瀹犵墿纰庣墖灞炴��
Dictionary<int, int> petAttrDict = new Dictionary<int, int>();
- public Dictionary<int,int> GetPetAttrAddDict(int petCode)
+ public Dictionary<int, int> GetPetAttrAddDict(int petCode)
{
PetInfoConfig infoConfig = Config.Instance.Get<PetInfoConfig>(petCode);
petAttrDict.Clear();
if (infoConfig == null) return petAttrDict;
int maxRank = infoConfig.MaxRank;
- PetClassCostConfig cost = PetClassCostConfig.GetPetIdAndRank(petCode,maxRank);
+ PetClassCostConfig cost = PetClassCostConfig.GetPetIdAndRank(petCode, maxRank);
int allAtkAdd = 0;
- if(cost != null)
+ if (cost != null)
{
allAtkAdd = cost.AtkAdd;
}
- petAttrDict.Add(7,allAtkAdd);
+ petAttrDict.Add(7, allAtkAdd);
return petAttrDict;
}
#endregion
--
Gitblit v1.8.0