From a9f8d02ecec03f9f6eb93b76ff3d11e45ccc2e0b Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 26 Jun 2019 10:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E7=BB=A9=E5=A5=96=E5=8A=B1-=E3=80=8B?= =?UTF-8?q?=E4=B8=80=E7=BB=B4=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/config/SAccomplishmentConfig.java | 4 ++-- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- .../com/ljsd/jieling/logic/mission/MissionLoigc.java | 3 ++- .../logic/mission/event/MissionEventDistributor.java | 10 ++++++++-- .../logic/mission/main/MissionStateChangeInfo.java | 4 ++++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java index 597c759a0..9f8b659b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java @@ -21,7 +21,7 @@ public class SAccomplishmentConfig implements BaseConfig { private int score; - private int[][] reward; + private int[] reward; private static Map> sAccomplishmentConfigByMapIdMap; private static Map>> sAccomplishmentConfigByMapIdAndLogicMap; @@ -86,7 +86,7 @@ public class SAccomplishmentConfig implements BaseConfig { return score; } - public int[][] getReward() { + public int[] getReward() { return reward; } } \ No newline at end of file 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 d6bde0241..4e5e168b5 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 @@ -1051,7 +1051,7 @@ public class HeroLogic { } SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId); float score = sPropertyConfig.getScore(); - LOGGER.info("the value is ={},propertyValue={},score={}",propertyValue*score,propertyValue,score); + // LOGGER.info("the value is ={},propertyValue={},score={}",propertyValue*score,propertyValue,score); result += propertyValue*score; } return (int)result; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 2a97d0da5..c0ebbe3f5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -79,6 +79,7 @@ public class MissionLoigc { copyMissionProgres.setMapId(copyId); copyMissionProgres.setAllMissionProgress(allMissionProgress); } + allMissionProgress = copyMissionProgres.getAllMissionProgress(); List sAccomplishmentConfigs = SAccomplishmentConfig.getsAccomplishmentConfigByMapId(copyId); for(SAccomplishmentConfig sAccomplishmentConfig : sAccomplishmentConfigs){ Integer missionId = sAccomplishmentConfig.getId(); @@ -164,7 +165,7 @@ public class MissionLoigc { } takeCopyMisionRewards.add(missionId); user.getMapManager().setTakeCopyMisionRewards(takeCopyMisionRewards); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, SAccomplishmentConfig.getsAccomplishmentConfigByIdMap(missionId).getReward(), BIReason.TAKE_COPY_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, SAccomplishmentConfig.getsAccomplishmentConfigByIdMap(missionId).getReward(), 1,0,BIReason.TAKE_COPY_REWARD); PlayerInfoProto.TakeMissionRewardResponse build = PlayerInfoProto.TakeMissionRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TAKE_MISSION_REWARD_RESPONSE_VALUE,build,true); return; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index 09a6f6eae..e96d58aa2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -186,6 +186,10 @@ public class MissionEventDistributor { if (dailyMissioStateInfos.size() != 0) { sendMissionUpdate(session,user,dailyMissioStateInfos,GameMisionType.DAILYMISSION); } + List copyMissioStateInfos = missionTypeEnumListMap.get(GameMisionType.COPYMISSION); + if (copyMissioStateInfos.size() != 0) { + sendMissionUpdate(session,user,copyMissioStateInfos,GameMisionType.COPYMISSION); + } } } @@ -195,12 +199,14 @@ public class MissionEventDistributor { MissionState missionState = missionStateChangeInfo.getMissionState(); int state = missionState.getState(); int progress = 0; + if(gameMisionType == GameMisionType.COPYMISSION){ + progress = missionStateChangeInfo.getProgress(); + } if(missionState == MissionState.DOING){ if(gameMisionType == GameMisionType.VIPMISSION){ STaskConfig sTaskConfig = STaskConfig.getsTaskConfigById(missionStateChangeInfo.getMissionId()); progress= MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getCumulationData(),sTaskConfig.getTaskType(),sTaskConfig.getTaskValue()[0]); - } - if(gameMisionType == GameMisionType.DAILYMISSION){ + }else if(gameMisionType == GameMisionType.DAILYMISSION){ SDailyTasksConfig sDailyTasksConfig = SDailyTasksConfig.getSDailyTasksConfigById(missionStateChangeInfo.getMissionId()); progress= MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getCumulationData(),sDailyTasksConfig.getType(),sDailyTasksConfig.getValues()[0]); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java index 5c3f9dcbb..609145d40 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java @@ -35,4 +35,8 @@ public class MissionStateChangeInfo { public int[][] getRewwardGroups() { return rewwards; } + + public int getProgress() { + return progress; + } }