diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java index 7de47ce64..0dee4bb5e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.handler; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.activity.AbstractActivity; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityTypeEnum; @@ -31,8 +32,8 @@ public class TakeActivityRewardHandler extends BaseHandler(consumeMap.keySet()),consumeMap.values()); + ReportUtil.onReportEvent(user, ReportEventEnum.EQUIP_SYNTHESIS.getType(),targetEquip,proto.getNum(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); } else { @@ -196,7 +196,7 @@ public class ComplexEquipHandler extends BaseHandler(countMap.keySet()),"",new ArrayList<>(consumeMap.keySet()),consumeMap.values()); + ReportUtil.onReportEvent(user, ReportEventEnum.EQUIP_SYNTHESIS.getType(),new ArrayList<>(countMap.keySet()),"",new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.EQUIP_COMPLEX_RESPONSE_VALUE, response.build(), true); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java index f85d55b6d..107796d86 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java @@ -116,7 +116,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler(consumeMap.keySet()),consumeMap.values()); + ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),targetEquip,proto.getNum(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); } else { @@ -208,7 +208,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler(consumeMap.keySet()),new ArrayList<>(consumeMap.values()),new ArrayList<>(consumeMap.keySet()),consumeMap.values()); + ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values()),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values())); ItemUtil.itemCost(user, consumeMap, BIReason.COMPLEX_EQUIP_CONSUME, 0); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index af4a84aa5..8665d24c4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2243,7 +2243,7 @@ public class MapLogic { BehaviorUtil.getLevelDifficultyifficuFightInfo(user,FightType.MonterFight, sFloodConfig.getMonster(), teamId, sFloodConfig.getBattleTime(), fightStartResponse, RedisKey.CHALLENGE_MONSTER_ATTACK); user.getUserMissionManager().onGameEvent(user,GameEvent.MONSTER_ATTACK_PLAY); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightStartResponse.build(), true); - ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),fightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),""); +// ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),fightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),""); } @@ -3115,7 +3115,7 @@ public class MapLogic { List itemNumList = new ArrayList<>(); itemDrop.forEach(item->{ itemIdList.add(item.getItemId()); - itemIdList.add(item.getItemNum()); + itemNumList.add(item.getItemNum()); }); ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_DAILY_DUNGEON.getType(),id,sDailyChallengeConfig.getType(),sDailyChallengeConfig.getMonsterId(),MonsterUtil.getMonsterForce(new int[]{sDailyChallengeConfig.getMonsterId()}),new Date(),"",0,itemIdList,itemNumList,type==1?"挑战":"扫荡",isFailed?"失败":"通过"); user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_CHALLENGE,sDailyChallengeConfig.getType()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java index 4cf8aec79..e64b99afb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -20,7 +20,7 @@ public enum ReportEventEnum { MISSION_START(6,"mission_start", new CommonEventHandler(),new String[]{"mission_id","mission_name"}), MISSION_COMPLETE(7,"mission_complete", new CommonEventHandler(),new String[]{"mission_id","mission_name","reward_list","mission_start_time"}), JOIN_ACTIVITY(8,"join_activity", new CommonEventHandler(),new String[]{"activity_id","activity_name"}), - COMPLETE_ACTIVITY(9,"complete_activity", new CommonEventHandler(),new String[]{"activity_id","activity_name","reward_list"}), + COMPLETE_ACTIVITY(9,"complete_activity", new CommonEventHandler(),new String[]{"activity_id","mission_id","rewards_id_list","rewards_num_list","take_time"}), ENTER_STAGE(10,"enter_stage", new CommonEventHandler(),new String[]{"stage_id","stage_name"}), PASS_STAGE(11,"pass_stage", new PassStageEventHandler(),new String[]{"stage_id","stage_name"}), GET_HERO(12,"get_hero", new CommonEventHandler(),new String[]{"hero_id","quality","get_type"}), @@ -74,9 +74,10 @@ public enum ReportEventEnum { HERO_COMPOSITION(50,"hero_composition", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}), SEND_HERO(51,"send_hero", new CommonEventHandler(),new String[]{"hero_id","hero_level","hero_quality","reward_list","reward_nums_list"}), - TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{""}), + TREASURE_DECOMPOSITION(52,"treasure_decomposition", new CommonEventHandler(),new String[]{"item_id","item_level","item_quality","reward_list","reward_nums_list"}), START_TIANGONG(53,"start_tiangong",new CommonEventHandler(),new String[]{"stage_id","stage_type","rewards_id_list","rewards_num_list"}), + TREASURE_COMPOSITION(54,"treasure_composition",new CommonEventHandler(),new String[]{"hero_id","item_level","reward_list","reward_nums_list"}), VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""}); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 91bbaff51..0c6fd88e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -23,6 +23,7 @@ import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; +import com.ljsd.jieling.logic.family.GuildChallengeLogic; import com.ljsd.jieling.logic.family.GuildFightLogic; import com.ljsd.jieling.logic.family.GuildLogic; import com.ljsd.jieling.logic.friend.FriendLogic; @@ -334,6 +335,7 @@ public class GlobalDataManaager implements IManager { FriendLogic.getInstance().refreshState(session); PlayerLogic.getInstance().sendTimingMail(user); user.getGuildMyInfo().setLastHurt(0); + GuildChallengeLogic.getInstance().resetBossDamage(user); if(TimeUtils.isSpanTime(user.getPlayerInfoManager().getLoginTime(),TimeUtils.now(),1,5)){ user.getPlayerInfoManager().updateSituationPass(new HashMap<>()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java index 35291a685..ef663c5aa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java @@ -164,11 +164,17 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { } } // KtEventUtils.onKtEvent(user, ParamEventBean.UserActivityEvent, id, missionId); - ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_ACTIVITY.getType(),String.valueOf(id),String.valueOf(missionId),reward[0]); + reportTakeActivityReward(user,reward,missionId); PlayerInfoProto.TakeActivityRewardResponse build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session, 1, rewardResponseValue, build, true); return true; } + protected void reportTakeActivityReward(User user, int[][] reward, int missionId) throws Exception { + List itemId = new ArrayList<>(reward.length); + List itemNum = new ArrayList<>(reward.length); + Arrays.stream(reward).forEach(n->{itemId.add(n[0]);itemNum.add(n[1]);}); + ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_ACTIVITY.getType(),String.valueOf(id),String.valueOf(missionId),itemId,itemNum,new Date()); + } /** * 领取所有活动奖励 有的活动是重置类型 迭代处理 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java index 2d7cc6b51..aa29cc6f2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java @@ -54,6 +54,7 @@ public class LuckyCatActivity extends AbstractActivity { throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } takeLuckCatReward(session, user); + return true; } @@ -115,6 +116,7 @@ public class LuckyCatActivity extends AbstractActivity { String message = SErrorCodeEerverConfig.getI18NMessage("luck_cat_take_reward_content", new Object[]{nickName, sItem.getName(), temp2[1]}); ChatLogic.getInstance().sendSysChatMessage(message, Global.LUCKCAT, 0, 0, 0, 0, 0, 0); + reportTakeActivityReward(user,reward,missionId); PlayerInfoProto.TakeActivityRewardResponse build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session, 1, rewardResponseValue, build, true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java index 206c770e8..8e2a57408 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java @@ -103,6 +103,8 @@ public class NewWelfareActivity extends AbstractActivity { List sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id); CommonProto.Drop.Builder drop = ItemUtil.drop(user, sActivityRewardConfigs.get(0).getReward(), BIReason.TAKE_ACTIVITY_REWARD); build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); + reportTakeActivityReward(user,sActivityRewardConfigs.get(0).getReward(),missionId); + }else{ //领取第三个奖励用 if(!activityProgressInfoMap.containsKey(missionId)||activityProgressInfoMap.get(missionId).getState()!=3){ @@ -117,7 +119,9 @@ public class NewWelfareActivity extends AbstractActivity { sendActivityProgress(session, activityMission, null); CommonProto.Drop.Builder drop = ItemUtil.drop(user, sActivityRewardConfig.getReward(), BIReason.TAKE_ACTIVITY_REWARD); build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); + reportTakeActivityReward(user,sActivityRewardConfig.getReward(),missionId); } + MessageUtil.sendMessage(session, 1, rewardResponseValue, build, true); return true; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SignInSumActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SignInSumActivity.java index 96f08ab73..9da41e575 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SignInSumActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SignInSumActivity.java @@ -48,6 +48,7 @@ class SignInSumActivity extends AbstractActivity { if (config.getValues()[0][0]== RESET_DAYS_AFTER_RECEIVED) { reSetValue(UserManager.getUser(session.getUid())); } + reportTakeActivityReward(UserManager.getUser(session.getUid()),config.getReward(),missionId); ActivityMission activityMission = UserManager.getUser(session.getUid()).getActivityManager().getActivityMissionMap().get(this.id); sendActivityProgress(session, activityMission, null); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java index ea5a8cad1..8814e7b2a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/TreasureActivity.java @@ -214,6 +214,7 @@ public class TreasureActivity extends AbstractActivity { // } // } + reportTakeActivityReward(user,dropList.get(0),missionId); CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList, BIReason.TAKE_ACTIVITY_REWARD); PlayerInfoProto.TakeActivityRewardResponse build = PlayerInfoProto.TakeActivityRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session, 1, rewardResponseValue, build, true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index c5da6e0d4..da6d07f47 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -446,5 +446,11 @@ public class GuildChallengeLogic { } } + public void resetBossDamage(User user){ + if(user.getPlayerInfoManager().getGuildId()!=0){ + user.getGuildMyInfo().setGuildChallengeDamage(0); + } + MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1, MessageTypeProto.MessageType.GUILD_CHALLENGE_FIVE_INDICATION_VALUE,null,true); + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index e6c7df9f1..e640bb6de 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2515,6 +2515,7 @@ public class HeroLogic{ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } dropTempMap.forEach((k,v)->dropMap.put(k,dropMap.getOrDefault(k,0)+v)); + ReportUtil.onReportEvent(user,ReportEventEnum.TREASURE_COMPOSITION.getType(),hero.getTemplateId(),hero.getEspecialEquipLevel(),new ArrayList<>(dropMap.keySet()),new ArrayList<>(dropMap.values())); hero.updateEspecial(1); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index c25ecafcd..c96d3beb9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -334,11 +334,15 @@ public class ItemLogic { } - int[][] dropItems = items.toArray(new int[items.size()][]); - Map reportMap = ItemUtil.arrayToMap(dropItems); - ReportUtil.onReportEvent(user,ReportEventEnum.TREASURE_DECOMPOSITION.getType(),jewelIdReport,jewelLevelReport,jewelQualityReport,new ArrayList<>(reportMap.keySet()),reportMap.values()); CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt(reward.toString()), 1, 0,BIReason.JEWEL_DECOMPOSE); - ItemUtil.drop(user,dropItems,drop,BIReason.JEWEL_DECOMPOSE); + List reportMap = drop.getItemlistList(); + List itemId = new ArrayList<>(reportMap.size()); + List itemNum = new ArrayList<>(reportMap.size()); + reportMap.forEach(item->{ + itemId.add(item.getItemId()); + itemNum.add(item.getItemNum()); + }); + ReportUtil.onReportEvent(user,ReportEventEnum.TREASURE_DECOMPOSITION.getType(),jewelIdReport,jewelLevelReport,jewelQualityReport,itemId,itemNum); sendUseAndPriceItemMessage(session,MessageTypeProto.MessageType.USER_AND_PRICE_ITEM_RESPONSE_VALUE,drop); } @@ -472,7 +476,7 @@ public class ItemLogic { user.getUserMissionManager().onGameEvent(user,GameEvent.DESPOSE_HERO,heroIdsList.size()); } if(reson== BIReason.DECOMPOS_HERO_REWARD){ - ReportUtil.onReportEvent(user, ReportEventEnum.SEND_HERO.getType(),heroIdReport,heroLevelReport,heroStarReport,new ArrayList<>(baseItemMap.keySet()),baseItemMap.values()); + ReportUtil.onReportEvent(user, ReportEventEnum.SEND_HERO.getType(),heroIdReport,heroLevelReport,heroStarReport,new ArrayList<>(baseItemMap.keySet()),new ArrayList<>(baseItemMap.values())); } return ItemUtil.drop(user,itemReturnPercent(itemArray,rankUpReturnPercent),reson); }