From 8b7a13b052b05008d02a3cf586dc642cd2304b4d Mon Sep 17 00:00:00 2001 From: milimoe Date: Sat, 7 Dec 2024 01:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=A3=85=E5=A4=87=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=BF=98=E5=8E=9F=E4=BB=96=E7=9A=84=20EquipSlotType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OshimaCore/Controllers/FunGameController.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OshimaCore/Controllers/FunGameController.cs b/OshimaCore/Controllers/FunGameController.cs index f7f992d..43f67bc 100644 --- a/OshimaCore/Controllers/FunGameController.cs +++ b/OshimaCore/Controllers/FunGameController.cs @@ -323,7 +323,7 @@ namespace Oshima.Core.Controllers } [HttpPost("restoresaved")] - public string RestoreSaved([FromQuery] long? qq = null, [FromQuery] string? name = null) + public string RestoreSaved([FromQuery] long? qq = null) { long userid = qq ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11)); @@ -1052,14 +1052,15 @@ namespace Oshima.Core.Controllers { character = user.Inventory.Characters.ToList()[characterIndex - 1]; Item? item = character.UnEquip(type); - if (item != null) + if (item != null && user.Inventory.Items.Where(i => i.Guid == item.Guid).FirstOrDefault() is Item itemInventory) { + itemInventory.EquipSlotType = EquipSlotType.None; user.LastTime = DateTime.Now; pc.Add("user", user); pc.SaveConfig(); return NetworkUtility.JsonSerialize($"取消装备{ItemSet.GetQualityTypeName(item.QualityType)}{ItemSet.GetItemTypeName(item.ItemType)}【{item.Name}】成功！（{ItemSet.GetEquipSlotTypeName(type)}栏位）"); } - else return NetworkUtility.JsonSerialize($"取消装备失败！角色并没有装备{ItemSet.GetEquipSlotTypeName(type)}。"); + else return NetworkUtility.JsonSerialize($"取消装备失败！角色并没有装备{ItemSet.GetEquipSlotTypeName(type)}，或者库存中不存在此物品！"); } else {