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/Mount/PlayerMountDatas.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/System/Mount/PlayerMountDatas.cs b/System/Mount/PlayerMountDatas.cs
index f56a921..c84a6d1 100644
--- a/System/Mount/PlayerMountDatas.cs
+++ b/System/Mount/PlayerMountDatas.cs
@@ -51,7 +51,7 @@
public int MountStoneItemId = 0;
public bool IsOk = false;
public bool IsRedPointSingleFeed = true;
- public List<int> ListEffectSkill = new List<int>();
+ public List<int> ListEffectSkill = new List<int>();
PlayerPackModel _playerPack;
PlayerPackModel playerPack
{
@@ -61,9 +61,10 @@
public bool Wait = true;//绛夊緟鍥炲寘(浣跨敤鍧愰獞涓�)
public static Action<int, bool> MultipleEvent;
public static event Action PlayerLoginOKData;
+ private Dictionary<int, int> DicDefaultMount = new Dictionary<int, int>();
public override void Init()
- {
- ToAddSorting();
+ {
+ ToAddSorting();
playerPack.RefreshItemCountAct += OnItemRefreshEvent;
MountWin.RedPointMountDan += RedPointMountDan;
MountSkillAndItem();
@@ -75,6 +76,8 @@
{
ListEffectSkill.Add(listeffect[i]);
}
+ string MountRedDotstr = Config.Instance.Get<FuncConfigConfig>("MountPetRedDot").Numerical1;
+ DicDefaultMount = ConfigParse.GetDic<int, int>(MountRedDotstr);
}
public override void UnInit()
@@ -106,7 +109,7 @@
foreach (var index in singPack.GetPackModelIndexDict().Keys)
{
OnItemRefreshEvent(singPack.packType, index, singPack.GetPackModelIndexDict()[index].itemId);
- }
+ }
if (PlayerLoginOKData != null)
{
PlayerLoginOKData();
@@ -278,6 +281,7 @@
int GetMountID = 0;
int GetMountLv = 0;
+
for (int i = 0; i < SortMount.Count; i++)
{
int horseID = SortMount[i].HorseID;
@@ -300,6 +304,16 @@
ItemConfig _tagchine = Config.Instance.Get<ItemConfig>(int.Parse(_tagfun.Numerical1));
HorseConfig horsecon = Config.Instance.Get<HorseConfig>(GetMountID);
int number = playerPack.GetItemCountByID(PackType.rptItem, _tagchine.ID);
+ foreach (var key in _DicHorse.Keys)//鍥犱负鏈夋垚灏变换鍔￠檺鍒舵墍鏈� 绗竴鍙潗楠戠孩鐐归�昏緫鐗规畩鍐�
+ {
+ if (DicDefaultMount.ContainsKey(key) && DicDefaultMount[key] > _DicHorse[key].Lv
+ && number > 0 && ASingleFeedRedPoint.ContainsKey(key))
+ {
+ ASingleFeedRedPoint[key].state = RedPointState.Simple;
+ return;
+ }
+
+ }
if (ASingleFeedRedPoint.ContainsKey(GetMountID) && number > 0 && GetMountLv < horsecon.MaxLV)
{
if (PlayerDatas.Instance.baseData.LV >= 1500)
@@ -315,7 +329,6 @@
ASingleFeedRedPoint[GetMountID].state = RedPointState.Simple;
return;
}
-
}
}
@@ -349,7 +362,7 @@
int SkillLv = 0;
foreach (var key in GetMountSkillAndItem.Keys)
{
- if (GetMountSkillAndItem[key].HorseID == MountId)
+ if (GetMountSkillAndItem[key].HorseID == MountId)
{
if (GetMountSkillAndItem[key].HorseLV > SkillLv)
{
@@ -584,7 +597,7 @@
Type = 2;
return Type;
}
- }
+ }
if (MainRedDot.Instance.redPointMountFunc.state == RedPointState.Simple)
{
Type = 1;
@@ -603,7 +616,7 @@
int maxRank = horseConfig.MaxLV;
HorseUpConfig cost = HorseUpConfig.GetHorseIDAndLV(mountCode, maxRank);
- if(cost != null)
+ if (cost != null)
{
int[] attrIds = ConfigParse.GetMultipleStr<int>(cost.AttrType);
int[] attrValues = ConfigParse.GetMultipleStr<int>(cost.AttrValue);
--
Gitblit v1.8.0