From 2d33b5a669a927d444e095d2b5cb118b20403440 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 23 一月 2019 22:06:40 +0800
Subject: [PATCH] 5930 子 【开发】【1.5.100】诛仙装备开发 / 【前端】【1.5.100】诛仙装备开发
---
System/KnapSack/Logic/PackModelInterface.cs | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/System/KnapSack/Logic/PackModelInterface.cs b/System/KnapSack/Logic/PackModelInterface.cs
index 7f30033..f326a79 100644
--- a/System/KnapSack/Logic/PackModelInterface.cs
+++ b/System/KnapSack/Logic/PackModelInterface.cs
@@ -817,27 +817,54 @@
public event Action<string> RefreshGetBetterEquipEvent; //寰楀埌鏇村ソ鐨勮澶� value 鐗╁搧鐨勫疄渚婭D
+ public bool IsSameJob(int jobLimit)
+ {
+ return jobLimit == 0 || jobLimit / 100 == PlayerDatas.Instance.baseData.Job;
+ }
+
public void OnGetEquip(ItemModel model)
{
- if (model.packType != PackType.rptItem
- || (model.chinItemModel.EquipPlace <= 0 || model.chinItemModel.EquipPlace > 12)
- || (model.chinItemModel.JobLimit / 100 != PlayerDatas.Instance.baseData.Job
- && model.chinItemModel.Type != (int)ItemType.Necklaces
- && model.chinItemModel.Type != (int)ItemType.FairyEquip
- && model.chinItemModel.Type != (int)ItemType.SpiritAnimal))
- {
- return;
- }
+ if (model == null) return;
+ if (model.packType != PackType.rptItem && model.packType != PackType.rptJadeDynastyItem) return;
+ if (!IsSameJob(model.chinItemModel.JobLimit)) return;
- if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
+ int equipPlace = model.chinItemModel.EquipPlace;
+ switch ((RoleEquipType)equipPlace)
{
- if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(model.itemInfo.ItemID))
- {
- return;
- }
+ case RoleEquipType.retWeapon:
+ case RoleEquipType.retWeapon2:
+ case RoleEquipType.retHat:
+ case RoleEquipType.retClothes:
+ case RoleEquipType.retBelt:
+ case RoleEquipType.retTrousers:
+ case RoleEquipType.retShoes:
+ case RoleEquipType.retNeck:
+ case RoleEquipType.retFairyCan:
+ case RoleEquipType.retFairyCan2:
+ case RoleEquipType.retWing:
+ case RoleEquipType.retSpiritAnimal:
+ case RoleEquipType.JadeDynasty_Cloak:
+ case RoleEquipType.JadeDynasty_FaceMask:
+ case RoleEquipType.JadeDynasty_Glove1:
+ case RoleEquipType.JadeDynasty_Glove2:
+ case RoleEquipType.JadeDynasty_Ruyi:
+ case RoleEquipType.JadeDynasty_Pendant:
+ case RoleEquipType.JadeDynasty_Ring1:
+ case RoleEquipType.JadeDynasty_Ring2:
+ case RoleEquipType.JadeDynasty_Sword1:
+ case RoleEquipType.JadeDynasty_Sword2:
+ case RoleEquipType.JadeDynasty_Sword3:
+ case RoleEquipType.JadeDynasty_Sword4:
+ if (betterEquipExceptDungeonDict.ContainsKey(PlayerDatas.Instance.baseData.MapID))
+ {
+ if (betterEquipExceptDungeonDict[PlayerDatas.Instance.baseData.MapID].Contains(model.itemInfo.ItemID))
+ {
+ return;
+ }
+ }
+ SetGetBetterEquipEvent(model);
+ break;
}
-
- SetGetBetterEquipEvent(model);
}
private void SetGetBetterEquipEvent(ItemModel model)
--
Gitblit v1.8.0