1212

Service/Application.Web/Controllers/Map/MapController.cs

@@ -22,11 +22,12 @@ public class MapController : ControllerBase
     private readonly IGameGoodsService _goodsService;
     private readonly IGameTeamService _teamService;
     private readonly IGameMonsterService _monsterService;
+    private readonly IGameFightService _fightService;
 
     public MapController(IUnitUserService userService, IGameMapService mapService, IGameChatService chatService,
         IUnitUserAttrService attrService, IMessageService messageService, IUnitUserWeight weightService,
         IUnitUserAccService accService, IGameSkillService skillService, IGameGoodsService goodsService,
-        IGameTeamService teamService, IGameMonsterService monsterService)
+        IGameTeamService teamService, IGameMonsterService monsterService,IGameFightService fightService)
     {
         _userService = userService;
         _mapService = mapService;
@@ -39,6 +40,7 @@ public class MapController : ControllerBase
         _goodsService = goodsService;
         _teamService = teamService;
         _monsterService = monsterService;
+        _fightService = fightService;
     }
 
     #region 地图相关
@@ -141,6 +143,9 @@ public class MapController : ControllerBase
 
         var broadcast = await _messageService.GetBroadcastData(area);
 
+        var userFight = await _fightService.GetUserFight(userId);
+        string fightId = userFight.Count > 0 ? userFight[0] : "";
+        
         object ret = new
         {
             mapInfo,
@@ -153,7 +158,8 @@ public class MapController : ControllerBase
             business,
             mapRes,
             broadcast,
-            monster = monsterData
+            monster = monsterData,
+            fightId
         };
 
         return PoAction.Ok(ret);