root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功绩奖励-》一维数组

back_recharge
wangyuan 2019-06-26 10:36:11 +08:00
parent 4b612732ef
commit a9f8d02ece
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java
View File

@ -21,7 +21,7 @@ public class SAccomplishmentConfig implements BaseConfig {
private int score;
private int[][] reward;
private int[] reward;
private static Map<Integer, List<SAccomplishmentConfig>> sAccomplishmentConfigByMapIdMap;
private static Map<Integer,Map<Integer,List<SAccomplishmentConfig>>> sAccomplishmentConfigByMapIdAndLogicMap;
@ -86,7 +86,7 @@ public class SAccomplishmentConfig implements BaseConfig {
return score;
}
public int[][] getReward() {
public int[] getReward() {
return reward;
}
}

2
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -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;

3
serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java
View File

@ -79,6 +79,7 @@ public class MissionLoigc {
copyMissionProgres.setMapId(copyId);
copyMissionProgres.setAllMissionProgress(allMissionProgress);
}
allMissionProgress = copyMissionProgres.getAllMissionProgress();
List<SAccomplishmentConfig> 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;

10
serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
View File

@ -186,6 +186,10 @@ public class MissionEventDistributor {
if (dailyMissioStateInfos.size() != 0) {
sendMissionUpdate(session,user,dailyMissioStateInfos,GameMisionType.DAILYMISSION);
}
List<MissionStateChangeInfo> 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]);
}

4
serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MissionStateChangeInfo.java
View File

@ -35,4 +35,8 @@ public class MissionStateChangeInfo {
public int[][] getRewwardGroups() {
return rewwards;
}
public int getProgress() {
return progress;
}
}