KxGame/Kg.SeaTime
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1212121

Browse Source
This commit is contained in:
Putoo
2026-06-16 18:30:53 +08:00
parent 5d4b5c989a
commit 5cd6151b96
14 changed files with 413 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Service/Application.Domain.Entity/model/UserEquSuit.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Application.Domain.Entity;
public class UserEquSuit
{
public string suitCode { get; set; }
public string suitName { get; set; }
public List<EquSuitAttr> SuitAttr { get; set; }
}

6
Service/Application.Domain/Enum/EquEnum.cs
View File

@@ -21,5 +21,11 @@ public static class EquEnum
Ornaments = 3, //佩戴
Fashion = 1, //时装
Wing = 1, //羽翼
Decorate = 5, //装饰
}
public enum SuitAttrNeedType
{
ON_EQU
}
}

2
Service/Application.Domain/Services/Interface/Equ/IGameEquService.cs
View File

@@ -13,6 +13,7 @@ public interface IGameEquService
RefAsync<int> Total, bool isRemOn = false);
Task<List<unit_user_equ>> GetUserEquData(string userId, int equId);
Task<List<unit_user_equ>> GetUserEquData(string userId, string code, List<string> noUeId);
Task<unit_user_equ> GetUserEquInfo(string ueId);
Task<int> GetUserEquByEquIdCount(string userId, int equId);
Task<List<unit_user_equ>> GetUserEquByEquId(string userId, int equId);
@@ -28,6 +29,7 @@ public interface IGameEquService
Task<List<unit_user_equ>> GetUserOnEqu(string userId);
Task<bool> EquOnOrDown(unit_user_equ data, int state);
Task<List<UserEquSuit>> GetUserEquSuit(string userId);
#endregion
#region 辅助

83
Service/Application.Domain/Services/Service/Equ/GameEquService.cs
View File

@@ -56,11 +56,18 @@ public class GameEquService(ISqlSugarClient DbClient, IRedisCache redis) : IGame
public async Task<List<unit_user_equ>> GetUserEquData(string userId, int equId)
{
long onTime = TimeExtend.GetTimeStampSeconds;
var db = DbClient.AsTenant().GetConnectionWithAttr<unit_user_equ>();
return await db.Queryable<unit_user_equ>().Where(it => it.userId == userId && it.equId == equId).ToListAsync();
}
public async Task<List<unit_user_equ>> GetUserEquData(string userId, string code, List<string> noUeId)
{
var db = DbClient.AsTenant().GetConnectionWithAttr<unit_user_equ>();
return await db.Queryable<unit_user_equ>().Where(it => it.userId == userId && it.code == code)
.WhereIF(noUeId.Count > 0, it => !noUeId.Contains(it.ueId))
.ToListAsync();
}
public async Task<unit_user_equ> GetUserEquInfo(string ueId)
{
var db = DbClient.AsTenant().GetConnectionWithAttr<unit_user_equ>();
@@ -325,6 +332,15 @@ public class GameEquService(ISqlSugarClient DbClient, IRedisCache redis) : IGame
}
}
private async Task ClearUserOnEqu(string userId)
{
var key = string.Format(UserCache.BaseCacheKeys, "EquData", "UserOnEqu");
await redis.DelHashAsync(key, userId);
//清理套装缓存
key = string.Format(UserCache.BaseCacheKeys, "EquData:UserEquSuit", userId);
await redis.DelAsync(key);
}
public async Task<bool> EquOnOrDown(unit_user_equ data, int state)
{
data.isOn = state;
@@ -334,21 +350,84 @@ public class GameEquService(ISqlSugarClient DbClient, IRedisCache redis) : IGame
var equInfo = await GetEquInfo((int)data.equId);
if (equInfo.useTime > 0)
{
data.useEndTime = TimeExtend.GetTimeStampBySeconds(DateTime.Now.AddDays((int)equInfo.useTime)) ;
data.useEndTime = TimeExtend.GetTimeStampBySeconds(DateTime.Now.AddDays((int)equInfo.useTime));
}
}
var db = DbClient.AsTenant().GetConnectionWithAttr<unit_user_equ>();
bool result = await db.Updateable(data).ExecuteCommandAsync() > 0;
if (result)
{
await ClearUserOnEqu(data.userId);
}
return result;
}
/// <summary>
/// 获取个人套装
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<List<UserEquSuit>> GetUserEquSuit(string userId)
{
List<UserEquSuit> result = new List<UserEquSuit>();
long time = TimeExtend.GetTimeStampSeconds;
var key = string.Format(UserCache.BaseCacheKeys, "EquData:UserEquSuit", userId);
if (await redis.ExistsAsync(key))
{
result = await redis.GetAsync<List<UserEquSuit>>(key);
}
else
{
List<string> opSuit = new List<string>();
var onEquData = await GetUserOnEqu(userId);
string[] onEqu = onEquData.Select(it => it.equId.ToString()).ToArray();
onEquData = onEquData.FindAll(it => it.useEndTime > time && it.durability > 0);
foreach (var item in onEquData)
{
if (item.suitCode != "0" && !string.IsNullOrEmpty(item.suitCode))
{
if (!opSuit.Contains(item.suitCode))
{
opSuit.Add(item.suitCode);
}
}
}
foreach (var suit in opSuit)
{
UserEquSuit temp = new UserEquSuit();
var suitInfo = await GetEuqSuitInfo(suit);
if (suitInfo != null)
{
temp.suitCode = suitInfo.suitCode;
temp.suitName = suitInfo.suitName;
temp.SuitAttr = new List<EquSuitAttr>();
foreach (var item in suitInfo.attr)
{
if (item.NeedType == nameof(EquEnum.SuitAttrNeedType.ON_EQU))
{
bool same = item.NeedData.All(item => onEqu.Contains(item));
if (same)
{
temp.SuitAttr.Add(item);
}
}
}
if (temp.SuitAttr.Count > 0) //存在满足条件得属性
{
result.Add(temp);
}
}
}
await redis.SetAsync(key, result, 300);
}
return result;
}
#endregion

85
Service/Application.Web/Controllers/Pub/EquController.cs
View File

@@ -138,7 +138,8 @@ public class EquController : ControllerBase
{
string userId = StateHelper.userId;
var data = await _equService.GetUserOnEqu(userId);
return PoAction.Ok(data);
var suit = await _equService.GetUserEquSuit(userId);
return PoAction.Ok(new { data, suit });
}
/// <summary>
@@ -200,6 +201,7 @@ public class EquController : ControllerBase
return PoAction.Message($"该装备最多穿戴{equInfo.canEqualUp}件!");
}
}
bool isOk = true;
if (string.IsNullOrEmpty(de))
{
@@ -222,6 +224,7 @@ public class EquController : ControllerBase
{
return PoAction.Message("装备未穿戴!");
}
if (DownOnEqu.code != equInfo.code)
{
return PoAction.Message("装备部位不一致!");
@@ -260,6 +263,82 @@ public class EquController : ControllerBase
}
}
}
/// <summary>
/// 获取可穿戴装备
/// </summary>
/// <param name="type"></param>
/// <returns></returns>
[HttpGet]
public async Task<IPoAction> GetCanOnEqu(int type)
{
string code = nameof(EquEnum.EquPlace.Hold);
switch (type)
{
case 1:
code = nameof(EquEnum.EquPlace.Hold);
break;
case 2:
code = nameof(EquEnum.EquPlace.Vice);
break;
case 3:
code = nameof(EquEnum.EquPlace.Head);
break;
case 4:
code = nameof(EquEnum.EquPlace.Wear);
break;
case 5:
code = nameof(EquEnum.EquPlace.Waist);
break;
case 6:
code = nameof(EquEnum.EquPlace.Foot);
break;
case 7:
code = nameof(EquEnum.EquPlace.Ornaments);
break;
case 8:
code = nameof(EquEnum.EquPlace.Fashion);
break;
case 9:
code = nameof(EquEnum.EquPlace.Wing);
break;
case 10:
code = nameof(EquEnum.EquPlace.Decorate);
break;
}
string userId = StateHelper.userId;
var userOnEqu = await _equService.GetUserOnEqu(userId);
var NoEqu = userOnEqu.FindAll(it => it.code == code).Select(it => it.ueId).ToList();
var CanEqu = await _equService.GetUserEquData(userId, code, NoEqu);
long onTime = TimeExtend.GetTimeStampSeconds;
CanEqu = CanEqu.FindAll(it => it.isAppr == 1 && it.useEndTime > onTime);
CanEqu = CanEqu.OrderByDescending(it => it.lev).ToList();
return PoAction.Ok(CanEqu);
}
/// <summary>
/// 获取激活套装属性
/// </summary>
/// <param name="suitCode"></param>
/// <returns></returns>
[HttpGet]
public async Task<IPoAction> GetUserOnSuitInfo(string suitCode)
{
var userId = StateHelper.userId;
var onSuit = await _equService.GetUserEquSuit(userId);
var suit = onSuit.Find(it => it.suitCode == suitCode);
if (suit == null)
{
return PoAction.Message("套装不存在!");
}
var data = await _equService.GetEuqSuitInfo(suitCode);
if (data == null)
{
return PoAction.Message("套装不存在!");
}
return PoAction.Ok(new { data, suit });
}
}

11
Service/Application.Web/Controllers/User/BagController.cs
View File

@@ -24,7 +24,7 @@ public class BagController : ControllerBase
_equService = equService;
_accService = accService;
}
/// <summary>
/// 获取背包信息
/// </summary>
@@ -33,7 +33,6 @@ public class BagController : ControllerBase
public async Task<IPoAction> GetUserBagData()
{
string userId = StateHelper.userId;
var accInfo = await _accService.GetUserAccInfo(userId);
long gold = (long)accInfo.gold;
long cowry = (long)accInfo.cowry;
@@ -76,13 +75,13 @@ public class BagController : ControllerBase
}
var data = await _equService.GetUserEquData(userId, _t, query, page, 10, total);
return PoAction.Ok(new { data, total.Value });
return PoAction.Ok(new { data, total = total.Value});
}
else if (type == 1)
{
List<string> code = new List<string>() { nameof(GoodsEnum.Code.Drug) };
var data = await _goodsService.GetUserGoodsData(userId, code, new List<string>(), query, page, 10, total);
return PoAction.Ok(new { data, total.Value });
return PoAction.Ok(new { data, total = total.Value });
}
else if (type == 2)
{
@@ -120,11 +119,11 @@ public class BagController : ControllerBase
}
var data = await _goodsService.GetUserGoodsData(userId, code, noCode, query, page, 10, total);
return PoAction.Ok(new { data, total.Value });
return PoAction.Ok(new { data, total = total.Value });
}
else
{
return PoAction.Ok(new { data = new List<string>(), total.Value });
return PoAction.Ok(new { data = new List<string>(), total = total.Value });
}
}
}