From 4efedb5a54922452a3d90e7074d78d19b2f5f2ce Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 24 一月 2019 19:34:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeToolsWin.cs | 11 +
System/FriendSystem/MailPanel.cs | 126 ++++++++++++++++--------
System/Compose/New/ComposeWingsWin.cs | 12 +
System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs | 6 +
System/Compose/New/ComposeEquipWin.cs | 7 +
System/KnapSack/New/SplitWin.cs | 2
Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs | 15 +-
System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs | 2
System/KnapSack/Logic/PackSendQuestMgr.cs | 12 +-
System/Compose/New/ComposeWinModel.cs | 8
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs | 30 ++++-
System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs | 1
System/Compose/New/ComposeTicketWin.cs | 11 +
System/KnapSack/New/FairyWearWin.cs | 6 +
14 files changed, 163 insertions(+), 86 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs b/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
index b6eff52..3b6c9b0 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
@@ -45,7 +45,7 @@
DEBUG_STEP = 1;
try
{
- if (vNetData.socketType==GameNetSystem.SocketType.Main)
+ if (vNetData.socketType == GameNetSystem.SocketType.Main)
{
RedpointCenter.Instance.ResetAllRedpointState();
}
@@ -58,10 +58,13 @@
PlayerDatas.Instance.InitPlayerData(vNetData);
PlayerDatas.Instance.RequestWorldTick();
- SDKUtility.Instance.RoleLogin(vNetData.PlayerID.ToString(),
- vNetData.PlayerName,
- vNetData.LV.ToString(),
- vNetData.VIPLv.ToString());
+ if (vNetData.socketType == GameNetSystem.SocketType.Main)
+ {
+ SDKUtility.Instance.RoleLogin(vNetData.PlayerID.ToString(),
+ vNetData.PlayerName,
+ vNetData.LV.ToString(),
+ vNetData.VIPLv.ToString());
+ }
var _mapConfig = Config.Instance.Get<MapConfig>(vNetData.MapID);
@@ -249,7 +252,7 @@
DEBUG_STEP = 9;
StageLoadTimeOutCatcher.RecordProtocol(vNetPack.socketType, "0102", DateTime.Now);
-
+
GA_Hero.s_MapSwitching = true;
}
}
diff --git a/System/Compose/New/ComposeEquipWin.cs b/System/Compose/New/ComposeEquipWin.cs
index 91db60d..575938c 100644
--- a/System/Compose/New/ComposeEquipWin.cs
+++ b/System/Compose/New/ComposeEquipWin.cs
@@ -708,8 +708,11 @@
private void SetFixedItemIndexDic()
{
fixedItemIndexDict.Clear();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return;
+ if (compoundModel == null) return;
+
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return;
int minBindCnt = 0;
int minNoBindCnt = 0;
diff --git a/System/Compose/New/ComposeTicketWin.cs b/System/Compose/New/ComposeTicketWin.cs
index 44eaad0..355da44 100644
--- a/System/Compose/New/ComposeTicketWin.cs
+++ b/System/Compose/New/ComposeTicketWin.cs
@@ -468,12 +468,13 @@
}
List<int> composeCountlist = new List<int>();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
int[] fixedIds = compoundModel.itemID;
int[] fixedCounts = compoundModel.itemCount;
for (int i = 0; i < fixedIds.Length; i++)
{
- int haveCount = playerPack.GetItemCountByID(PackType.rptItem, fixedIds[i]);
+ int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);
int canComposeCount = haveCount / fixedCounts[i];
composeCountlist.Add(canComposeCount);
List<int> itemIndexlist = null;
@@ -515,8 +516,10 @@
private void SetFixedItemIndexDic()
{
fixedItemIndexDict.Clear();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return;
+ if (compoundModel == null) return;
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return;
int minBindCnt = 0;
int minNoBindCnt = 0;
diff --git a/System/Compose/New/ComposeToolsWin.cs b/System/Compose/New/ComposeToolsWin.cs
index f191fd1..2646ecc 100644
--- a/System/Compose/New/ComposeToolsWin.cs
+++ b/System/Compose/New/ComposeToolsWin.cs
@@ -450,8 +450,10 @@
private void SetFixedItemIndexDic()
{
fixedItemIndexDict.Clear();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return;
+ if (compoundModel == null) return;
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return;
int minBindCnt = 0;
int minNoBindCnt = 0;
@@ -495,13 +497,14 @@
List<int> composeCountlist = new List<int>();
fixedItemIndexDict.Clear();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
int[] fixedIds = compoundModel.itemID;
int[] fixedCounts = compoundModel.itemCount;
for (int i = 0; i < fixedIds.Length; i++)
{
- int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
+ int haveCount = playerPack.GetItemCountByID(packType,fixedIds[i]);
int canComposeCount = haveCount / fixedCounts[i];
composeCountlist.Add(canComposeCount);
List<int> itemIndexlist = null;
diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index c470e4f..5f572b7 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -532,12 +532,12 @@
MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
return;
}
-
+ var packType = GetPackTypeByMakerId(compoundModel.makeID);
int[] fixedIds = compoundModel.itemID;
int[] fixedCounts = compoundModel.itemCount;
for (i = 0; i < fixedCounts.Length; i++)
{
- int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
+ int haveCount = playerPack.GetItemCountByID(packType, fixedIds[i]);
if (haveCount < fixedCounts[i])
{
ItemConfig fixedConfig = Config.Instance.Get<ItemConfig>(fixedIds[i]);
@@ -580,7 +580,7 @@
{
for(i= 0; i < fixedIndexArray.Length;i++ )
{
- ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,fixedIndexArray[i]);
+ ItemModel itemModel = playerPack.GetItemModelByIndex(packType, fixedIndexArray[i]);
SetMatIsBindDict(itemModel,fixedMatIsBindDict);
}
}
@@ -598,7 +598,7 @@
{
for (i = 0; i < unfixedIndexArray.Length; i++)
{
- ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, unfixedIndexArray[i]);
+ ItemModel itemModel = playerPack.GetItemModelByIndex(packType, unfixedIndexArray[i]);
SetMatIsBindDict(itemModel,unfixedMatIsBindDict);
}
}
diff --git a/System/Compose/New/ComposeWingsWin.cs b/System/Compose/New/ComposeWingsWin.cs
index fa1705a..b0fdbe2 100644
--- a/System/Compose/New/ComposeWingsWin.cs
+++ b/System/Compose/New/ComposeWingsWin.cs
@@ -478,8 +478,10 @@
private bool ChangeFixedMatUI()
{
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return false;
+ if (compoundModel == null) return false;
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return false;
bool isBind = false;
Dictionary<int,ItemModel> unfixedMatDict = selectModel.GetHaveUnfixedSelectItem();
@@ -605,8 +607,10 @@
private void SetFixedMatIndex()
{
fixedItemIndexDict.Clear();
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null || compoundModel == null) return;
+ if (compoundModel == null) return;
+ var packType = composeWinModel.GetPackTypeByMakerId(compoundModel.makeID);
+ SinglePackModel singlePack = playerPack.GetSinglePackModel(packType);
+ if (singlePack == null) return;
int isBind = 0;
if(IsComposeBind)
diff --git a/System/FriendSystem/MailPanel.cs b/System/FriendSystem/MailPanel.cs
index 340dc11..bd27369 100644
--- a/System/FriendSystem/MailPanel.cs
+++ b/System/FriendSystem/MailPanel.cs
@@ -623,69 +623,109 @@
CreateMailCell();
}
+ private Dictionary<PackType, int> GetPackItemDcit = new Dictionary<PackType, int>();
public void SendAskReceive(string id)
{
MailInfo mailInfo = MailAllModel.Instance.GetMailInfo(id);
if (mailInfo == null) return;
+ GetPackItemDcit.Clear();
int i = 0;
- int getBagItemCount = 0;
- int getRuneCount = 0;
- int getDogzCount = 0;
- int getSoulCount = 0;
+ //int getBagItemCount = 0;
+ //int getRuneCount = 0;
+ //int getDogzCount = 0;
+ //int getSoulCount = 0;
ItemConfig tagChinItem = null;
+ //for (i = 0; i < mailInfo.Count; i++)
+ //{
+ // tagChinItem = Config.Instance.Get<ItemConfig>((int)mailInfo.Items[i].ItemID);
+ // if (tagChinItem != null)
+ // {
+ // var packType = GeneralDefine.GetPackTypeByItemType(tagChinItem.Type);
+ // if(!GetPackItemDcit.ContainsKey(packType))
+ // {
+ // GetPackItemDcit.Add(packType,1);
+ // }
+ // else
+ // {
+ // GetPackItemDcit[packType]
+ // }
+
+ // switch(tagChinItem.Type)
+ // {
+ // case RuneModel.RUNE_TYPE:
+ // case RuneModel.RUNE_CREAMTYPE:
+ // getRuneCount += 1;
+ // break;
+ // case (int)ItemType.DogzStrengthMat:
+ // case (int)ItemType.DogzEquipType1:
+ // case (int)ItemType.DogzEquipType2:
+ // case (int)ItemType.DogzEquipType3:
+ // case (int)ItemType.DogzEquipType4:
+ // case (int)ItemType.DogzEquipType5:
+ // getDogzCount += 1;
+ // break;
+ // case GatheringSoulModel.GATHERSOUL_CORE_TYPE:
+ // case GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE:
+ // case GatheringSoulModel.GATHERSOUL_SOUL_TYPE:
+ // getSoulCount += 1;
+ // break;
+ // default:
+ // getBagItemCount += 1;
+ // break;
+ // }
+ // }
+ //}
+
for (i = 0; i < mailInfo.Count; i++)
{
tagChinItem = Config.Instance.Get<ItemConfig>((int)mailInfo.Items[i].ItemID);
if (tagChinItem != null)
{
- switch(tagChinItem.Type)
+ var packType = GeneralDefine.GetPackTypeByItemType(tagChinItem.Type);
+ if (!GetPackItemDcit.ContainsKey(packType))
{
- case RuneModel.RUNE_TYPE:
- case RuneModel.RUNE_CREAMTYPE:
- getRuneCount += 1;
- break;
- case (int)ItemType.DogzStrengthMat:
- case (int)ItemType.DogzEquipType1:
- case (int)ItemType.DogzEquipType2:
- case (int)ItemType.DogzEquipType3:
- case (int)ItemType.DogzEquipType4:
- case (int)ItemType.DogzEquipType5:
- getDogzCount += 1;
- break;
- case GatheringSoulModel.GATHERSOUL_CORE_TYPE:
- case GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE:
- case GatheringSoulModel.GATHERSOUL_SOUL_TYPE:
- getSoulCount += 1;
- break;
- default:
- getBagItemCount += 1;
- break;
+ GetPackItemDcit.Add(packType, 1);
+ }
+ else
+ {
+ GetPackItemDcit[packType] += 1;
}
}
}
- if (getBagItemCount > playerPack.GetReaminGridCount(PackType.rptItem))
+ foreach (var key in GetPackItemDcit.Keys)
{
- SysNotifyMgr.Instance.ShowTip("BagFull");
- return;
+ int remainCount = playerPack.GetReaminGridCount(key);
+ int getCount = GetPackItemDcit[key];
+ if(remainCount < getCount)
+ {
+ SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",key);
+ return;
+ }
}
- else if (getRuneCount > runeModel.SurplusRunePackCnt)
- {
- SysNotifyMgr.Instance.ShowTip("RuneBagFull");
- return;
- }
- else if(getDogzCount > playerPack.GetReaminGridCount(PackType.rptDogzItem))
- {
- SysNotifyMgr.Instance.ShowTip("DogzBagFull");
- return;
- }
- else if(getSoulCount > virtualPackModel.GetPackRemainCount(PackType.rptGatherSoul))
- {
- SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",PackType.rptGatherSoul);
- return;
- }
+ //if (getBagItemCount > playerPack.GetReaminGridCount(PackType.rptItem))
+ //{
+ // SysNotifyMgr.Instance.ShowTip("BagFull");
+ // return;
+ //}
+ //else if (getRuneCount > runeModel.SurplusRunePackCnt)
+ //{
+
+ // SysNotifyMgr.Instance.ShowTip("RuneBagFull");
+ // return;
+ //}
+ //else if(getDogzCount > playerPack.GetReaminGridCount(PackType.rptDogzItem))
+ //{
+ // SysNotifyMgr.Instance.ShowTip("DogzBagFull");
+ // return;
+ //}
+ //else if(getSoulCount > virtualPackModel.GetPackRemainCount(PackType.rptGatherSoul))
+ //{
+ // SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",PackType.rptGatherSoul);
+ // return;
+ //}
CA53B_tagCMRequestCompensation askRecive = new CA53B_tagCMRequestCompensation();
askRecive.GUID = id;
diff --git a/System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs b/System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs
index 986e89d..b725745 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyDecomposeModel.cs
@@ -14,7 +14,6 @@
public List<string> selectGuids { get; private set; }
public List<string> allGuids { get; private set; }
public event Action UpdateSelectItemEvent;
-
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }
diff --git a/System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs b/System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs
index ddb41ba..a077435 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs
@@ -14,6 +14,7 @@
[SerializeField] Button equipBtn;
[SerializeField] GameObject equipLvObj;
[SerializeField] Text equipLvText;
+ [SerializeField] GameObject composeImg;
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
@@ -42,6 +43,7 @@
equipBtn.RemoveAllListeners();
itemCell.cellBtn.RemoveAllListeners();
equipLvObj.SetActive(false);
+ composeImg.SetActive(false);
if(islock)
{
itemCell.gameObject.SetActive(false);
@@ -63,6 +65,10 @@
else
{
equipBtn.AddListener(ClickEquipBtn);
+ if (equipModel.equipPlaceComposes.Contains((int)equipType))
+ {
+ composeImg.SetActive(true);
+ }
}
}
}
diff --git a/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs b/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
index 06ec608..eb7be8e 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -22,6 +22,7 @@
{
ParseFuncConfig();
ParseSuitAttrConfig();
+ ParseTowerConfig();
}
public void OnBeforePlayerDataInitialize()
@@ -48,19 +49,11 @@
public Dictionary<int, int> lockEquipLayerDict { get; private set; }
public Dictionary<int, List<int>> suitTypeDict { get; private set;}
public Dictionary<int, List<int>> equipGetPathDict { get; private set;}
+ public List<int> equipPlaceComposes { get; private set;}
public void ParseFuncConfig()
{
- lockEquipLayerDict = new Dictionary<int, int>();
suitTypeDict = new Dictionary<int, List<int>>();
var equipZhuXian = Config.Instance.Get<FuncConfigConfig>("EquipZhuXian");
- var lockEquipData = JsonMapper.ToObject(equipZhuXian.Numerical1);
- foreach(var key in lockEquipData.Keys)
- {
- int equipPlace = int.Parse(key);
- int towerLayer = int.Parse(lockEquipData[key].ToString());
- lockEquipLayerDict.Add(equipPlace,towerLayer);
- }
-
var suitGroupData = JsonMapper.ToObject(equipZhuXian.Numerical2);
foreach(var key in suitGroupData.Keys)
{
@@ -98,6 +91,9 @@
}
}
+ var jadeDynastyEquipCompose = Config.Instance.Get<FuncConfigConfig>("JadeDynastyEquipCompose");
+ int[] composes = ConfigParse.GetMultipleStr<int>(jadeDynastyEquipCompose.Numerical1);
+ equipPlaceComposes = composes.ToList();
}
public Dictionary<int, Dictionary<int, JadeDynastySuitAttrData>> suitAttrDict { get; private set; }
@@ -127,6 +123,22 @@
}
}
+ public void ParseTowerConfig()
+ {
+ lockEquipLayerDict = new Dictionary<int, int>();
+ var configs = Config.Instance.GetAllValues<JadeDynastyTowerConfig>();
+ foreach(var key in configs)
+ {
+ if(key.unLockEquipPlace != 0)
+ {
+ int equipPlace = key.unLockEquipPlace;
+ int towerLayer = key.floorIndex;
+ lockEquipLayerDict.Add(equipPlace, towerLayer);
+ }
+
+ }
+ }
+
public class JadeDynastySuitAttrData
{
public int suitLv { get; private set; }
diff --git a/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs b/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
index 1461e0d..94c83a1 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
@@ -20,6 +20,7 @@
var singlePack = playerPack.GetSinglePackModel(PackType.rptJadeDynastyItem);
if (singlePack == null) return;
+ equipLvObj.SetActive(false);
var itemModel = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyItem, index);
itemCell.gameObject.SetActive(itemModel != null);
@@ -46,7 +47,6 @@
}
else
{
- equipLvObj.SetActive(false);
bool isLock = index > (singlePack.openGridCount - 1);
lockBtn.gameObject.SetActive(isLock);
UpdatePlayerEffect(null);
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index e610b07..57c72c8 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -1170,15 +1170,15 @@
}
public void SendSplitQuest(string guid,int splitCount)
{
- SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
- if (singlePack == null) return;
+ if (string.IsNullOrEmpty(guid)) return;
ItemModel itemModel = playerPack.GetItemModelByGUID(guid);
- if (itemModel == null || itemModel.packType != PackType.rptItem) return;
-
- if (playerPack.GetReaminGridCount(PackType.rptItem) < 1)
+ if (itemModel == null) return;
+ var packType = GeneralDefine.GetPackTypeByItemType(itemModel.chinItemModel.Type);
+ var singlePack = playerPack.GetSinglePackModel(packType);
+ if (playerPack.GetReaminGridCount(packType) < 1)
{
- SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_998371");
+ SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",packType);
}
else
{
diff --git a/System/KnapSack/New/FairyWearWin.cs b/System/KnapSack/New/FairyWearWin.cs
index f42fdf3..0f253bc 100644
--- a/System/KnapSack/New/FairyWearWin.cs
+++ b/System/KnapSack/New/FairyWearWin.cs
@@ -15,6 +15,8 @@
public class FairyWearWin : Window
{
#region 鎴愬憳鍙橀噺
+ [SerializeField] Image wear01Img;
+ [SerializeField] Image wear02Img;
private Button _closeBtn;
private Button _wear01Btn;
private Button _wear02Btn;
@@ -66,7 +68,9 @@
curItemModel = PackSendQuestMgr.Instance.sendItemModel;
if(curItemModel != null)
{
- switch(curItemModel.packType)
+ wear01Img.SetSprite(StringUtility.Contact("EquipPlace_",curItemModel.chinItemModel.EquipPlace));
+ wear02Img.SetSprite(StringUtility.Contact("EquipPlace_", curItemModel.chinItemModel.EquipPlace));
+ switch (curItemModel.packType)
{
case PackType.rptItem:
_itemModel01 = playerPack.GetItemModelByIndex(PackType.rptEquip,(int)RoleEquipType.retFairyCan);
diff --git a/System/KnapSack/New/SplitWin.cs b/System/KnapSack/New/SplitWin.cs
index 356f33e..ba80a81 100644
--- a/System/KnapSack/New/SplitWin.cs
+++ b/System/KnapSack/New/SplitWin.cs
@@ -101,7 +101,7 @@
public void InitPanel()
{
ItemModel itemModel = playerPack.GetItemModelByGUID(itemTipsModel.curAttrData.guid);
- if (itemModel == null || itemModel.packType != PackType.rptItem)
+ if (itemModel == null)
return;
_itemCell.Init(itemModel);
--
Gitblit v1.8.0