diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index a557301d6..f8bfe423a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -8,6 +8,8 @@ import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.ktbeans.ReportEventEnum; +import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; @@ -289,6 +291,16 @@ public class EndExpeditionBattleRequest extends BaseHandler itemList = drop.getItemlistList(); + List itemId = new ArrayList<>(itemList.size()); + List itemNum = new ArrayList<>(itemList.size()); + itemList.forEach(item->{ + itemId.add(item.getItemId()); + itemNum.add(item.getItemNum()); + }); + + ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),user.getExpeditionManager().getExpeditionLeve(),user.getExpeditionManager().getLay(),nodeInfo.getType(),itemId,itemNum); + MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.EXPEDITION_END_BATTLE_RESONSE_VALUE, response.build(), true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java index 01e185a19..88b9b0dcf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeRequestHandler.java @@ -122,7 +122,7 @@ public class HeroNodeRequestHandler extends BaseHandler rewardIds = new ArrayList<>(itemlistList.size()); List rewardNums = new ArrayList<>(itemlistList.size()); itemlistList.forEach(item->{rewardIds.add(item.getItemId());rewardIds.add(item.getItemNum());}); - ReportUtil.onReportEvent(user,ReportEventEnum.START_TIANGONG.getType(),expeditionManager.getLay(),nodeInfo.getType(),rewardIds,rewardNums); + ReportUtil.onReportEvent(user,ReportEventEnum.START_TIANGONG.getType(),expeditionManager.getExpeditionLeve(),expeditionManager.getLay(),nodeInfo.getType(),rewardIds,rewardNums); return Expedition.HeroNodeResponse.newBuilder().setDrop(drop).build(); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java index e620b479e..f30061644 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java @@ -126,7 +126,6 @@ public class StartExpeditionBattleRequest extends BaseHandler