diff --git a/Entity/Item/Item.cs b/Entity/Item/Item.cs index 6b8148d..52bf5f5 100644 --- a/Entity/Item/Item.cs +++ b/Entity/Item/Item.cs @@ -324,11 +324,11 @@ namespace Milimoe.FunGame.Core.Entity /// 局外(库存)使用物品触发 /// /// - public bool UseItem(User user, Dictionary args) + public bool UseItem(User user, int times, Dictionary args) { if (User != null) { - bool result = OnItemUsed(user, args); + bool result = OnItemUsed(user, times, args); if (result) { EntityState = EntityState.Modified; @@ -342,11 +342,11 @@ namespace Milimoe.FunGame.Core.Entity /// /// 使用后减少使用次数或删除物品 /// - public void ReduceTimesAndRemove() + public void ReduceTimesAndRemove(int times = 1) { if (IsReduceTimesAfterUse) { - RemainUseTimes--; + RemainUseTimes -= times; } if (RemainUseTimes < 0) RemainUseTimes = 0; if (IsRemoveAfterUse && RemainUseTimes == 0) @@ -371,9 +371,10 @@ namespace Milimoe.FunGame.Core.Entity /// 当物品被玩家使用时 /// /// + /// /// /// - protected virtual bool OnItemUsed(User user, Dictionary args) + protected virtual bool OnItemUsed(User user, int times, Dictionary args) { return false; } diff --git a/Entity/User/User.cs b/Entity/User/User.cs index 323928c..78342c5 100644 --- a/Entity/User/User.cs +++ b/Entity/User/User.cs @@ -7,6 +7,7 @@ namespace Milimoe.FunGame.Core.Entity public class User : BaseEntity { public static readonly User Empty = new(); + public override string Name => Username; public string Username { get; set; } = ""; public DateTime RegTime { get; set; } public DateTime LastTime { get; set; } diff --git a/Library/Constant/ConstantSet.cs b/Library/Constant/ConstantSet.cs index 8ba1a72..2550f58 100644 --- a/Library/Constant/ConstantSet.cs +++ b/Library/Constant/ConstantSet.cs @@ -43,6 +43,25 @@ namespace Milimoe.FunGame.Core.Library.Constant _ => "已结束" }; } + + public static string GetOfferStatus(OfferState status) + { + return status switch + { + OfferState.Created => "已创建", + OfferState.Cancelled => "已取消", + OfferState.PendingOfferorConfirmation => "等待发起方确认", + OfferState.PendingOffereeConfirmation => "等待接收方确认", + OfferState.OfferorConfirmed => "发起方已确认", + OfferState.OffereeConfirmed => "接收方已确认", + OfferState.Sent => "已发送", + OfferState.Negotiating => "协商中", + OfferState.NegotiationAccepted => "协商已接受", + OfferState.Rejected => "已拒绝", + OfferState.Completed => "已完成", + _ => "已过期" + }; + } } ///