From e33b8deea8413bcbc74998122ad91e6c17504729 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 04 二月 2026 15:57:42 +0800
Subject: [PATCH] 483 【游历】增加体力补充
---
Main/System/BeautyMM/BeautyMMManager.Travel.cs | 2
Main/System/ItemTip/ItemBatchUseWin.cs | 135 ++
Main/System/KnapSack/PackManager.cs | 1
Main/System/Message/RichTableEvent.cs | 24
Main/System/BeautyMM/BeautyMMManager.cs | 3
Main/System/ItemTip/BoxGetItemModel.cs | 231 ----
Main/System/KnapSack/Logic/ItemLogicUtility.cs | 1145 -----------------------
Main/System/ItemTip/ItemBatchUseWin.cs.meta | 11
Main/System/ItemTip/ItemTipUtility.cs | 1205 -------------------------
Main/System/BeautyMM/BeautyMMTravelWin.cs | 12
10 files changed, 193 insertions(+), 2,576 deletions(-)
diff --git a/Main/System/BeautyMM/BeautyMMManager.Travel.cs b/Main/System/BeautyMM/BeautyMMManager.Travel.cs
index 763982c..9d8a4cd 100644
--- a/Main/System/BeautyMM/BeautyMMManager.Travel.cs
+++ b/Main/System/BeautyMM/BeautyMMManager.Travel.cs
@@ -21,6 +21,8 @@
public List<Int2> openChangeGridList = new List<Int2>(); // 鍓嶅悗瀵规瘮锛屾湁鍙樺寲鐨勬牸瀛� ,鎵撳紑鍓嶉潰鍓嶉渶娓呯悊
public event Action<int> OnTravelInfoUpdate;
+ public int addEnergyItemID;
+ public int addEnergyValue;
public int maxGirds = 0;
public Int2 clickGirdPos = new Int2();
public bool isClickDoor = false; // 鏄惁鐐瑰嚮杩囬棬锛岀敤浜庡府鐜╁鑷姩閲嶇疆
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs b/Main/System/BeautyMM/BeautyMMManager.cs
index 98825e8..d0e8932 100644
--- a/Main/System/BeautyMM/BeautyMMManager.cs
+++ b/Main/System/BeautyMM/BeautyMMManager.cs
@@ -83,7 +83,8 @@
recoverTravelEnergyTime = int.Parse(config.Numerical2);
travelRowCol = ConfigParse.GetMultipleStr<int>(config.Numerical3);
maxGirds = travelRowCol[0] * travelRowCol[1];
-
+ addEnergyItemID = int.Parse(config.Numerical4);
+ addEnergyValue = int.Parse(config.Numerical5);
}
diff --git a/Main/System/BeautyMM/BeautyMMTravelWin.cs b/Main/System/BeautyMM/BeautyMMTravelWin.cs
index d7b6fb3..b4040da 100644
--- a/Main/System/BeautyMM/BeautyMMTravelWin.cs
+++ b/Main/System/BeautyMM/BeautyMMTravelWin.cs
@@ -26,6 +26,7 @@
[SerializeField] Image[] rightImgs;
[SerializeField] Image[] wrongImgs;
[SerializeField] UIEffectPlayer[] pointEffects;
+ [SerializeField] Button addBtn;
float gridWidth = 0;
float gridHeight = 0;
@@ -40,6 +41,7 @@
DisplyRate();
buildResultBtn.AddListener(BuildLVUP);
+ addBtn.AddListener(AddEnergy);
var parentRect = girdsGo.GetComponent<RectTransform>();
@@ -302,4 +304,14 @@
}
}
}
+
+ void AddEnergy()
+ {
+ ItemLogicUtility.Instance.ShowItemBatchUseWin(BeautyMMManager.Instance.addEnergyItemID, ShowTip);
+ }
+
+ string ShowTip(long useCnt)
+ {
+ return Language.Get("UseItem1", BeautyMMManager.Instance.addEnergyValue * useCnt);
+ }
}
diff --git a/Main/System/ItemTip/BoxGetItemModel.cs b/Main/System/ItemTip/BoxGetItemModel.cs
index a508a9f..f044c67 100644
--- a/Main/System/ItemTip/BoxGetItemModel.cs
+++ b/Main/System/ItemTip/BoxGetItemModel.cs
@@ -10,75 +10,22 @@
public class BoxGetItemModel : GameSystemManager<BoxGetItemModel>
{
- List<string> commonShowAwardEvents = new List<string>(); //鑾峰彇濂栧姳鐨勫睍绀轰簨浠�
public override void Init()
{
- var config = FuncConfigConfig.Get("CommonShowAwards");
- commonShowAwardEvents = JsonMapper.ToObject<List<string>>(config.Numerical1);
}
- // void OnBeforePlayerDataInitialize()
- // {
- // getItems = null;
- // getCoinsType = 0;
- // getCoinsCnt = 0;
- // }
#region 澶勭悊鏈嶅姟鍣ㄦ暟鎹�
- // public BoxGetItemInfo[] getItems { get; private set; }
- // public int getCoinsType { get; private set; }
- // public long getCoinsCnt { get; private set; }
- // public event Action<int, int, BoxGetItemInfo[]> RefreshGetItemAct;
- // public void SetGetBoxItemInfo(HA810_tagMCNotifyUseItemGetItem boxItemInfo)
- // {
- // getItems = JsonMapper.ToObject<BoxGetItemInfo[]>(boxItemInfo.GetItemData);
- // getCoinsType = boxItemInfo.MoneyType;
- // getCoinsCnt = boxItemInfo.MoneyCount;
- // if (!NewBieCenter.Instance.inGuiding)
- // {
- // List<Item> items = new List<Item>();
- // for (int i = 0; i < getItems.Length; i++)
- // {
- // BoxGetItemInfo info = getItems[i];
- // Dictionary<int, List<int>> useDataDic = ConfigParse.Analysis(info.UserData);
- // if (useDataDic != null && useDataDic.TryGetValue((int)ItemUseDataKey.itemCount, out List<int> list) && list != null && list.Count > 0)
- // {
- // int count = list[0];
- // items.Add(new Item(info.ItemID, count));
- // }
- // else
- // {
- // items.Add(new Item(info.ItemID, info.Count));
- // }
-
- // }
- // ItemLogicUtility.Instance.ShowGetItem(items, seconds: 0);
- // }
-
- // if (RefreshGetItemAct != null)
- // {
- // RefreshGetItemAct((int)boxItemInfo.UseItemID, (int)boxItemInfo.UseCount, getItems);
- // }
-
-
- // }
+
//鑾峰緱濂栧姳灞曠ず
public void ReceiveAwardNotify(HA801_tagMCGiveAwardInfo netPack)
{
var eventName = UIHelper.ServerStringTrim(netPack.EventName);
- // 浠欑洘鏀诲煄鎴�
- // if (eventName == "FamilyGCZSQGrid" || eventName == "FamilyGCZSQPass" || eventName == "FamilyGCZSQPassAll" ||
- // eventName == "FamilyGCZContiribution" || eventName == "FamilyGCZAtk")
- // {
- // ModelCenter.Instance.GetModel<FairySiegeActModel>()?.OnUpdateAwardInfoAction(netPack);
- // return;
- // }
- // if (!commonShowAwardEvents.Contains(eventName))
- // return;
+
if (string.IsNullOrEmpty(eventName))
{
Debug.Log("鑾峰緱鐗╁搧灞曠ず 鏃犱簨浠跺悕");
@@ -132,173 +79,11 @@
ItemLogicUtility.Instance.ShowGetItem(showItems, eventName, isMergeItem:isMergeItem);
}
- // public int GetUseCntByID(int itemId)
- // {
- // return PackManager.Instance.GetItemUsedTimesToday(itemId);
- // }
+
#endregion
- // #region 娑堣�楁潗鏂欒揣甯佸紑鍚殑瀹濈
- // public void SetModel(string guid, int itemId)
- // {
- // ChestsConfig chestsConfig = ChestsConfig.Get(itemId);
- // this.guid = guid;
- // this.itemId = itemId;
- // if (guid == "" || chestsConfig == null) return;
-
- // ItemConfig boxConfig = ItemConfig.Get(itemId);
- // if (PlayerDatas.Instance.baseData.LV < boxConfig.UseLV)
- // {
- // ServerTipDetails.DisplayNormalTip(Language.Get("MakeUseItem101", boxConfig.UseLV));
- // return;
- // }
-
- // CheckOpenBoxCondi(guid, itemId);
- // }
-
- // public void CheckOpenBoxCondi(string guid, int itemId, int useCnt = 1)
- // {
- // ChestsConfig chestsConfig = ChestsConfig.Get(itemId);
- // if (chestsConfig == null) return;
-
- // ItemConfig boxConfig = ItemConfig.Get(itemId);
-
- // if (chestsConfig.ExpendItemID != 0)
- // {
- // ItemConfig itemConfig = ItemConfig.Get(chestsConfig.ExpendItemID);
- // ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("OpenBoxTool", itemConfig.ItemName), (bool isOk) =>
- // {
- // if (isOk)
- // {
- // if (!IsEnoughTools(chestsConfig.ExpendItemID, chestsConfig.ExpendCount * useCnt))
- // {
- // SysNotifyMgr.Instance.ShowTip("OpenBoxToolNoEnough", itemConfig.ItemName);
- // return;
- // }
- // else
- // {
- // CheckOpenMoney(chestsConfig, boxConfig, useCnt);
- // }
- // }
- // });
- // }
- // else
- // {
- // CheckOpenMoney(chestsConfig, boxConfig, useCnt);
- // }
- // }
-
- // public void CheckOpenMoney(ChestsConfig chestsConfig, ItemConfig boxConfig, int useCnt)
- // {
- // if (!IsEnoughMoney(chestsConfig.OpenMoney * useCnt))
- // {
- // SysNotifyMgr.Instance.ShowTip("BoxOpenCostMoney", 1);
- // return;
- // }
- // else
- // {
- // if (chestsConfig.OpenMoney > 0)
- // {
- // ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("OpenBoxGold", chestsConfig.OpenMoney * useCnt), (bool isOk) =>
- // {
- // if (isOk)
- // {
- // CheckOtherCondi(chestsConfig, boxConfig, useCnt);
- // }
- // });
- // }
- // else
- // {
- // CheckOtherCondi(chestsConfig, boxConfig, useCnt);
- // }
- // }
- // }
-
- // public void CheckOtherCondi(ChestsConfig chestsConfig, ItemConfig boxConfig, int useCnt)
- // {
-
- // if (boxConfig.MaxSkillCnt > 0 && GetUseCntByID(itemId) >= boxConfig.MaxSkillCnt)
- // {
- // SysNotifyMgr.Instance.ShowTip("UseCntLimit");
- // return;
- // }
-
- // if (IsSelectItemByID(itemId))
- // {
- // UIManager.Instance.OpenWindow<ChooseItemsWin>();
- // return;
- // }
-
- // ItemLogicUtility.Instance.UseItem(guid, useCnt);
- // }
-
- // public bool CheckOpenBoxCondition(int itemId, out bool isBox)
- // {
- // isBox = false;
- // ChestsConfig chestsConfig = ChestsConfig.Get(itemId);
- // if (chestsConfig == null) return false;
-
- // isBox = true;
- // bool isCanOpen = true;
- // ItemConfig boxConfig = ItemConfig.Get(itemId);
- // if (PlayerDatas.Instance.baseData.LV < boxConfig.UseLV)
- // {
- // isCanOpen = false;
- // return isCanOpen;
- // }
-
- // if (chestsConfig.ExpendItemID != 0)
- // {
- // ItemConfig itemConfig = ItemConfig.Get(chestsConfig.ExpendItemID);
- // if (!IsEnoughTools(chestsConfig.ExpendItemID, chestsConfig.ExpendCount))
- // {
- // isCanOpen = false;
- // return isCanOpen;
- // }
- // }
-
- // if (!IsEnoughMoney(chestsConfig.OpenMoney))
- // {
- // isCanOpen = false;
- // return isCanOpen;
- // }
-
- // if (boxConfig.MaxSkillCnt > 0 && GetUseCntByID(itemId) >= boxConfig.MaxSkillCnt)
- // {
- // isCanOpen = false;
- // return isCanOpen;
- // }
-
- // return isCanOpen;
- // }
-
- // private bool IsEnoughMoney(int moneyCnt)
- // {
- // ulong haveMoney = UIHelper.GetMoneyCnt(1);
- // if (haveMoney >= (ulong)moneyCnt)
- // {
- // return true;
- // }
- // else
- // {
- // return false;
- // }
- // }
-
- // private bool IsEnoughTools(int itemId, int toolCnt)
- // {
- // int count = PackManager.Instance.GetItemCountByID(PackType.Item, itemId);
- // if (count >= toolCnt)
- // {
- // return true;
- // }
- // else
- // {
- // return false;
- // }
- // }
- // #endregion
+
//瀹濈棰勮鐗╁搧 (闅忔満鑾峰緱)
public List<Item> GetBoxItems(int boxID)
@@ -535,14 +320,6 @@
}
-public class BoxGetItemInfo
-{
- public int ItemID;
- public int Count;
- public int IsBind;
- public int IsSuite;
- public string UserData;
-}
public class ChooseItems
{
diff --git a/Main/System/ItemTip/ItemBatchUseWin.cs b/Main/System/ItemTip/ItemBatchUseWin.cs
new file mode 100644
index 0000000..cdeb7e4
--- /dev/null
+++ b/Main/System/ItemTip/ItemBatchUseWin.cs
@@ -0,0 +1,135 @@
+锘�
+
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+//鎵归噺浣跨敤鐗╁搧
+public class ItemBatchUseWin : UIBase
+{
+ [SerializeField] ItemCell itemCell;
+ [SerializeField] Text itemCntTxt;
+ [SerializeField] LongPressButton subBtn;
+ [SerializeField] LongPressButton addBtn;
+ [SerializeField] Text tipText;
+ [SerializeField] Button okBtn;
+ [SerializeField] Text titleText;
+
+ public static Func<long, string> ShowTextEvent;
+ public static int itemID;
+ long curUseCount;
+ long maxCount;
+
+ protected override void InitComponent()
+ {
+ addBtn.SetListener(OnClickPlus);
+ addBtn.onPress.AddListener(OnClickPlus);
+ subBtn.SetListener(OnClickReduce);
+ subBtn.onPress.AddListener(OnClickReduce);
+ okBtn.AddListener(OnOK);
+ }
+
+ protected override void OnPreOpen()
+ {
+ var key = "UseItemTitle_" + itemID;
+ if (LanguageConfig.HasKey(key))
+ {
+ titleText.text = Language.Get(key);
+ }
+ else
+ {
+ titleText.text = Language.Get("UseItemDefault");
+ }
+ maxCount = PackManager.Instance.GetItemCountByID(PackType.Item, itemID);
+ curUseCount = maxCount > 0 ? 1 : 0;
+ itemCell.Init(new ItemCellModel(itemID, false, curUseCount));
+ itemCell.button.AddListener(() =>
+ {
+ ItemTipUtility.Show(itemID);
+ });
+
+ RefreshCount();
+ RefreshBtn();
+ }
+
+ protected override void OnPreClose()
+ {
+ }
+
+
+
+
+ void RefreshCount()
+ {
+ itemCntTxt.text = curUseCount + "/" + maxCount;
+ itemCell.countText.text = curUseCount.ToString();
+ if (ShowTextEvent != null)
+ {
+ tipText.text = ShowTextEvent(curUseCount);
+ }
+ else
+ {
+ tipText.text = "";
+ }
+
+ }
+
+ void RefreshBtn()
+ {
+ if (curUseCount >= maxCount)
+ {
+ addBtn.interactable = false;
+ addBtn.SetColorful(null, false);
+ }
+ else
+ {
+ addBtn.interactable = true;
+ addBtn.SetColorful(null, true);
+ }
+
+ if (curUseCount == 0)
+ {
+ subBtn.interactable = false;
+ subBtn.SetColorful(null, false);
+ }
+ else
+ {
+ subBtn.interactable = true;
+ subBtn.SetColorful(null, true);
+ }
+ }
+
+
+ void OnClickPlus()
+ {
+ if (curUseCount >= maxCount)
+ {
+ curUseCount = maxCount;
+ return;
+ }
+ curUseCount++;
+ RefreshCount();
+ RefreshBtn();
+ }
+
+ void OnClickReduce()
+ {
+ if (curUseCount == 0)
+ return;
+
+ curUseCount--;
+ RefreshCount();
+ RefreshBtn();
+ }
+
+ void OnOK()
+ {
+ CloseWindow();
+ if (ItemLogicUtility.CheckItemCount(PackType.Item, itemID, curUseCount, 2))
+ {
+ ItemLogicUtility.Instance.UseItem(PackManager.Instance.GetItemGUIDByID(itemID));
+ }
+ }
+}
+
+
diff --git a/Main/System/ItemTip/ItemBatchUseWin.cs.meta b/Main/System/ItemTip/ItemBatchUseWin.cs.meta
new file mode 100644
index 0000000..6ab2bc6
--- /dev/null
+++ b/Main/System/ItemTip/ItemBatchUseWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1d6f17e975427324cb877df073020301
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/ItemTip/ItemTipUtility.cs b/Main/System/ItemTip/ItemTipUtility.cs
index 5ed511a..315e69b 100644
--- a/Main/System/ItemTip/ItemTipUtility.cs
+++ b/Main/System/ItemTip/ItemTipUtility.cs
@@ -46,15 +46,11 @@
public bool isEquiped;
public bool isPreview;
- public int star;
- public int strengthenLevel;
- public int score;
public bool isOverdue;
public int auctionSurplusTime;
public int overdueSurplusTime;
public int levelLimit;
public int moneyLimit;
- public int evolveLevel;
}
public struct BaseProperty
@@ -64,78 +60,14 @@
public List<Int2> starProperties;
}
- public struct SpiritWeaponProperty
- {
- public int itemId;
- public List<Int3> properties;
- }
- public struct LegendProperty
- {
- public bool isPreview;
- public int itemId;
- public int trueCount;
- public List<Int2> properties;
- public int score;
- }
- //绁炶灞炴��
- public struct ShenProperty
- {
- public bool isPreview;
- public int itemId;
- public List<Int3> properties;
- }
-
- public struct SuitInfo
- {
- public int job;
- public string name;
- public int level;
- public int maxSuitLevel;
- public List<int> places;
- public Dictionary<int, int> placeStars;
- // public Dictionary<int, EquipSuitPropertyEntry> twoSuitProperties;
- // public Dictionary<int, EquipSuitPropertyEntry> fiveSuitProperties;
- public Dictionary<int, bool> eightSuits;
- }
-
- public struct StarInfo
- {
- public Int2 equipPosition;
- public int starLevel;
- public int maxLevel;
- }
-
- public struct StrengthenProperty
- {
- public int strengthenLevel;
- public List<Int2> properties;
- public int evolveLevel;
- public int equipPlace;
- }
-
- public struct GemInfo
- {
- public Dictionary<int, bool> activeStates;
- public Dictionary<int, int> gems;
- }
-
- public struct TrainProperty
- {
- public int level;
- public List<Int2> properties;
- }
public struct SkillInfo
{
public List<int> skills;
}
- public struct WingRefineMaterials
- {
- public List<Int2> materials;
- }
public struct GetWay
{
@@ -144,75 +76,16 @@
public List<int> ways;
}
-
-
- public struct CustomEquipInfo
- {
- public int job;
- public int itemId;
- public int score;
- public bool isEquiped;
- public List<Int2> legendProperties;
- public List<int> suitPlaces;
- public Dictionary<int, int> placeStars;
- // public Dictionary<EquipSuitType, int> suitLevels;
- public int strengthenLevel;
- public int starLevel;
- public List<Int2> trainProperties;
- public Dictionary<int, bool> gemHoleActiveStates;
- public Dictionary<int, int> gems;
- public List<int> equipSkillList;
- public int evolveLevel;
- }
-
- public struct CustomItemPlus
- {
- public int ItemID;
- public int count;
- public int Equipped;
- public int Preview;
- public int Star;
- public int PlusLV;
- public int EvolveLV;
- public string UserData;
- public int[] Stone;
- public CustomEquipWash Wash;
- public int[][] Equips;
- public int[] suitPlaces;
- public int[] suitLevels;
- public int[] placeStars;
- }
-
- public struct CustomEquipWash
- {
- public int LV;
- public int[] Value;
- }
-
public struct ItemViewInfo
{
public int itemId;
public bool compare;
public bool unfoldGetWay;
public bool isAuctionEquip;
- public LegendProperty legendProperty;
- public int score;
public int appointID; //瀹氬埗瑁呭
}
- // static PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
- // static EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
- // static EquipStarModel starModel { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } }
- // static EquipGemModel gemModel { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
- // static EquipTrainModel trainModel { get { return ModelCenter.Instance.GetModel<EquipTrainModel>(); } }
- // static EquipStrengthModel strengthenModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } }
- // static MountModel mountModel { get { return ModelCenter.Instance.GetModel<MountModel>(); } }
- // static PetModel petModel { get { return ModelCenter.Instance.GetModel<PetModel>(); } }
- // static ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }
- // static StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
- // static VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } }
- // static ItemOverdueModel itemOverdueModel { get { return ModelCenter.Instance.GetModel<ItemOverdueModel>(); } }
- // static BoxGetItemModel boxGetItemModel { get { return ModelCenter.Instance.GetModel<BoxGetItemModel>(); } }
+
public static TipData mainTipData { get; private set; } // 娉ㄦ剰褰撻�掕繘鐐瑰嚮鎵撳紑澶氫釜tip鐣岄潰浼氬彉鏇存暟鎹紝涓嶈兘渚濊禆姝ゅ��
public static TipData secondaryData { get; private set; }
@@ -395,304 +268,6 @@
}
- // public static void ShowCustomEquip(CustomEquipInfo info)
- // {
- // secondaryData = null;
- // mainTipData = CreateCustomEquipData(info);
- // WindowCenter.Instance.Open<EquipTipWin>();
- // }
-
-
-
- // static TipData CreateNormalEquipData(string guid)
- // {
- // var item = PackManager.Instance.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(TipData);
- // }
-
- // return new TipData()
- // {
- // itemId = item.itemId,
- // guid = guid,
-
- // baseInfo = GetBaseInfo(guid),
- // baseProperty = GetBaseProperty(guid),
- // spiritWeaponProperty = GetSpiritWeaponProperty(item.itemId),
- // legendProperty = GetLegendProperty(guid),
- // skillInfo = GetSkillInfo(item.itemId, guid),
- // suitInfo = GetSuitInfo(guid),
- // starInfo = GetStarInfo(guid),
- // strengthenProperty = GetStrengthenProperty(guid),
- // gemInfo = GetGemInfo(guid),
- // trainProperty = GetTrainProperty(guid),
- // operates = operatable ? GetOperates(guid) : null,
- // shenProperty = GetShenProperty(item.itemId)
- // };
- // }
-
- // static TipData CreateNormalEquipData(int itemId)
- // {
- // return new TipData()
- // {
- // itemId = itemId,
- // guid = string.Empty,
-
- // baseInfo = GetBaseInfo(itemId),
- // baseProperty = GetBaseProperty(itemId),
- // legendProperty = GetLegendProperty(itemId),
- // spiritWeaponProperty = GetSpiritWeaponProperty(itemId),
- // skillInfo = GetSkillInfo(itemId),
- // suitInfo = GetSuitInfo(itemId),
- // gemInfo = GetGemInfo(itemId),
- // starInfo = GetStarInfo(itemId),
- // getWay = GetGetWay(itemId),
- // shenProperty = GetShenProperty(itemId)
- // };
- // }
-
- // static TipData CreateDogzEquipData(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(TipData);
- // }
-
- // return new TipData()
- // {
- // itemId = item.itemId,
- // guid = guid,
-
- // baseInfo = GetBaseInfo(guid),
- // baseProperty = GetBaseProperty(guid),
- // legendProperty = GetLegendProperty(guid),
- // operates = GetOperates(guid),
- // };
- // }
-
- // static TipData CreateDogzEquipData(int itemId)
- // {
- // return new TipData()
- // {
- // itemId = itemId,
- // guid = string.Empty,
-
- // baseInfo = GetBaseInfo(itemId),
- // baseProperty = GetBaseProperty(itemId),
- // legendProperty = GetLegendProperty(itemId),
- // getWay = GetGetWay(itemId)
- // };
- // }
-
- // static TipData CreateCustomEquipData(CustomEquipInfo info)
- // {
- // var config = ItemConfig.Get(info.itemId);
- // if (config == null)
- // {
- // return default(TipData);
- // }
-
- // var baseInfo = new BaseInfo()
- // {
- // itemId = info.itemId,
- // star = info.starLevel,
- // strengthenLevel = info.strengthenLevel,
- // score = info.score,
- // isEquiped = info.isEquiped,
- // evolveLevel = info.evolveLevel,
- // };
-
- // var baseProperty = GetBaseProperty(info.itemId);
- // if (info.starLevel > 0)
- // {
- // var starProperties = new List<Int2>();
- // baseProperty.star = info.starLevel;
- // var starConfig = EquipStarConfig.Get(config.LV, config.EquipPlace, info.starLevel);
- // starProperties.AddRange(starConfig.BaseAttrInfo);
- // baseProperty.starProperties = starProperties;
- // }
-
- // var legendProperty = new LegendProperty()
- // {
- // properties = info.legendProperties,
- // };
-
- // var skillInfo = GetSkillInfo(info.itemId, info);
- // var suitInfo = default(SuitInfo);
- // if (ItemLogicUtility.Instance.IsSuitEquip(info.itemId))
- // {
- // var job = config.JobLimit;
- // var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit);
- // var name = twoConfigs[0].name;
- // var level = config.LV;
- // var maxSuitLevel = EquipStarModel.GetMaxStarLevel(level);
-
- // var twoSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
- // var fiveSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
- // var eightSuits = new Dictionary<int, bool>();
- // var eightSuitLevel = info.suitLevels[EquipSuitType.EightSuit];
-
- // for (var i = 0; i <= 9; i++, i++, i++)
- // {
- // var configs = EquipSuitConfig.GetConfigs(job, level, EquipSuitType.TwoSuit);
- // var actived = info.suitLevels[EquipSuitType.TwoSuit] >= i;
- // var properties = new List<Int2>();
- // foreach (var item in configs)
- // {
- // if (item.star == i)
- // {
- // properties.AddRange(item.attr);
- // break;
- // }
- // }
-
- // twoSuitProperties[i] = new EquipSuitPropertyEntry()
- // {
- // type = EquipSuitType.TwoSuit,
- // actived = actived,
- // properties = properties,
- // };
-
- // configs = EquipSuitConfig.GetConfigs(job, level, EquipSuitType.FiveSuit);
- // actived = info.suitLevels[EquipSuitType.FiveSuit] >= i;
- // properties = new List<Int2>();
- // foreach (var item in configs)
- // {
- // if (item.star == i)
- // {
- // properties.AddRange(item.attr);
- // break;
- // }
- // }
-
- // fiveSuitProperties[i] = new EquipSuitPropertyEntry()
- // {
- // type = EquipSuitType.TwoSuit,
- // actived = actived,
- // properties = properties,
- // };
-
- // eightSuits[i] = eightSuitLevel >= i;
- // }
-
- // suitInfo = new SuitInfo()
- // {
- // name = name,
- // level = level,
- // job = job,
- // maxSuitLevel = maxSuitLevel,
- // places = info.suitPlaces,
- // placeStars = info.placeStars,
- // twoSuitProperties = twoSuitProperties,
- // fiveSuitProperties = fiveSuitProperties,
- // eightSuits = eightSuits
- // };
- // }
-
- // var starInfo = new StarInfo()
- // {
- // equipPosition = new Int2(config.LV, config.EquipPlace),
- // starLevel = info.starLevel,
- // maxLevel = config.LV == 0 ? 0 : EquipStarModel.GetMaxStarLevel(config.ItemColor, config.LV),
- // };
-
- // var type = EquipStrengthModel.GetEquipStrengthType(config.EquipPlace);
- // var strengthenConfig = ItemPlusConfig.GetTypeAndLevel(type, info.strengthenLevel);
- // var strengthenProperties = new List<Int2>();
- // for (int i = 0; i < strengthenConfig.attType.Length; i++)
- // {
- // strengthenProperties.Add(new Int2(strengthenConfig.attType[i], strengthenConfig.attValue[i]));
- // }
- // var strengthenProperty = new StrengthenProperty()
- // {
- // strengthenLevel = info.strengthenLevel,
- // properties = strengthenProperties,
- // equipPlace = config.EquipPlace,
- // evolveLevel = info.evolveLevel,
- // };
-
- // var gemInfo = new GemInfo()
- // {
- // activeStates = info.gemHoleActiveStates,
- // gems = info.gems,
- // };
-
- // var trainProperty = new TrainProperty()
- // {
- // properties = info.trainProperties,
- // };
-
- // return new TipData()
- // {
- // itemId = info.itemId,
- // baseInfo = baseInfo,
- // baseProperty = baseProperty,
- // legendProperty = legendProperty,
- // skillInfo = skillInfo,
- // suitInfo = suitInfo,
- // starInfo = starInfo,
- // strengthenProperty = strengthenProperty,
- // gemInfo = gemInfo,
- // trainProperty = trainProperty,
- // shenProperty = GetShenProperty(info.itemId)
- // };
- // }
-
- static TipData CreateGoodEquipData(int itemId, int goodId)
- {
- return new TipData()
- {
- itemId = itemId,
- guid = string.Empty,
- goodId = goodId,
-
- baseInfo = GetBaseInfo(itemId),
- baseProperty = GetBaseProperty(itemId),
- //spiritWeaponProperty = GetSpiritWeaponProperty(itemId),
- //legendProperty = GetLegendProperty(itemId),
- skillInfo = GetSkillInfo(itemId),
- //suitInfo = GetSuitInfo(itemId),
- //gemInfo = GetGemInfo(itemId),
- //starInfo = GetStarInfo(itemId),
- // operates = GetGoodOperates(goodId),
- //shenProperty = GetShenProperty(itemId)
- };
- }
-
- // static TipData CreateEquipAuctionData(string guid, bool operatable)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(TipData);
- // }
-
- // var legendProperty = GetLegendProperty(guid);
- // if (legendProperty.properties.IsNullOrEmpty())
- // {
- // legendProperty = GetLegendProperty(item.itemId);
- // }
-
- // return new TipData()
- // {
- // itemId = item.itemId,
- // guid = guid,
-
- // baseInfo = GetBaseInfo(guid),
- // baseProperty = GetBaseProperty(item.itemId),
- // spiritWeaponProperty = GetSpiritWeaponProperty(item.itemId),
- // legendProperty = legendProperty,
- // skillInfo = GetSkillInfo(item.itemId, guid),
- // suitInfo = GetSuitInfo(item.itemId),
- // operates = operatable ? GetOperates(guid) : null,
-
- // starInfo = GetStarInfo(guid),
- // gemInfo = GetGemInfo(guid),
- // shenProperty = GetShenProperty(item.itemId)
- // };
- // }
static TipData CreateItemData(string guid)
{
@@ -709,12 +284,6 @@
baseInfo = GetBaseInfo(guid),
baseProperty = GetBaseProperty(item.itemId),
- // spiritWeaponProperty = GetSpiritWeaponProperty(item.itemId),
- // legendProperty = GetLegendProperty(guid),
- // petMountBaseProperty = GetPetMountBaseProperty(item.itemId),
- // operates = operatable ? GetOperates(guid) : null,
- // refineMaterials = GetWingRefineMaterials(guid),
- // shenProperty = GetShenProperty(item.itemId)
};
}
@@ -724,113 +293,10 @@
{
itemId = itemId,
baseInfo = GetBaseInfo(itemId),
- // baseProperty = GetBaseProperty(itemId),
exchangeItemId = itemId,
- // spiritWeaponProperty = GetSpiritWeaponProperty(itemId),
- // legendProperty = GetLegendProperty(itemId),
- // petMountBaseProperty = GetPetMountBaseProperty(itemId),
- // getWay = GetGetWay(itemId),
- // shenProperty = GetShenProperty(itemId)
+
};
}
-
- static TipData CreateGoodItemData(int itemId, int goodId)
- {
- return new TipData()
- {
- itemId = itemId,
- goodId = goodId,
- baseInfo = GetBaseInfo(itemId),
- baseProperty = GetBaseProperty(itemId),
- // legendProperty = GetLegendProperty(itemId),
- // spiritWeaponProperty = GetSpiritWeaponProperty(itemId),
- // petMountBaseProperty = GetPetMountBaseProperty(itemId),
- // operates = GetGoodOperates(goodId),
- // shenProperty = GetShenProperty(itemId)
- };
- }
-
-
-
- // public static void Operate(ItemOperateType type, string guid)
- // {
- // switch (type)
- // {
- // case ItemOperateType.putOn:
- // ItemOperateUtility.Instance.PutOnItem(guid);
- // break;
- // case ItemOperateType.gotoPuton:
- // ItemOperateUtility.Instance.PutOnItem(guid);
- // break;
- // case ItemOperateType.putOff:
- // ItemOperateUtility.Instance.PutOffEquip(guid);
- // break;
- // case ItemOperateType.putAway:
- // ItemOperateUtility.Instance.PutAway(guid);
- // break;
- // case ItemOperateType.putIn:
- // ItemOperateUtility.Instance.PutInWareHouse(guid);
- // break;
- // case ItemOperateType.putOut:
- // ItemOperateUtility.Instance.TakeOutFromWarehouse(guid);
- // break;
- // case ItemOperateType.sell:
- // ItemOperateUtility.Instance.SellItem(guid);
- // break;
- // case ItemOperateType.strength:
- // ItemOperateUtility.Instance.GotoStrengthen(guid);
- // break;
- // case ItemOperateType.star:
- // ItemOperateUtility.Instance.GotoStarUpgrade(guid);
- // break;
- // case ItemOperateType.inlay:
- // ItemOperateUtility.Instance.GotoInlayItem(guid);
- // break;
- // case ItemOperateType.train:
- // ItemOperateUtility.Instance.GotoTrain(guid);
- // break;
- // case ItemOperateType.makeUse:
- // ItemOperateUtility.Instance.GotoUseItem(guid);
- // break;
- // case ItemOperateType.split:
- // ItemOperateUtility.Instance.OnClickSplitBtn(guid);
- // break;
- // case ItemOperateType.compose:
- // var wannaComposeItem = packModel.GetItemByGuid(guid);
- // var jumpId = 0;
- // var isUnlock = composeModel.CheckComposeItemById(wannaComposeItem.itemId, out jumpId);
- // if (isUnlock)
- // {
- // ItemOperateUtility.Instance.GotoComposeItem(jumpId);
- // }
- // break;
- // case ItemOperateType.renewal:
- // ItemOperateUtility.Instance.RenewalItem(guid);
- // break;
- // case ItemOperateType.exchange:
- // WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ExchangeActiveToken);
- // break;
- // case ItemOperateType.lsExchange:
- // WindowCenter.Instance.Open<LingShiChange>();
- // break;
- // case ItemOperateType.default1:
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // break;
- // }
-
- // EquipEvolveModel.Instance.EquipJump(item.config.LV, item.config.EquipPlace);
- // WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)2013);
- // break;
- // }
- // }
-
- // public static void GoodOperate(ItemOperateType type, int goodId, int count)
- // {
- // var config = StoreConfig.Get(goodId);
- // storeModel.SendBuyShopItem(config, count);
- // }
private static BaseInfo GetBaseInfo(int itemId)
@@ -849,7 +315,6 @@
isAuction = false,
isEquiped = false,
isPreview = true,
- //score = ItemLogicUtility.Instance.GetEquipScore(itemId, null, true),
auctionSurplusTime = 0,
levelLimit = config.UseLV,
moneyLimit = money,
@@ -861,23 +326,8 @@
private static BaseInfo GetBaseInfo(string guid)
{
var item = PackManager.Instance.GetItemByGuid(guid);
-
- var level = item.config.LV;
- var place = item.config.EquipPlace;
-
var isEquiped = false;// equipModel.GetEquip(new Int2(level, place)) == guid;
-
- // var type = EquipStrengthModel.GetEquipStrengthType(place);
- var star = 0; //starModel.GetEquipStarLevel(new Int2(level, place));
- var maxStrengthenLevel = 0; //strengthenModel.GetEquipLevelMax(type, level);
- var placeStrengthenLevel = 0; //strengthenModel.GetStrengthLevel(level, place);
-
var money = 0;
- // if (item.config.Type == 81)
- // {
- // var chestConfig = ChestsConfig.Get(item.itemId);
- // money = chestConfig.OpenMoney;
- // }
var baseInfo = new BaseInfo()
{
@@ -890,8 +340,6 @@
auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
overdueSurplusTime = item.overdueSurplusTime,
levelLimit = item.isAuction ? 0 : item.config.UseLV,
- star = isEquiped ? star : -1,
- strengthenLevel = isEquiped ? Mathf.Min(placeStrengthenLevel, maxStrengthenLevel) : 0,
moneyLimit = money,
};
@@ -908,13 +356,6 @@
return GetBaseProperty(config.EffectValueA1);
}
- if (!ItemLogicUtility.Instance.IsDogzEquip(itemId))
- {
- if (config.Effect1 != 0)
- {
- baseProperties.Add(new Int2(config.Effect1, config.EffectValueA1));
- }
- }
if (config.Effect2 != 0)
{
@@ -955,651 +396,11 @@
if (equiped)
{
var starProperties = new List<Int2>();
- // var currentStar = starModel.GetEquipStarLevel(equipPosition);
- // var maxStar = EquipStarModel.GetMaxStarLevel(item.config.ItemColor, item.config.LV);
- // var star = Mathf.Min(currentStar, maxStar);
- // if (star > 0)
- // {
- // baseProperty.star = star;
- // var starConfig = EquipStarConfig.Get(item.config.LV, item.config.EquipPlace, star);
- // starProperties.AddRange(starConfig.BaseAttrInfo);
- // }
-
baseProperty.starProperties = starProperties;
}
return baseProperty;
}
-
- // private static BaseProperty GetPetMountBaseProperty(int itemId)
- // {
- // var config = ItemConfig.Get(itemId);
- // var baseProperty = new BaseProperty();
- // Dictionary<int, int> properties = null;
- // switch (config.Type)
- // {
- // case 26:
- // var petId = PetInfoConfig.GetItemUnLockPet(itemId);
- // properties = petModel.GetPetAttrAddDict(petId);
- // break;
- // case 41:
- // case 42:
- // var horseId = HorseConfig.GetItemUnLockHorse(itemId);
- // properties = mountModel.GetMountAttrAddDict(horseId);
- // break;
- // default:
- // break;
- // }
-
- // if (properties != null)
- // {
- // baseProperty.baseProperties = new List<Int2>();
- // foreach (var property in properties)
- // {
- // baseProperty.baseProperties.Add(new Int2(property.Key, property.Value));
- // }
- // }
-
- // return baseProperty;
- // }
-
- // //绁炶灞炴��
- // private static ShenProperty GetShenProperty(int itemId)
- // {
- // var data = new ShenProperty();
- // data.isPreview = true;
- // data.itemId = itemId;
-
- // var config = ItemConfig.Get(itemId);
-
- // data.properties = ShenPropertyUtility.GetEquipShenProperties(itemId);
-
-
- // return data;
- // }
-
-
- // private static LegendProperty GetLegendProperty(int itemId)
- // {
- // var data = new LegendProperty();
- // data.isPreview = true;
- // data.itemId = itemId;
-
- // var config = ItemConfig.Get(itemId);
- // if (config.Effect1 == 220)
- // {
- // data.isPreview = false;
- // var appConfig = AppointItemConfig.Get(itemId);
- // data.trueCount = 0;
-
- // data.properties = new List<Int2>();
- // for (var i = 0; i < appConfig.LegendAttrID.Length; i++)
- // {
- // data.properties.Add(new Int2(appConfig.LegendAttrID[i], appConfig.LegendAttrValue[i]));
- // }
- // }
- // else
- // {
- // data.properties = LegendPropertyUtility.GetLegendProFromEquipShen(itemId);
- // if (data.properties != null)
- // {
- // data.trueCount = 0;
- // data.isPreview = false;
- // }
- // else
- // {
- // data.trueCount = LegendPropertyUtility.GetEquipPropertyCount(itemId);
- // data.properties = LegendPropertyUtility.GetEquipProperties(itemId);
- // }
- // }
-
- // return data;
- // }
-
- // private static SpiritWeaponProperty GetSpiritWeaponProperty(int itemId)
- // {
- // var config = SpiritWeaponConfig.Get(itemId);
- // if (config == null)
- // {
- // return default(SpiritWeaponProperty);
- // }
-
- // var properties = new List<Int3>();
- // for (var i = 0; i < config.AttrIDList.Length; i++)
- // {
- // properties.Add(new Int3(config.AttrIDList[i], config.AttrValueList[i], config.AttrColorList[i]));
- // }
-
- // var spiritWeaponProperty = new SpiritWeaponProperty();
- // spiritWeaponProperty.itemId = itemId;
- // spiritWeaponProperty.properties = properties;
- // return spiritWeaponProperty;
- // }
-
- // private static LegendProperty GetLegendProperty(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(LegendProperty);
- // }
-
- // var data = new LegendProperty();
- // data.isPreview = false;
- // data.itemId = item.itemId;
-
- // var ids = item.GetUseData((int)ItemUseDataKey.legendAttrID);
- // var values = item.GetUseData((int)ItemUseDataKey.legendAttrValue);
- // if (!ids.IsNullOrEmpty() && !values.IsNullOrEmpty())
- // {
- // var properties = new List<Int2>();
- // var count = Mathf.Min(ids.Count, values.Count);
- // for (int i = 0; i < count; i++)
- // {
- // properties.Add(new Int2(ids[i], values[i]));
- // }
-
- // data.properties = properties;
- // }
-
- // return data;
- // }
-
- public static LegendProperty GetLegendProperty(int itemId, Dictionary<int, List<int>> userData)
- {
- var data = new LegendProperty();
- data.isPreview = false;
- data.itemId = itemId;
-
- List<int> ids = null;
- List<int> values = null;
- if (userData != null)
- {
- userData.TryGetValue((int)ItemUseDataKey.legendAttrID, out ids);
- userData.TryGetValue((int)ItemUseDataKey.legendAttrValue, out values);
- }
- if (!ids.IsNullOrEmpty() && !values.IsNullOrEmpty())
- {
- var properties = new List<Int2>();
- var count = Mathf.Min(ids.Count, values.Count);
- for (int i = 0; i < count; i++)
- {
- properties.Add(new Int2(ids[i], values[i]));
- }
-
- data.properties = properties;
- }
-
- return data;
- }
-
- // public static SuitInfo GetSuitInfo(int itemId)
- // {
- // var config = ItemConfig.Get(itemId);
- // if (config == null || config.SuiteiD <= 0)
- // {
- // return default(SuitInfo);
- // }
-
- // var job = config.JobLimit;
- // var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit);
-
- // var name = twoConfigs[0].name;
- // var level = config.LV;
- // var places = new List<int>();
- // places.Add(config.EquipPlace);
- // //var suitInfo = new SuitInfo()
- // //{
- // // name = name,
- // // level = level,
- // // job = job,
- // // places = places,
- // //};
- // var maxSuitLevel = EquipStarModel.GetMaxStarLevel(level);
-
- // var placeStars = new Dictionary<int, int>();
- // for (int i = 1; i <= 8; i++)
- // {
- // var equip = packModel.GetItemByGuid(equipModel.GetEquip(new Int2(level, i)));
- // var hasSuit = equip != null && equip.config.SuiteiD > 0;
- // if (hasSuit)
- // {
- // placeStars[i] = starModel.GetEquipStarLevel(new Int2(level, i));
- // }
- // }
-
- // var twoSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
- // var fiveSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
- // var eightSuits = new Dictionary<int, bool>();
- // var eightSuitLevel = equipModel.GetSuitLevel(config.LV, EquipSuitType.EightSuit);
-
- // var twoSuitProperties0 = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.TwoSuit);
- // var fiveSuitProperties0 = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.FiveSuit);
-
-
- // twoSuitProperties[0] = twoSuitProperties0;
- // fiveSuitProperties[0] = fiveSuitProperties0;
- // eightSuits[0] = eightSuitLevel >= 0;
-
- // if (maxSuitLevel >= 3)
- // {
- // twoSuitProperties[3] = equipModel.GetEquipSuitEntry(config.LV, 3, EquipSuitType.TwoSuit);
- // fiveSuitProperties[3] = equipModel.GetEquipSuitEntry(config.LV, 3, EquipSuitType.FiveSuit);
- // eightSuits[3] = eightSuitLevel >= 3;
- // }
-
- // if (maxSuitLevel >= 6)
- // {
- // twoSuitProperties[6] = equipModel.GetEquipSuitEntry(config.LV, 6, EquipSuitType.TwoSuit);
- // fiveSuitProperties[6] = equipModel.GetEquipSuitEntry(config.LV, 6, EquipSuitType.FiveSuit);
- // eightSuits[6] = eightSuitLevel >= 3;
- // }
-
- // if (maxSuitLevel >= 9)
- // {
- // twoSuitProperties[9] = equipModel.GetEquipSuitEntry(config.LV, 9, EquipSuitType.TwoSuit);
- // fiveSuitProperties[9] = equipModel.GetEquipSuitEntry(config.LV, 9, EquipSuitType.FiveSuit);
- // eightSuits[9] = eightSuitLevel >= 9;
- // }
-
- // var suitInfo = new SuitInfo()
- // {
- // name = name,
- // level = level,
- // job = job,
- // maxSuitLevel = maxSuitLevel,
- // places = places,
- // placeStars = placeStars,
- // twoSuitProperties = twoSuitProperties,
- // fiveSuitProperties = fiveSuitProperties,
- // eightSuits = eightSuits
- // };
- // return suitInfo;
- // }
-
- // private static SuitInfo GetSuitInfo(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(SuitInfo);
- // }
-
- // var config = ItemConfig.Get(item.itemId);
- // if (config == null || config.SuiteiD <= 0)
- // {
- // return default(SuitInfo);
- // }
-
- // var equipPosition = new Int2(item.config.LV, item.config.EquipPlace);
- // var equiped = equipModel.GetEquip(equipPosition) == guid;
-
- // var job = config.JobLimit;
- // var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit);
- // var name = twoConfigs[0].name;
-
- // var level = config.LV;
- // var maxSuitLevel = equiped ? EquipStarModel.GetMaxStarLevel(level) : -1;
-
- // var places = new List<int>();
- // var placeStars = new Dictionary<int, int>();
- // if (equiped)
- // {
- // for (int i = 1; i <= 8; i++)
- // {
- // var equip = packModel.GetItemByGuid(equipModel.GetEquip(new Int2(level, i)));
- // var hasSuit = equip != null && equip.config.SuiteiD > 0;
- // if (hasSuit)
- // {
- // places.Add(i);
- // placeStars[i] = starModel.GetEquipStarLevel(new Int2(level, i));
- // }
- // }
- // }
-
- // var twoSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
- // var fiveSuitProperties = new Dictionary<int, EquipSuitPropertyEntry>();
- // var eightSuits = new Dictionary<int, bool>();
- // var eightSuitLevel = equiped ? equipModel.GetSuitLevel(config.LV, EquipSuitType.EightSuit) : -1;
-
- // if (!equiped)
- // {
- // var suit2 = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.TwoSuit);
- // suit2.actived = false;
- // var suit5 = equipModel.GetEquipSuitEntry(config.LV, 0, EquipSuitType.FiveSuit);
- // suit5.actived = false;
- // twoSuitProperties[0] = suit2;
- // fiveSuitProperties[0] = suit5;
- // eightSuits[0] = eightSuitLevel >= 0;
- // }
- // else
- // {
- // foreach (var star in EquipStarModel.StarList)
- // {
- // if (maxSuitLevel >= star)
- // {
- // twoSuitProperties[star] = equipModel.GetEquipSuitEntry(config.LV, star, EquipSuitType.TwoSuit);
- // fiveSuitProperties[star] = equipModel.GetEquipSuitEntry(config.LV, star, EquipSuitType.FiveSuit);
- // eightSuits[star] = eightSuitLevel >= star;
- // }
- // }
- // }
-
-
-
-
- // var suitInfo = new SuitInfo()
- // {
- // name = name,
- // level = level,
- // job = job,
- // maxSuitLevel = maxSuitLevel,
- // places = places,
- // placeStars = placeStars,
- // twoSuitProperties = twoSuitProperties,
- // fiveSuitProperties = fiveSuitProperties,
- // eightSuits = eightSuits
- // };
-
- // return suitInfo;
- // }
-
- // private static StarInfo GetStarInfo(int itemId)
- // {
- // var config = ItemConfig.Get(itemId);
- // if (!EquipModel.IsRealmEquip(config.EquipPlace))
- // {
- // return default(StarInfo);
- // }
-
- // var starInfo = new StarInfo();
- // starInfo.equipPosition = new Int2(config.LV, config.EquipPlace);
- // starInfo.maxLevel = EquipStarModel.GetMaxStarLevel(config.ItemColor, config.LV);
- // starInfo.starLevel = 0;
-
- // return starInfo;
- // }
-
- // private static StarInfo GetStarInfo(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(StarInfo);
- // }
-
- // if (!EquipModel.IsRealmEquip(item.config.EquipPlace))
- // {
- // return default(StarInfo);
- // }
-
- // var starInfo = new StarInfo();
- // var equipPosition = new Int2(item.config.LV, item.config.EquipPlace);
- // var equiped = equipModel.GetEquip(equipPosition) == guid;
- // starInfo.equipPosition = equipPosition;
- // starInfo.maxLevel = EquipStarModel.GetMaxStarLevel(item.config.ItemColor, item.config.LV);
- // starInfo.starLevel = equiped ? starModel.GetStarLevel(equipPosition) : 0;
-
- // return starInfo;
- // }
-
- // private static StrengthenProperty GetStrengthenProperty(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(StrengthenProperty);
- // }
-
- // var level = item.config.LV;
- // var place = item.config.EquipPlace;
- // var equiped = equipModel.GetEquip(new Int2(level, place)) == guid;
- // if (!equiped)
- // {
- // return default(StrengthenProperty);
- // }
-
- // var data = new StrengthenProperty();
-
- // var strengthenLevel = strengthenModel.GetStrengthLevel(level, place);
-
- // var type = EquipStrengthModel.GetEquipStrengthType(place);
- // var maxStrengthenLevel = strengthenModel.GetEquipLevelMax(type, level);
-
- // data.strengthenLevel = Mathf.Min(strengthenLevel, maxStrengthenLevel);
- // data.evolveLevel = strengthenModel.GetStrengthEvolveLevel(level, place);
- // data.equipPlace = place;
-
- // data.properties = new List<Int2>();
- // var config = ItemPlusConfig.GetTypeAndLevel(type, data.strengthenLevel);
- // for (int i = 0; i < config.attType.Length; i++)
- // {
- // data.properties.Add(new Int2(config.attType[i], config.attValue[i]));
- // }
-
- // return data;
- // }
-
- // private static GemInfo GetGemInfo(int itemId)
- // {
- // var config = ItemConfig.Get(itemId);
- // var level = config.LV;
- // var place = config.EquipPlace;
-
- // var gemInfo = new GemInfo();
- // var maxStar = EquipStarModel.GetMaxStarLevel(config.ItemColor, config.LV);
- // gemInfo.activeStates = new Dictionary<int, bool>();
- // for (int i = 0; i < 4; i++)
- // {
- // gemInfo.activeStates[i] = IsEquipGemHoleOpen(new Int2(level, place), maxStar, i);
- // }
-
- // return gemInfo;
- // }
-
- // private static GemInfo GetGemInfo(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(GemInfo);
- // }
-
- // var level = item.config.LV;
- // var place = item.config.EquipPlace;
-
- // var gemInfo = new GemInfo();
- // var maxStar = EquipStarModel.GetMaxStarLevel(item.config.ItemColor, item.config.LV);
- // gemInfo.activeStates = new Dictionary<int, bool>();
- // for (int i = 0; i < 4; i++)
- // {
- // gemInfo.activeStates[i] = IsEquipGemHoleOpen(new Int2(level, place), maxStar, i);
- // }
-
- // gemInfo.gems = new Dictionary<int, int>();
- // if (item.packType == PackType.Equip)
- // {
- // int[] gems;
- // if (gemModel.TryGetEquipGems(item.config.LV, item.config.EquipPlace, out gems))
- // {
- // for (int i = 0; i < gems.Length; i++)
- // {
- // gemInfo.gems[i] = gems[i];
- // }
- // }
- // }
-
- // return gemInfo;
- // }
-
- // private static TrainProperty GetTrainProperty(string guid)
- // {
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return default(TrainProperty);
- // }
-
- // var equipPosition = new Int2(item.config.LV, item.config.EquipPlace);
- // var equiped = equipModel.GetEquip(equipPosition) == guid;
- // if (!equiped)
- // {
- // return default(TrainProperty);
- // }
-
- // var trainProperty = new TrainProperty();
- // var star = Mathf.Min(EquipStarModel.GetMaxStarLevel(item.config.ItemColor, item.config.LV), starModel.GetEquipStarLevel(equipPosition));
- // var type = EquipTrainModel.GetTrainType(equipPosition.y);
- // var maxConfig = WashLevelMaxConfig.Get(type, star);
- // var maxLevel = maxConfig == null ? 1 : maxConfig.levelMax;
- // var trainLevel = Mathf.Min(maxLevel, trainModel.GetTrainLevel(equipPosition));
- // trainProperty.level = trainLevel;
-
- // var trainConfig = EquipWashConfig.Get(type, trainLevel);
- // trainProperty.properties = new List<Int2>();
-
- // if (trainConfig == null)
- // {
- // var trainConfigLevel1 = EquipWashConfig.Get(type, 1);
- // trainProperty.properties.Add(new Int2(trainConfigLevel1.config.attType1, 0));
- // trainProperty.properties.Add(new Int2(trainConfigLevel1.config.attType2, 0));
- // //trainProperty.properties.Add(new Int2(trainConfigLevel1.config.attType3, 0));
- // }
- // else
- // {
- // var trainedProperties = trainModel.GetTrainedProperties(equipPosition);
- // trainProperty.properties.Add(new Int2(trainConfig.config.attType1, Mathf.Min(trainedProperties.x, trainConfig.config.attMax1)));
- // trainProperty.properties.Add(new Int2(trainConfig.config.attType2, Mathf.Min(trainedProperties.y, trainConfig.config.attMax2)));
- // //trainProperty.properties.Add(new Int2(trainConfig.config.attType3, Mathf.Min(trainedProperties.z, trainConfig.config.attMax3)));
- // }
-
- // return trainProperty;
- // }
-
- private static SkillInfo GetSkillInfo(int itemId)
- {
- var config = ItemConfig.Get(itemId);
- if (config == null)
- {
- return default(SkillInfo);
- }
-
- var skillInfo = new SkillInfo();
- skillInfo.skills = new List<int>();
-
- if (config.AddSkill1 != 0)
- {
- skillInfo.skills.Add(config.AddSkill1);
- }
-
- if (config.AddSkill2 != 0)
- {
- skillInfo.skills.Add(config.AddSkill2);
- }
-
- return skillInfo;
- }
-
-
- private static SkillInfo GetSkillInfo(int itemId, CustomEquipInfo info)
- {
- var skillInfo = new SkillInfo();
- skillInfo.skills = new List<int>();
- if (!info.equipSkillList.IsNullOrEmpty())
- {
- skillInfo.skills = info.equipSkillList;
- }
- else
- {
- return GetSkillInfo(itemId);
- }
- return skillInfo;
- }
-
- // private static SkillInfo GetSkillInfo(int itemId, string guid)
- // {
-
- // var skillInfo = new SkillInfo();
- // skillInfo.skills = new List<int>();
-
- // var item = packModel.GetItemByGuid(guid);
- // if (item == null)
- // {
- // return GetSkillInfo(itemId);
- // }
-
- // var values = item.GetUseData((int)ItemUseDataKey.equipSkills);
- // if (!values.IsNullOrEmpty())
- // {
- // skillInfo.skills = values;
- // }
- // else
- // {
- // return GetSkillInfo(itemId);
- // }
-
- // return skillInfo;
- // }
-
-
-
- // private static GetWay GetGetWay(int itemId)
- // {
- // var config = ItemConfig.Get(itemId);
- // if (config == null)
- // {
- // return default(GetWay);
- // }
-
- // var getWay = new GetWay();
- // getWay.itemId = itemId;
- // getWay.ways = new List<int>();
- // foreach (var way in config.GetWay)
- // {
- // var wayConfig = GetItemWaysConfig.Get(way);
- // if (wayConfig.FuncOpenId == 0 || FuncOpen.Instance.IsFuncOpen(wayConfig.FuncOpenId))
- // {
- // int activityType = 0; // 娲诲姩妯℃澘 鍙傝�僌penServerActivityCenter.ActivityType
- // if (wayConfig.customize == 2)
- // {
- // activityType = (int)OpenServerActivityCenter.ActivityType.AT_JRZF;
- // }
- // else if (wayConfig.customize == 3)
- // {
- // activityType = (int)OpenServerActivityCenter.ActivityType.AT_HFHD;
- // }
- // if (wayConfig.ActiveType == -1 || OpenServerActivityCenter.Instance.IsActivityOpen(wayConfig.ActiveType, activityType))
- // {
- // getWay.ways.Add(way);
- // }
- // }
- // }
-
- // return getWay;
- // }
-
-
-
- // private static bool IsEquipGemHoleOpen(Int2 equipPosition, int maxStar, int hole)
- // {
- // GemHoleCondition condition;
- // if (gemModel.TryGetGemHoleCondition(hole, out condition))
- // {
- // var star = starModel.GetStarLevel(equipPosition);
- // if (Mathf.Min(star, maxStar) < condition.equipStar)
- // {
- // return false;
- // }
-
- // var vipLevel = PlayerDatas.Instance.baseData.VIPLv;
- // if (vipLevel < condition.vipLevel)
- // {
- // return false;
- // }
- // }
-
- // return true;
- // }
private static TipType GetTipType(int itemId)
{
@@ -1630,8 +431,6 @@
case 111:
case 112:
return TipType.Equip;
- // case 42:
- // return TipType.PetMount;
case 147:
return TipType.TreasurePavilion;
case 150:
diff --git a/Main/System/KnapSack/Logic/ItemLogicUtility.cs b/Main/System/KnapSack/Logic/ItemLogicUtility.cs
index 3a85a90..dbc172c 100644
--- a/Main/System/KnapSack/Logic/ItemLogicUtility.cs
+++ b/Main/System/KnapSack/Logic/ItemLogicUtility.cs
@@ -7,260 +7,8 @@
public class ItemLogicUtility : Singleton<ItemLogicUtility>
{
- // private string normalGSFormula;
-
-
- // private List<int> equipBaseProperties = new List<int>();
- // Dictionary<int, int> equipSkillScores = new Dictionary<int, int>();
PackManager packModel { get { return PackManager.Instance; } }
- // BuffModel buffDatas { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
- // MountModel mountDatas { get { return ModelCenter.Instance.GetModel<MountModel>(); } }
- // PetModel petDatas { get { return ModelCenter.Instance.GetModel<PetModel>(); } }
- // StrengthenModel strengthDatas { get { return ModelCenter.Instance.GetModel<StrengthenModel>(); } }
- // MagicianModel magicianModel { get { return ModelCenter.Instance.GetModel<MagicianModel>(); } }
- // ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }
- // EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
- // AlchemyModel alchemyModel { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
-
- public void Init()
- {
- // var GSFormulaConfig = FuncConfigConfig.Get("EquipGSFormula");
- // normalGSFormula = GSFormulaConfig.Numerical1;
-
- // var equipSkillScoreJson = JsonMapper.ToObject(GSFormulaConfig.Numerical4);
- // foreach (var key in equipSkillScoreJson.Keys)
- // {
- // var skillId = 0;
- // int.TryParse(key, out skillId);
- // if (skillId != 0)
- // {
- // equipSkillScores[skillId] = (int)equipSkillScoreJson[key];
- // }
- // }
-
- // var baseAttr = JsonMapper.ToObject(GSFormulaConfig.Numerical2);
- // if (baseAttr.IsArray)
- // {
- // for (int i = 0; i < baseAttr.Count; i++)
- // {
- // equipBaseProperties.Add(int.Parse(baseAttr[i].ToString()));
- // }
- // }
-
-
-
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize;
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
- }
-
- void OnBeforePlayerDataInitialize()
- {
- isPackResetOk = true;
- }
-
- #region 璁＄畻瑁呭璇勫垎
-
- class EquipSorceProperties
- {
- Dictionary<int, int> properties = new Dictionary<int, int>();
-
- public int this[int id] { get { return properties[id]; } set { properties[id] = value; } }
-
- public List<int> Keys { get { return new List<int>(properties.Keys); } }
-
- void Add(int id, int value)
- {
- if (properties.ContainsKey(id))
- {
- properties[id] += value;
- }
- else
- {
- properties[id] = value;
- }
- }
-
- public void AddRange(List<int> ids, List<int> values)
- {
- if (ids == null || values == null)
- {
- return;
- }
-
- var count = Mathf.Min(ids.Count, values.Count);
- for (int i = 0; i < count; i++)
- {
- Add(ids[i], values[i]);
- }
- }
-
- public void AddRange(int[] ids, int[] values)
- {
- if (ids == null || values == null)
- {
- return;
- }
-
- var length = Mathf.Min(ids.Length, values.Length);
- for (int i = 0; i < length; i++)
- {
- Add(ids[i], values[i]);
- }
- }
-
- public void AddRange(Dictionary<int, int> keyValues)
- {
- if (keyValues == null)
- {
- return;
- }
-
- foreach (var item in keyValues)
- {
- Add(item.Key, item.Value);
- }
- }
-
- public void AddBaseProperties(int itemId, List<int> reference)
- {
- var config = ItemConfig.Get(itemId);
- if (config == null)
- {
- return;
- }
- if (config.Effect1 != 0 && reference.Contains(config.Effect1))
- {
- properties.Add(config.Effect1, config.EffectValueA1);
- }
-
- if (config.Effect2 != 0 && reference.Contains(config.Effect2))
- {
- properties.Add(config.Effect2, config.EffectValueA2);
- }
-
- if (config.Effect3 != 0 && reference.Contains(config.Effect3))
- {
- properties.Add(config.Effect3, config.EffectValueA3);
- }
-
- if (config.Effect4 != 0 && reference.Contains(config.Effect4))
- {
- properties.Add(config.Effect4, config.EffectValueA4);
- }
-
- if (config.Effect5 != 0 && reference.Contains(config.Effect5))
- {
- properties.Add(config.Effect5, config.EffectValueA5);
- }
- }
-
- public void AddCustomProperties(int itemId)
- {
- if (!AppointItemConfig.HasKey(itemId))
- {
- return;
- }
-
- var config = AppointItemConfig.Get(itemId);
- AddRange(config.LegendAttrID, config.LegendAttrValue);
- }
-
- public bool ContainsKey(int id)
- {
- return properties.ContainsKey(id);
- }
-
- }
-
-
-
- // private Dictionary<int, int> GetEquipLegendProperties(int itemId)
- // {
- // var legendProperties = LegendPropertyUtility.GetLegendProFromEquipShen(itemId);
- // if (legendProperties == null)
- // legendProperties = LegendPropertyUtility.GetEquipProperties(itemId);
- // var properties = new Dictionary<int, int>();
- // if (legendProperties != null)
- // {
- // foreach (var item in legendProperties)
- // {
- // properties[item.x] = item.y;
- // }
- // }
-
- // return properties;
- // }
-
- // private Dictionary<int, int> GetEquipShenProperties(int itemId)
- // {
- // var shenProperties = ShenPropertyUtility.GetEquipShenProperties(itemId);
- // var properties = new Dictionary<int, int>();
- // if (shenProperties != null)
- // {
- // foreach (var item in shenProperties)
- // {
- // properties[item.x] = item.y;
- // }
- // }
-
- // return properties;
- // }
-
- public bool IsCustomItem(int itemId)
- {
- if (!ItemConfig.HasKey(itemId))
- {
- return false;
- }
-
- return ItemConfig.Get(itemId).Effect1 == 220;
- }
-
- /// <summary>
- /// 寰楀埌瑁呭鐨勮瘎鍒�
- /// </summary>
- /// <param name="itemId"></param>
- /// <returns></returns>
- private Dictionary<PropertyType, float> curEquipAttrDict = new Dictionary<PropertyType, float>(); //瀛樺偍褰撳墠瑁呭灞炴�у搴旂殑鏁板�� key 灞炴�� value 灞炴�у��
- private void CalculateEquipAttr(int itemId, EquipSorceProperties properties)
- {
- var config = ItemConfig.Get(itemId);
-
- var minAttack = properties.ContainsKey((int)PropertyType.MinAtk) ? properties[(int)PropertyType.MinAtk] : 0;
- var maxAttack = properties.ContainsKey((int)PropertyType.MaxAtk) ? properties[(int)PropertyType.MaxAtk] : 0;
- var attack = properties.ContainsKey((int)PropertyType.ATK) ? properties[(int)PropertyType.ATK] : 0;
-
- properties[(int)PropertyType.MinAtk] = minAttack + attack;
- properties[(int)PropertyType.MaxAtk] = maxAttack + attack;
-
- curEquipAttrDict.Clear();
-
- foreach (var key in properties.Keys)
- {
- var attrType = (PropertyType)key;
- switch (attrType)
- {
- case PropertyType.ATKSPEED:
- case PropertyType.OnlyFinalHurt:
- case PropertyType.PVPAtkBackHP:
- case PropertyType.MinAtk:
- case PropertyType.MaxAtk:
- case PropertyType.AddFinalHurt:
- case PropertyType.ReduceFinalHurt:
- curEquipAttrDict.Add(attrType, properties[key]);
- break;
- default:
- curEquipAttrDict.Add(attrType, properties[key]);
- break;
- }
- }
-
-
- }
-
- #endregion
-
@@ -298,652 +46,15 @@
- public event Action<string> GetBetterEquipEvent; //寰楀埌鏇村ソ鐨勮澶� value 鐗╁搧鐨勫疄渚婭D
-
- // public void OnGetEquip(ItemModel item)
- // {
- // if (item == null)
- // {
- // return;
- // }
-
- // if (item.packType != PackType.Item)
- // {
- // return;
- // }
-
- // if (!IsJobCompatibleItem(item.itemId))
- // {
- // return;
- // }
-
- // int equipPlace = item.config.EquipPlace;
- // if ((RoleEquipType)equipPlace == RoleEquipType.Wing)
- // {
- // var wing = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);
- // if (wing == null)
- // {
- // if (!SpiritWeaponModel.hasAutoEquipWing)
- // {
- // SpiritWeaponModel.hasAutoEquipWing = true;
- // ItemOperateUtility.Instance.PutOnItem(item.guid);
- // return;
- // }
- // }
- // }
-
- // switch ((RoleEquipType)equipPlace)
- // {
- // case RoleEquipType.Weapon:
- // case RoleEquipType.Weapon2:
- // case RoleEquipType.Hat:
- // case RoleEquipType.Clothes:
- // case RoleEquipType.Belt:
- // case RoleEquipType.Trousers:
- // case RoleEquipType.Shoes:
- // case RoleEquipType.Neck:
- // case RoleEquipType.FairyCan1:
- // case RoleEquipType.FairyCan2:
- // case RoleEquipType.Glove:
- // case RoleEquipType.Jade:
- // case RoleEquipType.Wing:
- // case RoleEquipType.Guard:
- // case RoleEquipType.PeerlessWeapon1:
- // case RoleEquipType.PeerlessWeapon2:
- // if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
- // {
- // if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(item.itemId))
- // {
- // return;
- // }
- // }
- // SetGetBetterEquipEvent(item);
- // break;
- // }
- // }
-
- private void SetGetBetterEquipEvent(ItemModel model)
- {
- // // if (model.isAuction)
- // // {
- // // return;
- // // }
-
- // var itemEffectTime = model.GetUseData((int)ItemUseDataKey.createTime);
- // if (!itemEffectTime.IsNullOrEmpty() && itemEffectTime.Count > 0)
- // {
- // if (itemEffectTime[0] != 0)
- // {
- // var cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.guid);
- // double remainTime = 0;
- // if (cool != null)
- // {
- // remainTime = cool.GetRemainTime();
- // }
-
- // if (remainTime >= 0 && remainTime < 120 && model.config.ExpireTime > 0)
- // {
- // return;
- // }
- // }
- // }
-
- // if (!equipModel.IsLevelUnLocked(model.config.LV))
- // {
- // return;
- // }
-
- // int isFightUp = IsFightUp(model.itemId, model.score);
- // if (isFightUp != 1)
- // {
- // return;
- // }
-
- // if (GetBetterEquipEvent != null)
- // {
- // GetBetterEquipEvent(model.guid);
- // }
- }
-
-
-
- Dictionary<int, ItemModel> RealmBetterDict = new Dictionary<int, ItemModel>();
- // public Dictionary<int, ItemModel> CheckBetterEquipByRealm()
- // {
- // RealmBetterDict.Clear();
- // SinglePack singlePack = packModel.GetSinglePack(PackType.Item);
- // if (singlePack == null) return RealmBetterDict;
-
- // int realmLv = PlayerDatas.Instance.baseData.realmLevel;
- // Dictionary<int, ItemModel> pairs = singlePack.GetAllItems();
- // foreach (var model in pairs.Values)
- // {
- // var equipServerIndex = EquipSet.ClientPlaceToServerPlace(new Int2(model.config.LV, model.config.EquipPlace));
- // if (model.config.EquipPlace > 0
- // && model.config.EquipPlace != (int)RoleEquipType.Guard
- // && model.config.RealmLimit <= realmLv
- // && !IsOverdue(model.guid)
- // && IsFightUp(model.itemId, model.score) == 1)
- // {
- // if (!RealmBetterDict.ContainsKey(equipServerIndex))
- // {
- // RealmBetterDict.Add(equipServerIndex, model);
- // }
- // else
- // {
- // if (model.score > RealmBetterDict[equipServerIndex].score)
- // {
- // RealmBetterDict[equipServerIndex] = model;
- // }
- // }
- // }
- // }
- // return RealmBetterDict;
- // }
-
- // List<ItemModel> RealmDruglist = new List<ItemModel>();
- // public List<ItemModel> GetDruglistByRealm()
- // {
- // RealmDruglist.Clear();
- // SinglePack singlePack = packModel.GetSinglePack(PackType.Item);
- // if (singlePack == null) return RealmDruglist;
-
- // int realmLv = PlayerDatas.Instance.baseData.realmLevel;
- // Dictionary<int, ItemModel> pairs = singlePack.GetAllItems();
- // foreach (var model in pairs.Values)
- // {
- // if (packModel.CheckIsDrugById(model.itemId))
- // {
- // AttrFruitConfig fruitConfig = AttrFruitConfig.Get(model.itemId);
- // if (!packModel.IsReachMaxUseDrug(fruitConfig)
- // && model.config.RealmLimit <= realmLv)
- // {
- // RealmDruglist.Add(model);
- // }
- // }
- // }
- // return RealmDruglist;
- // }
-
- #region 鐗╁搧澶勪簬CD涓殑閫昏緫澶勭悊
-
- private List<string> itemEffectTimelist = new List<string>(); //key 鐗╁搧瀹炰緥ID
- /// <summary>
- /// 鐗╁搧浣跨敤鏃堕棿闄愬埗
- /// </summary>
- public void SetItemEffectCDTime(string guid, int itemID, int getTime, int serverSurplusTime)
- {
- double time = GetTimeOffest(TimeUtility.GetTime((uint)getTime));
- if (time < 0)
- {
- time = 0;
- }
-
- ItemConfig itemConfig = ItemConfig.Get(itemID);
- if (time >= itemConfig.ExpireTime)
- {
- KnapsackTimeCDMgr.Instance.UnRegister(guid);
- return;
- }
- double remainTime = (serverSurplusTime > 0 ? serverSurplusTime : itemConfig.ExpireTime) - time;
- KnapsackTimeCDMgr.Instance.Register(guid, itemID, remainTime);
- }
-
- public double GetTimeOffest(DateTime getTime)
- {
- Debug.Log("鐜板湪鏃堕棿锛�" + TimeUtility.ServerNow + "鑾峰緱鏃堕棿:" + getTime);
- //TimeUtility.SyncServerTime();
- TimeSpan t = TimeUtility.ServerNow - getTime;
- Debug.Log("鏃堕棿宸細" + t.TotalSeconds);
- return t.TotalSeconds;
- }
-
- #endregion
-
- #region 璁剧疆鍙互涓�閿嚭鍞殑鐗╁搧鏁版嵁
-
- private int playerLv;
- private Dictionary<int, List<ItemModel>> _lifePotionDict = new Dictionary<int, List<ItemModel>>(); //key 鑽按绛夌骇
- private List<int> _sellItemScorelist = new List<int>();
- private Dictionary<int, Dictionary<int, List<ItemModel>>> _sameIndexEquipDict = new Dictionary<int, Dictionary<int, List<ItemModel>>>(); //瀛樺偍鐩稿悓瑁呭浣嶇殑瑁呭
- // private _sameEquipScoreDict = new Dictionary<int, List<ItemModel>>(); //瀛樺偍鐩稿悓ID涓浉鍚岃澶囪瘎鍒嗙殑瑁呭
- private Dictionary<int, ItemModel> _packModelDict;
- private List<ItemModel> _sellItemlist = new List<ItemModel>();
-
- // public List<ItemModel> GetSellItemList()
- // {
- // GetOneKeySellModel();
- // _sellItemlist.Sort(SetSellItemOrder);
- // return _sellItemlist;
- // }
-
- // public int SetSellItemOrder(ItemModel startModel, ItemModel endModel)
- // {
- // bool startIsEquip = IsRealmEquip(startModel.itemId);
- // bool endIsEquip = IsRealmEquip(endModel.itemId);
- // if (startIsEquip.CompareTo(endIsEquip) != 0) return -startIsEquip.CompareTo(endIsEquip);
- // int order1 = startModel.config.Type;
- // int order2 = endModel.config.Type;
- // if (order1.CompareTo(order2) != 0) return order1.CompareTo(order2);
- // int color1 = startModel.config.ItemColor;
- // int color2 = endModel.config.ItemColor;
- // if (color1.CompareTo(color2) != 0) return -color1.CompareTo(color2);
- // int code1 = startModel.itemId;
- // int code2 = endModel.itemId;
- // if (code1.CompareTo(code2) != 0) return -code1.CompareTo(code2);
- // return 0;
- // }
-
- // public void GetOneKeySellModel()
- // {
- // SinglePack singlePack = packModel.GetSinglePack(PackType.Item);
- // if (singlePack == null)
- // return;
-
- // _sellItemlist.Clear();
- // _lifePotionDict.Clear();
- // _sameIndexEquipDict.Clear();
- // _sellItemScorelist.Clear();
- // playerLv = PlayerDatas.Instance.baseData.LV;
- // _packModelDict = singlePack.GetAllItems();
- // foreach (var key in _packModelDict.Keys)
- // {
- // GetCanSellEquipList(_packModelDict[key]);
- // ItemModel itemModel = _packModelDict[key];
- // if (drugIDs.Contains(itemModel.itemId))
- // {
- // if (!_lifePotionDict.ContainsKey(itemModel.config.LV))
- // {
- // List<ItemModel> modellist = new List<ItemModel>();
- // modellist.Add(itemModel);
- // _lifePotionDict.Add(itemModel.config.LV, modellist);
- // }
- // else
- // {
- // _lifePotionDict[itemModel.config.LV].Add(itemModel);
- // }
- // }
- // }
-
- // #region 寰楀埌鍙互鍑哄敭鐨勮澶�
- // foreach (var key in _sameIndexEquipDict.Keys)
- // {
- // _sellItemScorelist = _sameIndexEquipDict[key].Keys.ToList();
- // _sellItemScorelist.Sort();
- // if (_sellItemScorelist.Count > 0)
- // {
- // int score = 0;
- // for (score = _sellItemScorelist.Count - 1; score > -1; score--)
- // {
- // SinglePack equipPack = packModel.GetSinglePack(PackType.Equip);
- // ItemModel model = null;
- // if (equipPack != null)
- // {
- // model = equipPack.GetItemByIndex(key);
- // }
-
- // var modellist = _sameIndexEquipDict[key][_sellItemScorelist[score]];
- // bool remainBetter = true;
- // for (var i = 0; i < modellist.Count; i++)
- // {
- // if (model != null)
- // {
- // if (remainBetter)
- // {
- // if (model.score < _sellItemScorelist[score] && IsJobCompatibleItem(model.itemId))
- // {
- // _sameIndexEquipDict[key].Remove(_sellItemScorelist[score]);
- // remainBetter = false;
- // break;
- // }
- // }
-
- // }
- // else
- // {
- // if (IsJobCompatibleItem(model.itemId))
- // {
- // if (remainBetter)
- // {
- // _sameIndexEquipDict[key].Remove(_sellItemScorelist[score]);
- // remainBetter = false;
- // break;
- // }
- // }
- // }
- // }
-
- // if (!remainBetter)
- // {
- // break;
- // }
-
- // }
-
- // for (var j = 0; j < _sellItemScorelist.Count; j++)
- // {
-
- // if (_sameIndexEquipDict[key].ContainsKey(_sellItemScorelist[j]))
- // {
- // var sellModlelist = _sameIndexEquipDict[key][_sellItemScorelist[j]];
- // for (var k = 0; k < sellModlelist.Count; k++)
- // {
- // _sellItemlist.Add(sellModlelist[k]);
- // }
- // }
- // }
-
- // }
-
- // }
- // #endregion
-
- // List<int> drugLvlist = new List<int>();
- // drugLvlist.AddRange(_lifePotionDict.Keys.ToList());
- // drugLvlist.Sort();
- // for (int i = drugLvlist.Count - 1; i > -1; i--)
- // {
- // if (drugLvlist[i] > playerLv)
- // {
- // _lifePotionDict.Remove(drugLvlist[i]);
- // }
- // else
- // {
- // _lifePotionDict.Remove(drugLvlist[i]);
- // break;
- // }
- // }
-
- // foreach (var list in _lifePotionDict.Values)
- // {
- // for (int i = 0; i < list.Count; i++)
- // {
- // _sellItemlist.Add(list[i]);
- // }
-
- // }
- // }
-
-
- //寰楀埌婊¤冻鍑哄敭鏉′欢鐨勮澶囧垪琛�
- // public void GetCanSellEquipList(ItemModel model)
- // {
-
- // if (model.config.EquipPlace == 0 || !onekeySellTypes.Contains(model.config.Type))
- // return;
-
- // Dictionary<int, List<ItemModel>> sameScoreDict;
- // List<ItemModel> sameScorelist;
-
- // if (model.config.ItemColor < 3)
- // {
- // if (!_sameIndexEquipDict.ContainsKey(model.config.EquipPlace))
- // {
- // sameScoreDict = new Dictionary<int, List<ItemModel>>();
- // sameScorelist = new List<ItemModel>();
- // sameScorelist.Add(model);
- // sameScoreDict.Add(model.score, sameScorelist);
- // _sameIndexEquipDict.Add(model.config.EquipPlace, sameScoreDict);
-
- // }
- // else
- // {
- // if (_sameIndexEquipDict[model.config.EquipPlace].ContainsKey(model.score))
- // {
- // _sameIndexEquipDict[model.config.EquipPlace][model.score].Add(model);
- // }
- // else
- // {
- // sameScorelist = new List<ItemModel>();
- // sameScorelist.Add(model);
- // _sameIndexEquipDict[model.config.EquipPlace].Add(model.score, sameScorelist);
- // }
-
- // }
- // }
-
-
- // }
-
- #endregion
-
- #region 鍙戦�佽姹�
- /// <summary>
- /// 涓�閿嚭鍞墿鍝佺殑璇锋眰
- /// </summary>
- /// <param name="_oneKeySelllist"></param>
- // public void OneKeySell(List<ItemModel> _oneKeySelllist)
- // {
- // if (!isPackResetOk || SettingEffectMgr.Instance.isStartOneKeySell) return;
-
- // SettingEffectMgr.Instance.isStartOneKeySell = true;
- // byte[] itemIndexs = new byte[_oneKeySelllist.Count];
- // int i = 0;
- // for (i = 0; i < _oneKeySelllist.Count; i++)
- // {
- // itemIndexs[i] = (byte)_oneKeySelllist[i].gridIndex;
- // }
- // CA311_tagCMSellItem sellItem = new CA311_tagCMSellItem();
- // sellItem.PackType = (int)PackType.Item;
- // sellItem.Count = (byte)_oneKeySelllist.Count;
- // sellItem.ItemIndex = itemIndexs;
- // GameNetSystem.Instance.SendInfo(sellItem);
- // }
-
- /// <summary>
- /// 鏁寸悊鍖呰９鐗╁搧
- /// </summary>
- /// <param name="type"></param>
- public bool isPackResetOk { get; set; }
- public void ResetPack(PackType type)
- {
- if (lookLineIndex > -1)
- {
- SetLookIndex(null);
- }
-
-
- SinglePack singlePack = packModel.GetSinglePack(type);
- if (singlePack != null)
- {
- var packReset = new C070F_tagCItemPackReset();
- packReset.Type = (byte)type;
- packReset.ItemBeginIndex = 0;
- packReset.ItemEndIndex = (ushort)(singlePack.unlockedGridCount - 1);
- GameNetSystem.Instance.SendInfo(packReset); //鏁寸悊鐗╁搧
- if (type == PackType.Item)
- {
- isPackResetOk = false;
- }
- }
- }
- #endregion
-
- #region 鏌ョ湅鏌愪釜浣嶇疆鐨勭墿鍝�
- public event Action lookEquipEvent;
- private int _lookLineIndex = -1;
- public int lookLineIndex { get { return _lookLineIndex; } private set { _lookLineIndex = value; } }
-
- public string lookItemGUID { get; private set; }
-
- public void SetLookIndex(string guid, int singleRowCount = 5)
- {
-
- if (string.IsNullOrEmpty(guid) || guid == "")
- {
- lookLineIndex = -1;
- }
- else
- {
- int index = packModel.GetItemByGuid(guid).gridIndex;
- lookLineIndex = index / singleRowCount;
- lookItemGUID = guid;
- }
-
- if (lookEquipEvent != null)
- {
- lookEquipEvent();
- }
-
- }
- #endregion
-
- #region 鍒ゆ柇鏄惁鏈夋洿濂界殑瑁呭鏇挎崲
-
- /// <summary>
- /// 鑾峰彇瑁呭璇勫垎鏈�楂樺彲鎻愬崌鎴樺姏鐨勮澶�
- /// </summary>
- /// <param name="_places"></param>
- /// <returns></returns>
- // public string GetHighestScoreEquipByPlace(int equipPlace)
- // {
- // var itemPackage = packModel.GetSinglePack(PackType.Item);
- // var allItems = itemPackage.GetAllItems();
- // var putModel = packModel.GetItemByIndex(PackType.Equip, equipPlace);
- // var guid = string.Empty;
- // var score = putModel == null ? 0 : putModel.score;
- // foreach (var item in allItems.Values)
- // {
- // if (item.config.EquipPlace == equipPlace)
- // {
- // if (!IsOverdue(item.guid)
- // && (IsJobCompatibleItem(item.itemId)) && item.score > score)
- // {
- // guid = item.guid;
- // score = item.score;
- // }
- // }
- // }
-
- // return guid;
- // }
- #endregion
-
-
-
- bool IsCanPutOn(ItemModel item)
- {
- if (IsJobCompatibleItem(item.itemId))
- {
- return false;
- }
-
- int equipPlace = item.config.EquipPlace;
- if (equipPlace == 0 || equipPlace > 17)
- {
- return false;
- }
-
- var putOnlimitList = item.GetUseData((int)ItemUseDataKey.cancelUseLimit);
- if (!putOnlimitList.IsNullOrEmpty())
- {
- if (putOnlimitList[0] == 1)
- {
- return true;
- }
- }
-
- return true;
- }
-
-
#region 寰楀埌鐗╁搧鐨勫搧璐ㄩ鑹�
- private Dictionary<int, int> wingRefineQualityDict;
- private int[] wingsQualitys;
- private int[] wingsRefineExps;
public int GetItemQuality(int itemId, Dictionary<int, List<int>> useDataDic = null)
{
- wingsQualitys = null;
- wingsRefineExps = null;
ItemConfig itemConfig = ItemConfig.Get(itemId);
- // wingRefineQualityDict = WingRefineAttrConfig.GetWingsQualityModel(itemConfig.LV);
- // if (useDataDic != null)
- // {
- // if (useDataDic.ContainsKey(42) && wingRefineQualityDict != null)
- // {
- // wingsQualitys = wingRefineQualityDict.Keys.ToArray();
- // wingsRefineExps = wingRefineQualityDict.Values.ToArray();
- // int i = 0;
- // for (i = wingsRefineExps.Length - 1; i > -1; i--)
- // {
- // if (useDataDic[42][0] >= wingsRefineExps[i])
- // {
- // return wingsQualitys[i];
- // }
- // }
- // }
- // }
+
return itemConfig.ItemColor;
}
#endregion
- //璁剧疆鐜╁璐у竵鏄剧ず
- public string OnChangeCoinsUnit(long value)
- {
- return UIHelper.ReplaceLargeNum(value);
- }
-
- /// <summary>
- /// 瑁呭鏄惁鍙互鎻愬崌鎴樺姏
- /// </summary>
- /// <param name="_itemID"></param>
- /// <param name="_score"></param>
- /// <returns></returns>
- public int IsFightUp(int _itemID, int _score)//-1浣庣骇锛�0涓嶆槸鏈亴涓氾紝1鏇村ソ
- {
- var config = ItemConfig.Get(_itemID);
- if (config != null)
- {
- // var index = EquipModel.GetItemServerEquipPlace(_itemID);
- // if (index == -1)
- // {
- // return 0;
- // }
-
- // var item = packModel.GetItemByIndex(PackType.Equip, index);
- // var equipScore = item != null ? item.score : 0;
- // if (IsJobCompatibleItem(_itemID))
- // {
- // return _score.CompareTo(equipScore);
- // }
- // else
- // {
- // return 0;
- // }
- }
-
- return 0;
- }
-
- // 涓嶅寘鍚湭寮�鏀捐澶囩殑姣旇緝 灞炰簬-1
- public int IsFightUpEx(int _itemID, int _score, int _realm)//-1浣庣骇锛�0涓嶆槸鏈亴涓氾紝1鏇村ソ
- {
- var config = ItemConfig.Get(_itemID);
- if (config != null)
- {
- // var index = EquipModel.GetItemServerEquipPlace(_itemID);
- // if (index == -1)
- // {
- // return 0;
- // }
-
- // var item = packModel.GetItemByIndex(PackType.Equip, index);
-
- // var equipScore = item != null ? item.score : 0;
- // if (IsJobCompatibleItem(_itemID))
- // {
- // if (_realm > PlayerDatas.Instance.baseData.realmLevel)
- // return -1;
- // return _score.CompareTo(equipScore);
- // }
- // else
- // {
- // return 0;
- // }
- }
-
- return 0;
- }
#region 鐗╁搧鏄惁杩囨湡
@@ -979,170 +90,6 @@
#endregion
- public bool IsJobCompatibleItem(int itemId)
- {
- var config = ItemConfig.Get(itemId);
- return config != null && (config.JobLimit == 0 || config.JobLimit == PlayerDatas.Instance.baseData.Job);
- }
-
- public bool IsRealmEquip(int itemId)
- {
- if (!ItemConfig.HasKey(itemId))
- {
- return false;
- }
-
- var config = ItemConfig.Get(itemId);
- return config.Type >= 101 && config.Type <= 112;
- }
-
- public bool IsWing(int itemId)
- {
- if (!ItemConfig.HasKey(itemId))
- {
- return false;
- }
- var config = ItemConfig.Get(itemId);
- return config.Type == 113 || config.Type == 39 || config.Type == 52;
- }
-
- public bool IsDogzEquip(int itemId)
- {
- if (!ItemConfig.HasKey(itemId))
- {
- return false;
- }
-
- var config = ItemConfig.Get(itemId);
- return config.Type >= 119 && config.Type <= 123;
- }
-
- public bool IsSpiritWeapon(int itemId)
- {
- if (!ItemConfig.HasKey(itemId))
- {
- return false;
- }
-
- var config = ItemConfig.Get(itemId);
- return config.Type >= 113 && config.Type <= 117;
- }
-
- public bool IsSuitEquip(int itemId)
- {
- if (!ItemConfig.HasKey(itemId))
- {
- return false;
- }
-
- var config = ItemConfig.Get(itemId);
- return config.SuiteiD > 0 && config.Type >= 101 && config.Type <= 112;
- }
-
- // public bool IsThanksItem(int itemID)
- // {
- // if (AssistThanksGiftConfig.Get(itemID) == null)
- // {
- // return false;
- // }
- // return true;
- // }
-
- // public int GetSpecialSpiritPropertyValue(int itemId)
- // {
- // var config = SpiritWeaponConfig.Get(itemId);
- // if (config == null)
- // {
- // return 0;
- // }
-
- // var propertyId = 0;
- // var propertyValue = 0;
- // for (var i = 0; i < config.AttrIDList.Length; i++)
- // {
- // var id = config.AttrIDList[i];
- // if (id == 79 || id == 80)
- // {
- // propertyId = id;
- // propertyValue = config.AttrValueList[i];
- // break;
- // }
- // }
-
- // if (propertyId == 0)
- // {
- // return 0;
- // }
-
- // Equation.Instance.Clear();
- // Equation.Instance.AddKeyValue("maxOOPValue", propertyValue);
-
- // var maxLevel = 100;
- // if (specialSpiritPropertyMaxLevels.ContainsKey(config.Level))
- // {
- // maxLevel = specialSpiritPropertyMaxLevels[config.Level];
- // }
-
- // Equation.Instance.AddKeyValue("lv", Mathf.Min(maxLevel, PlayerDatas.Instance.baseData.LV));
- // return Equation.Instance.Eval<int>(specialSpiritPropertyFormula[propertyId]);
- // }
-
- // public int GetSpecialSpiritPropertyMaxLevel(int itemId)
- // {
- // var config = SpiritWeaponConfig.Get(itemId);
- // if (config == null)
- // {
- // return 0;
- // }
-
- // var maxLevel = 0;
- // if (specialSpiritPropertyMaxLevels.ContainsKey(config.Level))
- // {
- // maxLevel = specialSpiritPropertyMaxLevels[config.Level];
- // }
-
- // return maxLevel;
- // }
-
- //瑁呭瀵规瘮锛岀敤浜庨潪瀹為檯瑁呭绠�鍗曟瘮杈� 鏄惁闇�瑕佹瑁呭
- // public bool IsSatisfyEquipBetterEquip(int itemID)
- // {
- // if (!IsRealmEquip(itemID))
- // {
- // return false;
- // }
-
- // var itemConfig = ItemConfig.Get(itemID);
- // if (itemConfig.JobLimit != 0 && itemConfig.JobLimit != PlayerDatas.Instance.baseData.Job)
- // {
- // return false;
- // }
-
- // var equipSet = equipModel.GetEquipSet(itemConfig.LV);
- // if (!equipSet.IsSlotUnLocked(itemConfig.EquipPlace))
- // {
- // return false;
- // }
-
- // var equipGuid = equipModel.GetEquip(new Int2(itemConfig.LV, itemConfig.EquipPlace));
- // if (string.IsNullOrEmpty(equipGuid))
- // {
- // return true;
- // }
-
- // var itemModel = packModel.GetItemByGuid(equipGuid);
- // if (itemModel == null)
- // {
- // return true;
- // }
-
- // if (itemConfig.ItemColor > itemModel.config.ItemColor)
- // {
- // return true;
- // }
-
- // return itemModel.config.SuiteiD == 0 && itemConfig.SuiteiD != 0;
- // }
#region 鑾峰緱鑻遍泟鐗╁搧灞曠ず绔嬬粯
public List<int> poplhHeroIdList = new List<int>();
@@ -1175,10 +122,6 @@
#endregion
- public Action OnGetItem; //CommonGetItemWin鐣岄潰鍏抽棴鏃惰Е鍙�
- public string getItemInfo { get; private set; } //閫氱敤鏄剧ず鑾峰緱鐨勭晫闈俊鎭�
- public string getItemBtnText { get; private set; } //閫氱敤鏄剧ず鑾峰緱鐨勭晫闈㈡寜閽枃瀛� 榛樿纭畾
- public int closeSeconds { get; private set; } // 鍏抽棴鍊掕鏃舵椂闂� 濡傛灉浼�0浠ｈ〃鎵嬪姩鍏抽棴
public bool isNameShow { get; private set; } // 鏄惁灞曠ず鐗╁搧鍚嶅瓧
// 濡傛灉鍚屾椂鏈夊绉嶅鍔卞皝鍖咃紝鍚屼竴涓簨浠跺綊闆嗭紝涓嶅悓浜嬩欢鐩存帴椤舵帀鏄剧ず鏈�鏂�
@@ -1240,51 +183,7 @@
ShowHeroLHWin(items);//鏈変紶濂囦互涓婅嫳闆勬樉绀虹珛缁�
}
- //鍙互鎸囧畾鎵撳紑鐨勭獥鍙�
- // public void ShowGetItemEx<T>(List<Item> items, string info = "", int seconds = 3, string btnName = "", Action func = null, bool isNameShow = true, string eventName = "default") where T : UIBase
- // {
- // if (getItemEventName != eventName)
- // {
- // if (UIManager.Instance.IsOpenedInList<T>())
- // {
- // //----------------------璁板緱鏀圭珛鍗冲叧闂�
- // UIManager.Instance.CloseWindow<T>();
- // }
-
- // totalShowItems.Clear();
- // getItemEventName = eventName;
- // }
-
- // //鐩稿悓ID 鍚堝苟鏁伴噺鏄剧ず
- // for (int i = 0; i < items.Count; i++)
- // {
- // var id = items[i].id;
- // if (totalShowItems.ContainsKey(id))
- // {
- // totalShowItems[id] = new Item(id, items[i].countEx + totalShowItems[id].countEx, items[i].useType, items[i].quality);
- // }
- // else
- // {
- // totalShowItems.Add(id, items[i]);
- // }
- // }
-
-
- // getItemInfo = info;
- // OnGetItem = func;
- // if (btnName == "")
- // btnName = Language.Get("PopConfirmWin_OK");
- // getItemBtnText = btnName;
- // closeSeconds = seconds;
- // this.isNameShow = isNameShow;
- // OnGetItemShowEvent?.Invoke();
- // if (!UIManager.Instance.IsOpenedInList<T>())
- // {
- // UIManager.Instance.OpenWindow<T>();
- // }
-
- // ShowHeroLHWin(items);//鏈変紶濂囦互涓婅嫳闆勬樉绀虹珛缁�
- // }
+
public void ClearGetItem()
{
//涓嶆竻鐞嗙墿鍝侊紝涓嬫鏀跺埌鏁版嵁浼氳嚜鍔ㄦ竻鐞嗭紝鍙敼浜嬩欢鏂逛究鎵撳紑鐣岄潰娴嬭瘯
@@ -1367,25 +266,6 @@
return false;
}
- //var usedCountTotal = packModel.GetItemTotalUsedTimes(item.itemId);
- // var fruitConfig = AttrFruitConfig.Get(item.itemId);
- // if (fruitConfig != null)
- // {
- // var limitTimes = 0;
- // if (fruitConfig.FuncID == 2)
- // {
- // limitTimes = alchemyModel.GetAlchemyDrugUseLimit(item.itemId);
- // }
- // else
- // {
- // limitTimes = fruitConfig.basicUseLimit;
- // }
- // if (usedCountTotal >= limitTimes || useCnt > limitTimes)
- // {
- // error = 1;
- // return false;
- // }
- // }
error = 0;
return true;
@@ -1406,4 +286,25 @@
GameNetSystem.Instance.SendInfo(useItem); //浣跨敤鐗╁搧
}
+
+ /// <summary>
+ /// 鎵撳紑鎵归噺浣跨敤鐗╁搧鐣岄潰
+ /// </summary>
+ /// <param name="itemID">瑕佷娇鐢ㄧ殑鐗╁搧</param>
+ /// <param name="showTipEvent">鍙傛暟涓鸿浣跨敤鐨勭墿鍝佹暟閲忥紝杩斿洖鍊间负鏂囨湰</param>
+ public void ShowItemBatchUseWin(int itemID, Func<long, string> showTipEvent)
+ {
+ if (UIManager.Instance.IsOpened<ItemBatchUseWin>())
+ {
+ UIManager.Instance.CloseWindow<ItemBatchUseWin>();
+ }
+ if (!CheckItemCount(PackType.Item, itemID, 1, 2))
+ {
+ return;
+ }
+ ItemBatchUseWin.itemID = itemID;
+ ItemBatchUseWin.ShowTextEvent = showTipEvent;
+ UIManager.Instance.OpenWindow<ItemBatchUseWin>();
+ }
+
}
diff --git a/Main/System/KnapSack/PackManager.cs b/Main/System/KnapSack/PackManager.cs
index f7af21d..3d7279b 100644
--- a/Main/System/KnapSack/PackManager.cs
+++ b/Main/System/KnapSack/PackManager.cs
@@ -387,7 +387,6 @@
public void PackResetOk(H0316_tagPackResetOK packreset)
{
- ItemLogicUtility.Instance.isPackResetOk = true;
}
public void UseItemSuccess(H0706_tagUseItemSuccess success)
diff --git a/Main/System/Message/RichTableEvent.cs b/Main/System/Message/RichTableEvent.cs
index 3d90848..f5a3271 100644
--- a/Main/System/Message/RichTableEvent.cs
+++ b/Main/System/Message/RichTableEvent.cs
@@ -58,14 +58,7 @@
if (cfg != null)
{
var _itemColor = cfg.ItemColor;
- if (ItemLogicUtility.Instance.IsWing(id))//缈呰唨
- {
- Dictionary<int, List<int>> userdata = null;
- if (TryGetUserData(_dict, out userdata))
- {
- _itemColor = ItemLogicUtility.Instance.GetItemQuality(cfg.ID, userdata);
- }
- }
+
var itemName = cfg.ItemName;
if (_dict.ContainsKey("chatsend"))
{
@@ -469,18 +462,5 @@
return UIHelper.AppendColor(_itemColor, info, colorType == 1);
}
- static bool TryGetUserData(Dictionary<string, string> href, out Dictionary<int, List<int>> userdata)
- {
- userdata = null;
- if (href.ContainsKey("itemplus"))
- {
- var itemplus = LitJson.JsonMapper.ToObject<ItemTipUtility.CustomItemPlus>(href["itemplus"]);
- userdata = ConfigParse.Analysis(itemplus.UserData);
- }
- else if (href.ContainsKey("userdata"))
- {
- userdata = ConfigParse.Analysis(href["userdata"]);
- }
- return false;
- }
+
}
--
Gitblit v1.8.0