project-redbud/FunGame-Core
6
1
Fork 1
mirror of https://github.com/project-redbud/FunGame-Core.git synced 2025-12-05 08:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化商店系统

Browse Source
This commit is contained in:
milimoe 2025-07-19 08:35:15 +08:00
parent 79801ee594
commit b1bfcc5577
Signed by: milimoe
GPG Key ID: 9554D37E4B8991D0
4 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Entity/Trade/Goods.cs
View File

@ -41,7 +41,7 @@ namespace Milimoe.FunGame.Core.Entity
builder.AppendLine($"商品描述：{Description}");
builder.AppendLine($"商品售价：{(Prices.Count > 0 ? string.Join("、", Prices.Select(kv => $"{kv.Value} {kv.Key}")) : "免费")}");
builder.AppendLine($"包含物品：{string.Join("、", Items.Select(i => $"[{ItemSet.GetQualityTypeName(i.QualityType)}|{ItemSet.GetItemTypeName(i.ItemType)}] {i.Name}"))}");
builder.AppendLine($"剩余库存：{Stock}");
builder.AppendLine($"剩余库存：{(Stock == -1 ? "不限量提供" : Stock)}");
return builder.ToString().Trim();
}

23
Entity/Trade/Store.cs
View File

@ -10,6 +10,9 @@ namespace Milimoe.FunGame.Core.Entity
public DateTime? StartTime { get; set; } = null;
public DateTime? EndTime { get; set; } = null;
public Dictionary<long, Goods> Goods { get; } = [];
public bool AutoRefresh { get; set; } = false;
public DateTime NextRefreshDate { get; set; } = DateTime.MinValue;
public int RefreshInterval { get; set; } = 1; // Days
public Store(string name, User? user = null)
{
@ -27,7 +30,7 @@ namespace Milimoe.FunGame.Core.Entity
builder.AppendLine($"☆★☆ {Name} ☆★☆");
if (StartTime.HasValue && EndTime.HasValue)
{
builder.AppendLine($"营业时间：{StartTime.Value.ToString(General.GeneralDateTimeFormatChinese)}至{EndTime.Value.ToString(General.GeneralDateTimeFormatChinese)}");
builder.AppendLine($"营业时间：{StartTime.Value.ToString(General.GeneralDateTimeFormatChinese)} 至 {EndTime.Value.ToString(General.GeneralDateTimeFormatChinese)}");
}
else if (StartTime.HasValue && !EndTime.HasValue)
{
@ -46,6 +49,11 @@ namespace Milimoe.FunGame.Core.Entity
{
builder.AppendLine(goods.ToString());
}
builder.AppendLine("提示：使用【商店查看+序号】查看物品详细信息，使用【商店购买+序号】购买物品（指令在 2 分钟内可用）。");
if (AutoRefresh)
{
builder.AppendLine($"商品将在 {NextRefreshDate.ToString(General.GeneralDateTimeFormatChinese)} 刷新。");
}
return builder.ToString().Trim();
}
@ -102,6 +110,19 @@ namespace Milimoe.FunGame.Core.Entity
return price;
}
public void UpdateRefreshTime(DateTime? time = null)
{
if (AutoRefresh)
{
time ??= DateTime.Now;
NextRefreshDate = time.Value.AddDays(RefreshInterval);
}
else
{
NextRefreshDate = DateTime.MinValue;
}
}
public override bool Equals(IBaseEntity? other)
{
return other is Store && other.GetIdName() == GetIdName();

45
Library/Common/JsonConverter/StoreConverter.cs
View File

@ -2,6 +2,7 @@
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Common.Architecture;
using Milimoe.FunGame.Core.Library.Constant;
namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
{
@ -19,6 +20,28 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
case nameof(Store.Name):
result.Name = reader.GetString() ?? "";
break;
case nameof(Store.StartTime):
string dateString = reader.GetString() ?? "";
if (DateTime.TryParseExact(dateString, General.GeneralDateTimeFormat, null, System.Globalization.DateTimeStyles.None, out DateTime time))
{
result.StartTime = time;
}
else
{
result.StartTime = DateTime.MinValue;
}
break;
case nameof(Store.EndTime):
dateString = reader.GetString() ?? "";
if (DateTime.TryParseExact(dateString, General.GeneralDateTimeFormat, null, System.Globalization.DateTimeStyles.None, out time))
{
result.EndTime = time;
}
else
{
result.EndTime = DateTime.MinValue;
}
break;
case nameof(Store.Goods):
Dictionary<long, Goods> goods = NetworkUtility.JsonDeserialize<Dictionary<long, Goods>>(ref reader, options) ?? [];
foreach (long id in goods.Keys)
@ -26,6 +49,23 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
result.Goods[id] = goods[id];
}
break;
case nameof(Store.AutoRefresh):
result.AutoRefresh = reader.GetBoolean();
break;
case nameof(Store.NextRefreshDate):
dateString = reader.GetString() ?? "";
if (DateTime.TryParseExact(dateString, General.GeneralDateTimeFormat, null, System.Globalization.DateTimeStyles.None, out time))
{
result.NextRefreshDate = time;
}
else
{
result.NextRefreshDate = DateTime.MinValue;
}
break;
case nameof(Store.RefreshInterval):
result.RefreshInterval = Convert.ToInt32(reader.GetInt64());
break;
}
}
@ -34,8 +74,13 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
writer.WriteStartObject();
writer.WriteString(nameof(Store.Name), value.Name);
if (value.StartTime.HasValue) writer.WriteString(nameof(Store.StartTime), value.StartTime.Value.ToString(General.GeneralDateTimeFormat));
if (value.EndTime.HasValue) writer.WriteString(nameof(Store.EndTime), value.EndTime.Value.ToString(General.GeneralDateTimeFormat));
writer.WritePropertyName(nameof(Store.Goods));
JsonSerializer.Serialize(writer, value.Goods, options);
writer.WriteBoolean(nameof(Store.AutoRefresh), value.AutoRefresh);
writer.WriteString(nameof(Store.NextRefreshDate), value.NextRefreshDate.ToString(General.GeneralDateTimeFormat));
writer.WriteNumber(nameof(Store.RefreshInterval), value.RefreshInterval);
writer.WriteEndObject();
}

6
Model/GamingQueue.cs
View File

@ -589,9 +589,9 @@ namespace Milimoe.FunGame.Core.Model
// 统计
_stats[character].LiveRound += 1;
_stats[character].LiveTime += timeToReduce;
_stats[character].DamagePerRound = _stats[character].TotalDamage / _stats[character].LiveRound;
_stats[character].DamagePerTurn = _stats[character].TotalDamage / _stats[character].ActionTurn;
_stats[character].DamagePerSecond = _stats[character].TotalDamage / _stats[character].LiveTime;
_stats[character].DamagePerRound = _stats[character].LiveRound == 0 ? 0 : _stats[character].TotalDamage / _stats[character].LiveRound;
_stats[character].DamagePerTurn = _stats[character].ActionTurn == 0 ? 0 : _stats[character].TotalDamage / _stats[character].ActionTurn;
_stats[character].DamagePerSecond = _stats[character].LiveTime == 0 ? 0 : _stats[character].TotalDamage / _stats[character].LiveTime;
// 回血回蓝
double recoveryHP = character.HR * timeToReduce;