12121

Service/Application.Domain/Enum/GoodsEnum.cs

@@ -14,5 +14,8 @@ public static class GoodsEnum
         Card,//附魔卡片
         Mark,//圣痕
         Pack,//宝箱
+        Weight,//负重
+        Exp,//经验
+        State,//状态物品
     }
 }

Service/Application.Domain/Services/Service/User/UnitUserAttrService.cs

@@ -200,9 +200,6 @@ public class UnitUserAttrService(ISqlSugarClient DbClient, IRedisCache redis) :
 
         if (result && IsUpUserAttr)
         {
-            //增加负重
-            var wightService = App.GetService<IUnitUserWeight>();
-            await wightService.UpdateUserMaxWeight(userId, 1, GameConfig.UpLevAddWeight, 1, 0, "升级增加负重");
             await ClearUserAttrCache(userId);
         }
 

Service/Application.Domain/Services/Service/User/UnitUserService.cs

@@ -268,9 +268,7 @@ public class UnitUserService(ISqlSugarClient DbClient, IRedisCache redis) : IUni
 
         if (result)//注册各项后处理
         {
-            //赠送初始负重
-            var weightService = App.GetService<IUnitUserWeight>();
-            await weightService.UpdateUserMaxWeight(userId, 1, 100, 1, 0, "初始负重");
+           
         }
 
         return result;

Service/Application.Domain/Services/Service/User/UnitUserWeight.cs

@@ -19,8 +19,12 @@ public class UnitUserWeight(ISqlSugarClient DbClient, IRedisCache redis) : IUnit
 
     private async Task<int> GetUserMaxWeight(unit_user_weight data)
     {
-        int result = (int)data.maxWeight;
+        int result = 100 + (int)data.maxWeight;
+        var attrService = App.GetService<IUnitUserAttrService>();
+        int myLev = await attrService.GetUserLev(data.userId);
+        result += myLev * GameConfig.UpLevAddWeight;
         //其他属性加层
+        
         return result;
     }
 
@@ -41,7 +45,7 @@ public class UnitUserWeight(ISqlSugarClient DbClient, IRedisCache redis) : IUnit
 
         return result;
     }
-    
+
     public async Task<bool> UpdateUserWeight(string userId, int op, int weight)
     {
         var db = DbClient.AsTenant().GetConnectionWithAttr<unit_user_weight>();
@@ -119,6 +123,7 @@ public class UnitUserWeight(ISqlSugarClient DbClient, IRedisCache redis) : IUnit
     }
 
     #region 船只相关
+
     public async Task<unit_user_ship> GetUserShipInfo(string usId)
     {
         string key = string.Format(UserCache.BaseCacheKeys, "UserShip", "Info");
@@ -132,6 +137,7 @@ public class UnitUserWeight(ISqlSugarClient DbClient, IRedisCache redis) : IUnit
 
         return data;
     }
+
     public async Task<List<unit_user_ship>> GetUserShip(string userId)
     {
         string key = string.Format(UserCache.BaseCacheKeys, "WeightData", "Ship");

Service/Application.Web/Controllers/Pub/GoodsController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 
 namespace Application.Web.Controllers.Pub;
 
@@ -11,10 +12,17 @@ namespace Application.Web.Controllers.Pub;
 public class GoodsController : ControllerBase
 {
     private readonly IGameGoodsService _goodsService;
+    private readonly IUnitUserAttrService _attrService;
+    private readonly IMessageService _messageService;
+    private readonly IUnitUserWeight _weightService;
 
-    public GoodsController(IGameGoodsService goodsService)
+    public GoodsController(IGameGoodsService goodsService, IUnitUserAttrService attrService,
+        IMessageService messageService, IUnitUserWeight weightService)
     {
         _goodsService = goodsService;
+        _attrService = attrService;
+        _messageService = messageService;
+        _weightService = weightService;
     }
 
     /// <summary>
@@ -37,11 +45,87 @@ public class GoodsController : ControllerBase
         switch (goodsInfo.code)
         {
             case "Pack":
-            UseState = 1;
+                UseState = 1;
+                break;
+            case "Weight":
+                UseState = 1;
                 break;
         }
-        
+
 
         return PoAction.Ok(new { goods = goodsInfo, count, use = UseState });
     }
+
+    /// <summary>
+    /// 使用物品
+    /// </summary>
+    /// <param name="goodsId"></param>
+    /// <param name="count"></param>
+    /// <returns></returns>
+    [HttpGet]
+    public async Task<IPoAction> UseGoods(int goodsId, int count)
+    {
+        count = count < 1 ? 1 : count;
+        string userId = StateHelper.userId;
+        var goodsInfo = await _goodsService.GetGoodsInfo(goodsId);
+        if (goodsInfo == null)
+        {
+            return PoAction.Message("物品不存在!");
+        }
+
+        var MyGoods = await _goodsService.GetUserGoodsCount(userId, goodsId);
+        if (MyGoods < count)
+        {
+            return PoAction.Message("物品不足!");
+        }
+
+        var myLev = await _attrService.GetUserLev(userId);
+        if (myLev < (int)goodsInfo.lev)
+        {
+            return PoAction.Message($"该物品{goodsInfo.lev}级才可使用!");
+        }
+
+        if (await _goodsService.UpdateUserGoods(userId, 0, goodsId, count, "使用物品"))
+        {
+            string message = "";
+            if (goodsInfo.code == nameof(GoodsEnum.Code.Pack)) //使用礼包
+            {
+                var park = JsonConvert.DeserializeObject<RandomModel>(goodsInfo.content);
+                var award = GameBus.GetRandomGoods(park, count);
+                if (award.Count > 0)
+                {
+                    message = $"打开[{goodsInfo.goodsName}]×{count},获得:";
+                    foreach (var item in award)
+                    {
+                        message += $"{item.name}+{item.count},";
+                    }
+
+                    message = message.TrimEnd(',');
+                    await GameBus.UpdateBag(userId, 1, award, $"打开礼包:{goodsInfo.goodsName}×{count}获得");
+
+                    await _messageService.SendBroadcast(userId, nameof(MessageEnum.BroadcastCode.Award), message);
+                }
+                else
+                {
+                    message = "空空如也，什么也没有得到!";
+                }
+            }
+            else if (goodsInfo.code == nameof(GoodsEnum.Code.Weight))
+            {
+                int unitWeight = Convert.ToInt32(goodsInfo.content);
+                await _weightService.UpdateUserMaxWeight(userId, 1, unitWeight, count, goodsInfo.goodsId,
+                    goodsInfo.goodsName);
+                message = $"使用[{goodsInfo.goodsName}]×{count},负重+{unitWeight * count}";
+            }
+            else if (goodsInfo.code == nameof(GoodsEnum.Code.State))
+            {
+            }
+
+            return PoAction.Ok(true, message);
+        }
+        else
+        {
+            return PoAction.Message("使用失败,请稍后尝试!");
+        }
+    }
 }