From dc6b68de1bbe143f16fa0c194732e8adffabc6e4 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 09 十月 2020 00:36:11 +0800
Subject: [PATCH] 8523 【开发】拍品新增取消拍卖按钮
---
System/ItemTip/TipOperateButton.cs | 9
System/KnapSack/Logic/ItemOperateUtility.cs | 656 +++++++++++++++++++++++++++---------------------------
2 files changed, 339 insertions(+), 326 deletions(-)
diff --git a/System/ItemTip/TipOperateButton.cs b/System/ItemTip/TipOperateButton.cs
index 3dd704c..43d3592 100644
--- a/System/ItemTip/TipOperateButton.cs
+++ b/System/ItemTip/TipOperateButton.cs
@@ -32,7 +32,14 @@
switch (type)
{
case ItemOperateType.putAway:
- this.m_Title.text = "涓婃灦";
+ if (ItemLogicUtility.Instance.IsOverdue(guid))
+ {
+ this.m_Title.text = "鍙栨秷鎷嶅搧";
+ }
+ else
+ {
+ this.m_Title.text = "涓婃灦";
+ }
break;
case ItemOperateType.sell:
this.m_Title.text = "鍑哄敭";
diff --git a/System/KnapSack/Logic/ItemOperateUtility.cs b/System/KnapSack/Logic/ItemOperateUtility.cs
index 8317524..47c93a5 100644
--- a/System/KnapSack/Logic/ItemOperateUtility.cs
+++ b/System/KnapSack/Logic/ItemOperateUtility.cs
@@ -10,8 +10,8 @@
public class ItemOperateUtility : Singleton<ItemOperateUtility>
{
EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
- PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
- ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
+ PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
+ ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
BoxGetItemModel BoxModel { get { return ModelCenter.Instance.GetModel<BoxGetItemModel>(); } }
@@ -38,15 +38,15 @@
{
SysNotifyMgr.Instance.ShowTip("GeRen_lhs_31379");
return;
- }
-
- if (ItemLogicUtility.Instance.IsDogzEquip(itemId))
- {
- List<int> indexlist = new List<int>();
- indexlist.Add(item.gridIndex);
- dogzModel.SendPutOnEquip(indexlist);
- return;
- }
+ }
+
+ if (ItemLogicUtility.Instance.IsDogzEquip(itemId))
+ {
+ List<int> indexlist = new List<int>();
+ indexlist.Add(item.gridIndex);
+ dogzModel.SendPutOnEquip(indexlist);
+ return;
+ }
var equipServerIndex = EquipSet.ClientPlaceToServerPlace(new Int2(item.config.LV, item.config.EquipPlace));
var putOnLimits = item.GetUseData((int)ItemUseDataKey.cancelUseLimit);
if (putOnLimits != null && putOnLimits[0] == 1)
@@ -130,34 +130,34 @@
{
var clientPlaceInfo = EquipSet.ServerPlaceToClientPlace(equipPlace);
var oldItem = packModel.GetItemByGuid(equipModel.GetEquip(clientPlaceInfo));
- var newItem = packModel.GetItemByGuid(guid);
-
- if (!ItemLogicUtility.Instance.IsRealmEquip(newItem.itemId))
- {
- PutOnNormalEquip(equipPlace, guid);
- SoundPlayer.Instance.PlayUIAudio(24);
- return;
- }
-
- m_RecordSwitchEquipItemId = oldItem == null ? 0 : oldItem.itemId;
-
- EquipSuitShift(oldItem, newItem, (bool _suitOk) =>
- {
- if (_suitOk)
- {
- EquipDevelopShift(oldItem, newItem, (bool _developOk) =>
- {
- if (_developOk)
- {
- if (oldItem != null)
- {
- EquipAttrShift(equipPlace, oldItem);
- }
- PutOnNormalEquip(equipPlace, guid);
- SoundPlayer.Instance.PlayUIAudio(24);
- }
- });
- }
+ var newItem = packModel.GetItemByGuid(guid);
+
+ if (!ItemLogicUtility.Instance.IsRealmEquip(newItem.itemId))
+ {
+ PutOnNormalEquip(equipPlace, guid);
+ SoundPlayer.Instance.PlayUIAudio(24);
+ return;
+ }
+
+ m_RecordSwitchEquipItemId = oldItem == null ? 0 : oldItem.itemId;
+
+ EquipSuitShift(oldItem, newItem, (bool _suitOk) =>
+ {
+ if (_suitOk)
+ {
+ EquipDevelopShift(oldItem, newItem, (bool _developOk) =>
+ {
+ if (_developOk)
+ {
+ if (oldItem != null)
+ {
+ EquipAttrShift(equipPlace, oldItem);
+ }
+ PutOnNormalEquip(equipPlace, guid);
+ SoundPlayer.Instance.PlayUIAudio(24);
+ }
+ });
+ }
});
}
@@ -198,174 +198,174 @@
}
- private void EquipSuitShift(ItemModel oldItem, ItemModel newItem, Action<bool> callback)
- {
- if (oldItem != null && oldItem.config.SuiteiD > 0 &&
- newItem != null && newItem.config.SuiteiD == 0)
- {
- var suitName = EquipSuitConfig.GetEquipSuitName(oldItem.config.SuiteiD);
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
- Language.Get("EquipShiftRemind_1", suitName),
- (bool isOk) =>
- {
- if (callback != null)
- {
- callback(isOk);
- }
- });
- return;
- }
- if (callback != null)
- {
- callback(true);
- }
+ private void EquipSuitShift(ItemModel oldItem, ItemModel newItem, Action<bool> callback)
+ {
+ if (oldItem != null && oldItem.config.SuiteiD > 0 &&
+ newItem != null && newItem.config.SuiteiD == 0)
+ {
+ var suitName = EquipSuitConfig.GetEquipSuitName(oldItem.config.SuiteiD);
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
+ Language.Get("EquipShiftRemind_1", suitName),
+ (bool isOk) =>
+ {
+ if (callback != null)
+ {
+ callback(isOk);
+ }
+ });
+ return;
+ }
+ if (callback != null)
+ {
+ callback(true);
+ }
}
- private void EquipDevelopShift(ItemModel oldItem, ItemModel newItem, Action<bool> callback)
- {
- if (oldItem != null && newItem != null &&
- oldItem.config.ItemColor > newItem.config.ItemColor)
- {
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
- Language.Get("EquipShiftRemind_2"),
- (bool isOk) =>
- {
- if (callback != null)
- {
- callback(isOk);
- }
- });
- return;
- }
- if (callback != null)
- {
- callback(true);
- }
+ private void EquipDevelopShift(ItemModel oldItem, ItemModel newItem, Action<bool> callback)
+ {
+ if (oldItem != null && newItem != null &&
+ oldItem.config.ItemColor > newItem.config.ItemColor)
+ {
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
+ Language.Get("EquipShiftRemind_2"),
+ (bool isOk) =>
+ {
+ if (callback != null)
+ {
+ callback(isOk);
+ }
+ });
+ return;
+ }
+ if (callback != null)
+ {
+ callback(true);
+ }
}
int m_RecordSwitchEquipItemId = 0;
- public void ShowPutOnNewEquipRemind(int newItemId)
- {
- if (DTC0403_tagPlayerLoginLoadOK.finishedLogin)
- {
- if (m_RecordSwitchEquipItemId != 0)
- {
- var oldConfig = ItemConfig.Get(m_RecordSwitchEquipItemId);
- var newConfig = ItemConfig.Get(newItemId);
-
- var oldNameLabel = StringUtility.Contact(UIHelper.GetEquipSuitName(oldConfig.ID, true),
- UIHelper.AppendColor(oldConfig.ItemColor, oldConfig.ItemName, true));
- var newNameLabel = StringUtility.Contact(UIHelper.GetEquipSuitName(newConfig.ID, true),
- UIHelper.AppendColor(newConfig.ItemColor, newConfig.ItemName, true));
-
- var shiftStar = equipStarModel.GetStarLevel(new Int2(oldConfig.LV, oldConfig.EquipPlace)) > 0;
-
- var shiftStrength = false;
- if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Strength))
- {
- shiftStrength = equipStrengthModel.GetStrengthLevel(oldConfig.LV, oldConfig.EquipPlace) > 0;
- }
-
- var shiftGem = false;
- int[] equipGems;
- if (equipGemModel.TryGetEquipGems(oldConfig.LV, oldConfig.EquipPlace, out equipGems))
- {
- foreach (var id in equipGems)
- {
- if (id > 0)
- {
- shiftGem = true;
- break;
- }
- }
- }
-
- var shiftTrain = equipTrainModel.GetTrainLevel(new Int2(oldConfig.LV, oldConfig.EquipPlace)) > 0;
-
- if (shiftStar || shiftStrength || shiftGem || shiftTrain)
- {
- var shiftSb = new StringBuilder();
- if (shiftStar)
- {
- shiftSb.Append(Language.Get("EquipShiftRemind_Star"));
- }
- if (shiftStrength)
- {
- if (shiftSb.Length > 0)
- {
- shiftSb.Append("銆�");
- }
- shiftSb.Append(Language.Get("EquipShiftRemind_Strength"));
- }
- if (shiftGem)
- {
- if (shiftSb.Length > 0)
- {
- shiftSb.Append("銆�");
- }
- shiftSb.Append(Language.Get("EquipShiftRemind_Gem"));
- }
- if (shiftTrain)
- {
- if (shiftSb.Length > 0)
- {
- shiftSb.Append("銆�");
- }
- shiftSb.Append(Language.Get("EquipShiftRemind_Train"));
- }
-
-
- if (newConfig.ItemColor >= oldConfig.ItemColor)
- {
- if (!DayRemind.Instance.GetDayRemind(DayRemind.SHIFTEQUIPREMIND1))
- {
- ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"),
- Language.Get("EquipShiftRemind_3", oldNameLabel, newNameLabel, shiftSb.ToString()),
- Language.Get("TodayNoNotify"),
- (bool isOk) =>
- {
- DayRemind.Instance.SetDayRemind(DayRemind.SHIFTEQUIPREMIND1, isOk);
- });
- }
- }
- else
- {
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
- Language.Get("EquipShiftRemind_4", oldNameLabel, newNameLabel, shiftSb.ToString()));
- }
- }
- }
- }
- m_RecordSwitchEquipItemId = 0;
+ public void ShowPutOnNewEquipRemind(int newItemId)
+ {
+ if (DTC0403_tagPlayerLoginLoadOK.finishedLogin)
+ {
+ if (m_RecordSwitchEquipItemId != 0)
+ {
+ var oldConfig = ItemConfig.Get(m_RecordSwitchEquipItemId);
+ var newConfig = ItemConfig.Get(newItemId);
+
+ var oldNameLabel = StringUtility.Contact(UIHelper.GetEquipSuitName(oldConfig.ID, true),
+ UIHelper.AppendColor(oldConfig.ItemColor, oldConfig.ItemName, true));
+ var newNameLabel = StringUtility.Contact(UIHelper.GetEquipSuitName(newConfig.ID, true),
+ UIHelper.AppendColor(newConfig.ItemColor, newConfig.ItemName, true));
+
+ var shiftStar = equipStarModel.GetStarLevel(new Int2(oldConfig.LV, oldConfig.EquipPlace)) > 0;
+
+ var shiftStrength = false;
+ if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Strength))
+ {
+ shiftStrength = equipStrengthModel.GetStrengthLevel(oldConfig.LV, oldConfig.EquipPlace) > 0;
+ }
+
+ var shiftGem = false;
+ int[] equipGems;
+ if (equipGemModel.TryGetEquipGems(oldConfig.LV, oldConfig.EquipPlace, out equipGems))
+ {
+ foreach (var id in equipGems)
+ {
+ if (id > 0)
+ {
+ shiftGem = true;
+ break;
+ }
+ }
+ }
+
+ var shiftTrain = equipTrainModel.GetTrainLevel(new Int2(oldConfig.LV, oldConfig.EquipPlace)) > 0;
+
+ if (shiftStar || shiftStrength || shiftGem || shiftTrain)
+ {
+ var shiftSb = new StringBuilder();
+ if (shiftStar)
+ {
+ shiftSb.Append(Language.Get("EquipShiftRemind_Star"));
+ }
+ if (shiftStrength)
+ {
+ if (shiftSb.Length > 0)
+ {
+ shiftSb.Append("銆�");
+ }
+ shiftSb.Append(Language.Get("EquipShiftRemind_Strength"));
+ }
+ if (shiftGem)
+ {
+ if (shiftSb.Length > 0)
+ {
+ shiftSb.Append("銆�");
+ }
+ shiftSb.Append(Language.Get("EquipShiftRemind_Gem"));
+ }
+ if (shiftTrain)
+ {
+ if (shiftSb.Length > 0)
+ {
+ shiftSb.Append("銆�");
+ }
+ shiftSb.Append(Language.Get("EquipShiftRemind_Train"));
+ }
+
+
+ if (newConfig.ItemColor >= oldConfig.ItemColor)
+ {
+ if (!DayRemind.Instance.GetDayRemind(DayRemind.SHIFTEQUIPREMIND1))
+ {
+ ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"),
+ Language.Get("EquipShiftRemind_3", oldNameLabel, newNameLabel, shiftSb.ToString()),
+ Language.Get("TodayNoNotify"),
+ (bool isOk) =>
+ {
+ DayRemind.Instance.SetDayRemind(DayRemind.SHIFTEQUIPREMIND1, isOk);
+ });
+ }
+ }
+ else
+ {
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
+ Language.Get("EquipShiftRemind_4", oldNameLabel, newNameLabel, shiftSb.ToString()));
+ }
+ }
+ }
+ }
+ m_RecordSwitchEquipItemId = 0;
}
- public void GotoPutOnEquip(string guid)
- {
- //搴熷純
- return;
- //var item = packModel.GetItemByGuid(guid);
- //if (item == null)
- //{
- // return;
- //}
-
- //if (ItemLogicUtility.Instance.IsRealmEquip(item.itemId))
- //{
- // WindowCenter.Instance.Close<KnapSackWin>();
- // WindowCenter.Instance.Close<EquipTipWin>();
- // WindowCenter.Instance.Open<RealmEquipWin>();
-
- // Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });
- //}
-
- //if (ItemLogicUtility.Instance.IsSpiritWeapon(item.itemId))
- //{
- // WindowCenter.Instance.Close<KnapSackWin>();
- // WindowCenter.Instance.Close<EquipTipWin>();
- // WindowCenter.Instance.Open("SpiritEquipWin");
-
- // Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });
- //}
+ public void GotoPutOnEquip(string guid)
+ {
+ //搴熷純
+ return;
+ //var item = packModel.GetItemByGuid(guid);
+ //if (item == null)
+ //{
+ // return;
+ //}
+
+ //if (ItemLogicUtility.Instance.IsRealmEquip(item.itemId))
+ //{
+ // WindowCenter.Instance.Close<KnapSackWin>();
+ // WindowCenter.Instance.Close<EquipTipWin>();
+ // WindowCenter.Instance.Open<RealmEquipWin>();
+
+ // Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });
+ //}
+
+ //if (ItemLogicUtility.Instance.IsSpiritWeapon(item.itemId))
+ //{
+ // WindowCenter.Instance.Close<KnapSackWin>();
+ // WindowCenter.Instance.Close<EquipTipWin>();
+ // WindowCenter.Instance.Open("SpiritEquipWin");
+
+ // Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });
+ //}
}
public void PutOffEquip(string guid)
@@ -374,12 +374,12 @@
if (item == null)
{
return;
- }
-
- if (ItemLogicUtility.Instance.IsDogzEquip(item.itemId))
- {
- dogzModel.CheckPutOff(item.gridIndex%5+101);
- return;
+ }
+
+ if (ItemLogicUtility.Instance.IsDogzEquip(item.itemId))
+ {
+ dogzModel.CheckPutOff(item.gridIndex%5+101);
+ return;
}
var equipPlace = EquipModel.GetItemServerEquipPlace(item.itemId);
@@ -454,26 +454,26 @@
public ItemModel useItemModel { get; set; }
public void GotoUseItem(string guid)
{
- useItemModel = packModel.GetItemByGuid(guid);
+ useItemModel = packModel.GetItemByGuid(guid);
if (useItemModel == null)
{
return;
}
- if (ItemLogicUtility.Instance.IsSpiritWeapon(useItemModel.itemId))
- {
- var serverIndex = EquipSet.ClientPlaceToServerPlace(new Int2(useItemModel.config.LV, useItemModel.config.EquipPlace));
- PutOnEquip(serverIndex, guid);
- return;
- }
-
- if (ItemLogicUtility.Instance.IsThanksItem(useItemModel.itemId))
- {
- var send = new CB014_tagCGUseAssistThanksGift();
- send.IsPreview = 1;
- send.ItemID = (uint)useItemModel.itemId;
- GameNetSystem.Instance.SendInfo(send);
- return;
+ if (ItemLogicUtility.Instance.IsSpiritWeapon(useItemModel.itemId))
+ {
+ var serverIndex = EquipSet.ClientPlaceToServerPlace(new Int2(useItemModel.config.LV, useItemModel.config.EquipPlace));
+ PutOnEquip(serverIndex, guid);
+ return;
+ }
+
+ if (ItemLogicUtility.Instance.IsThanksItem(useItemModel.itemId))
+ {
+ var send = new CB014_tagCGUseAssistThanksGift();
+ send.IsPreview = 1;
+ send.ItemID = (uint)useItemModel.itemId;
+ GameNetSystem.Instance.SendInfo(send);
+ return;
}
switch (useItemModel.config.Type)
@@ -484,32 +484,32 @@
case 83:
var fashionModel = ModelCenter.Instance.GetModel<FashionDressModel>();
fashionModel.jumpFashionDress = useItemModel.config.EffectValueA1;
- break;
+ break;
case 55:
- if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BlastFurnace))
- {
- FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.BlastFurnace);
- return;
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BlastFurnace))
+ {
+ FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.BlastFurnace);
+ return;
}
var alchemyId = 0;
- if (alchemyModel.TryGetAlchemyByStudyMaterial(useItemModel.itemId, out alchemyId))
- {
- var alchemyConfig = AlchemyConfig.Get(alchemyId);
- int alchemingId;
- if (alchemyModel.IsStoveAlcheming((AlchemyType)alchemyConfig.AlchemType, out alchemingId))
- {
- SysNotifyMgr.Instance.ShowTip("AlchemyStudyJumpError_1");
- return;
- }
- if (alchemyModel.IsGraspRecipe(alchemyId))
- {
- SysNotifyMgr.Instance.ShowTip("AlchemyStudyJumpError_2");
- return;
- }
- alchemyModel.jumpAlchemy = alchemyId;
+ if (alchemyModel.TryGetAlchemyByStudyMaterial(useItemModel.itemId, out alchemyId))
+ {
+ var alchemyConfig = AlchemyConfig.Get(alchemyId);
+ int alchemingId;
+ if (alchemyModel.IsStoveAlcheming((AlchemyType)alchemyConfig.AlchemType, out alchemingId))
+ {
+ SysNotifyMgr.Instance.ShowTip("AlchemyStudyJumpError_1");
+ return;
+ }
+ if (alchemyModel.IsGraspRecipe(alchemyId))
+ {
+ SysNotifyMgr.Instance.ShowTip("AlchemyStudyJumpError_2");
+ return;
+ }
+ alchemyModel.jumpAlchemy = alchemyId;
WindowJumpMgr.Instance.WindowJumpTo((AlchemyType)alchemyConfig.AlchemType == AlchemyType.Normal ?
JumpUIType.AlchemyNormal : JumpUIType.AlchemyFairy);
- }
+ }
return;
}
@@ -534,16 +534,16 @@
if (CheckItemUselimit(useItemModel.itemId))
{
var fruitConfig = AttrFruitConfig.Get(useItemModel.itemId);
- if (fruitConfig != null)
- {
- if (fruitConfig.drugType == (int)AlchemyType.Normal)
- {
+ if (fruitConfig != null)
+ {
+ if (fruitConfig.drugType == (int)AlchemyType.Normal)
+ {
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UseNormalDrug);
- }
- else if (fruitConfig.drugType == (int)AlchemyType.Fairy)
- {
+ }
+ else if (fruitConfig.drugType == (int)AlchemyType.Fairy)
+ {
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UseFairyDrug);
- }
+ }
}
}
return;
@@ -674,13 +674,13 @@
if (itemModel.itemId == 952)
{
- if (!CheckIsMaxOfflineTime(1, itemModel))
- {
- UseItem(itemModel.guid);
- }
- else
- {
- return false;
+ if (!CheckIsMaxOfflineTime(1, itemModel))
+ {
+ UseItem(itemModel.guid);
+ }
+ else
+ {
+ return false;
}
return true;
@@ -750,9 +750,9 @@
}
}
return true;
- }
-
-
+ }
+
+
public int GetOfflineMaxNum(ItemModel itemModel)
{
int remainOffline = HangUpSetModel.Instance.maxOfflinePluginTime - HangUpSetModel.Instance.offlinePluginTime;
@@ -842,22 +842,22 @@
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;
- }
+ 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;
@@ -892,33 +892,33 @@
GameNetSystem.Instance.SendToCrossServer(useItem);
}
- public void ProcessOverdueItem(string guid)
- {
- var item = packModel.GetItemByGuid(guid);
- if (item == null)
- {
- return;
- }
-
- var info = new CA308_tagCMItemTimeout();
- info.PackType = (byte)item.packType;
- info.ItemIndex = (byte)item.gridIndex;
- GameNetSystem.Instance.SendInfo(info);
- }
-
+ public void ProcessOverdueItem(string guid)
+ {
+ var item = packModel.GetItemByGuid(guid);
+ if (item == null)
+ {
+ return;
+ }
+
+ var info = new CA308_tagCMItemTimeout();
+ info.PackType = (byte)item.packType;
+ info.ItemIndex = (byte)item.gridIndex;
+ GameNetSystem.Instance.SendInfo(info);
+ }
+
#endregion
-
-
+
+
public string splitGuid;
public int splitItemTotalCount;
#region 鎷嗗垎
public void OnClickSplitBtn(string guid)
- {
- splitGuid = guid;
- var item = packModel.GetItemByGuid(guid);
- if (item == null)
- {
- return;
+ {
+ splitGuid = guid;
+ var item = packModel.GetItemByGuid(guid);
+ if (item == null)
+ {
+ return;
}
splitItemTotalCount = item.count;
@@ -965,6 +965,12 @@
return;
}
+ if (ItemLogicUtility.Instance.IsOverdue(guid))
+ {
+ //鍙栨秷鎷嶅搧
+ ItemOperateUtility.Instance.ProcessOverdueItem(guid);
+ return;
+ }
var auctionHelpModel = ModelCenter.Instance.GetModel<AuctionHelpModel>();
auctionHelpModel.ItemModel = itemModel;
WindowCenter.Instance.Open<AuctionShelfWin>();
@@ -975,19 +981,19 @@
public void GotoInlayItem(string guid)
{
var item = packModel.GetItemByGuid(guid);
- if (item == null)
- {
- return;
- }
- var equipGemModel = ModelCenter.Instance.GetModel<EquipGemModel>();
- if (ItemLogicUtility.Instance.IsRealmEquip(item.itemId))
- {
- equipGemModel.jumpEquipPosition = new Int2(item.config.LV, item.config.EquipPlace);
+ if (item == null)
+ {
+ return;
}
- else
- {
- equipGemModel.jumpEquipPosition = equipGemModel.TryGotoUseGem(item.itemId);
- }
+ var equipGemModel = ModelCenter.Instance.GetModel<EquipGemModel>();
+ if (ItemLogicUtility.Instance.IsRealmEquip(item.itemId))
+ {
+ equipGemModel.jumpEquipPosition = new Int2(item.config.LV, item.config.EquipPlace);
+ }
+ else
+ {
+ equipGemModel.jumpEquipPosition = equipGemModel.TryGotoUseGem(item.itemId);
+ }
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc3);
}
@@ -1008,9 +1014,9 @@
public void GotoStrengthen(string guid)
{
var item = packModel.GetItemByGuid(guid);
- if (item == null)
- {
- return;
+ if (item == null)
+ {
+ return;
}
var equipStrengthModel = ModelCenter.Instance.GetModel<EquipStrengthModel>();
equipStrengthModel.jumpEquipPosition = new Int2(item.config.LV, item.config.EquipPlace);
@@ -1044,9 +1050,9 @@
public void SellItem(string guid)
{
var item = packModel.GetItemByGuid(guid);
- if (item == null)
- {
- return;
+ if (item == null)
+ {
+ return;
}
if (ItemLogicUtility.Instance.IsRealmEquip(item.itemId) || ItemLogicUtility.Instance.IsSpiritWeapon(item.itemId))
@@ -1113,24 +1119,24 @@
private void SendSellQuest(string guid)
{
var item = packModel.GetItemByGuid(guid);
- if (item == null)
- {
- return;
+ if (item == null)
+ {
+ return;
}
- if (item.packType != PackType.Item)
- {
- return;
+ if (item.packType != PackType.Item)
+ {
+ return;
}
var sellItem = new C0806_tagCPlayerSellItem();
sellItem.PackType = (byte)item.packType;
sellItem.ItemIndex = (byte)item.gridIndex;
GameNetSystem.Instance.SendInfo(sellItem);
- }
-
+ }
+
#endregion
-
+
#region 缁垂
// 鏀规垚鍓嶅線璐拱锛屽啓姝荤伒鐭冲晢鍩�
public void RenewalItem(string guid)
--
Gitblit v1.8.0