Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
da226e1311
|
@ -3,6 +3,7 @@ package com.ljsd.jieling.core;
|
||||||
public interface GlobalsDef {
|
public interface GlobalsDef {
|
||||||
String DEFAULT_NAME = "无名妖灵师";
|
String DEFAULT_NAME = "无名妖灵师";
|
||||||
int MAP_MISSION_RETURN = -9999;
|
int MAP_MISSION_RETURN = -9999;
|
||||||
|
int MAP_MISSION_FAILURE = -10000;
|
||||||
|
|
||||||
int CHAIRMAN = 1;
|
int CHAIRMAN = 1;
|
||||||
int ADMINISTRATORS =2;
|
int ADMINISTRATORS =2;
|
||||||
|
|
|
@ -126,7 +126,7 @@ public class MapMissionManager {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
int[][] values = sAccomplishmentConfig.getValues();
|
int[][] values = sAccomplishmentConfig.getValues();
|
||||||
int targetEventValue = values[1][0];
|
int targetEventValue = values[values.length-1][0];
|
||||||
allMissionProgress.put(missionId,updateValue);
|
allMissionProgress.put(missionId,updateValue);
|
||||||
needUpdate = true;
|
needUpdate = true;
|
||||||
MissionState misisionState = MissionState.DOING;
|
MissionState misisionState = MissionState.DOING;
|
||||||
|
@ -134,12 +134,15 @@ public class MapMissionManager {
|
||||||
int score = sAccomplishmentConfig.getScore();
|
int score = sAccomplishmentConfig.getScore();
|
||||||
addScore+=score;
|
addScore+=score;
|
||||||
misisionState= MissionState.FINISH;
|
misisionState= MissionState.FINISH;
|
||||||
|
// missionValue = updateValue;
|
||||||
}
|
}
|
||||||
if(updateValue == -1){
|
if(updateValue == -1){
|
||||||
missionValue=1;
|
updateValue=1;
|
||||||
|
}else if(updateValue < -1){
|
||||||
|
updateValue=0;
|
||||||
}
|
}
|
||||||
if(copyMissionUpdate){
|
if(copyMissionUpdate){
|
||||||
MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(missionId,misisionState,missionValue);
|
MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(missionId,misisionState,updateValue);
|
||||||
readySendCopyMission(missionStateChangeInfo);
|
readySendCopyMission(missionStateChangeInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,9 +12,12 @@ public class FinishOptionsDifficultMapProcessor implements BaseMissionProcesor{
|
||||||
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType,int missionValue) {
|
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType,int missionValue) {
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
||||||
if(sChallengeConfig.getDifficultType()!=sAccomplishmentConfig.getValues()[1][0]){
|
if(sChallengeConfig.getDifficultType()!=sAccomplishmentConfig.getValues()[sAccomplishmentConfig.getValues().length-1][0]){
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
|
if(missionValue==-1){
|
||||||
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
|
}
|
||||||
int[][] value = sAccomplishmentConfig.getValues();
|
int[][] value = sAccomplishmentConfig.getValues();
|
||||||
missionValue = 0-missionValue;
|
missionValue = 0-missionValue;
|
||||||
for(int i = 0 ; i <value.length-1;i++){
|
for(int i = 0 ; i <value.length-1;i++){
|
||||||
|
@ -24,8 +27,8 @@ public class FinishOptionsDifficultMapProcessor implements BaseMissionProcesor{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(missionValue+2>>(value.length+1)==1){
|
if((missionValue+2>>value.length)==1){
|
||||||
return 1;
|
missionValue = -1;
|
||||||
}else{
|
}else{
|
||||||
missionValue = 0-missionValue;
|
missionValue = 0-missionValue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,9 @@ import com.ljsd.jieling.logic.dao.root.User;
|
||||||
public class KillBossInTimeDifficultProcessor implements BaseMissionProcesor {
|
public class KillBossInTimeDifficultProcessor implements BaseMissionProcesor {
|
||||||
@Override
|
@Override
|
||||||
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType,int missionValue) {
|
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType,int missionValue) {
|
||||||
|
if(missionValue==-1){
|
||||||
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
|
}
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
||||||
if(sChallengeConfig.getDifficultType()!=sAccomplishmentConfig.getValues()[0][0]){
|
if(sChallengeConfig.getDifficultType()!=sAccomplishmentConfig.getValues()[0][0]){
|
||||||
|
@ -19,7 +22,7 @@ public class KillBossInTimeDifficultProcessor implements BaseMissionProcesor {
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
if(time<sAccomplishmentConfig.getValues()[1][0]){
|
if(time<sAccomplishmentConfig.getValues()[1][0]){
|
||||||
return 1;
|
return -1;
|
||||||
}
|
}
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,15 +10,15 @@ import com.ljsd.jieling.logic.dao.root.User;
|
||||||
public class KillMonsterAccProcessor implements BaseMissionProcesor{
|
public class KillMonsterAccProcessor implements BaseMissionProcesor{
|
||||||
@Override
|
@Override
|
||||||
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) {
|
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) {
|
||||||
if(missionValue==-1){
|
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
|
||||||
}
|
|
||||||
int[][] configValues = sAccomplishmentConfig.getValues();
|
int[][] configValues = sAccomplishmentConfig.getValues();
|
||||||
MapManager mapManager = user.getMapManager();
|
MapManager mapManager = user.getMapManager();
|
||||||
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
|
||||||
if(configValues[0][0]!=0 && sChallengeConfig.getDifficultType()!=configValues[0][0]){
|
if(configValues[0][0]!=0 && sChallengeConfig.getDifficultType()!=configValues[0][0]){
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
|
if(missionValue==configValues[configValues.length-1][0]){
|
||||||
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
|
}
|
||||||
if(configValues[0].length<2){
|
if(configValues[0].length<2){
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
|
@ -30,9 +30,6 @@ public class KillMonsterAccProcessor implements BaseMissionProcesor{
|
||||||
}
|
}
|
||||||
missionValue++;
|
missionValue++;
|
||||||
}
|
}
|
||||||
if(missionValue==configValues[1][0]){
|
|
||||||
missionValue = -1;
|
|
||||||
}
|
|
||||||
return missionValue;
|
return missionValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ import com.ljsd.jieling.logic.dao.root.User;
|
||||||
public class NotEventFinishEventDifficultMapProcessor implements BaseMissionProcesor {
|
public class NotEventFinishEventDifficultMapProcessor implements BaseMissionProcesor {
|
||||||
@Override
|
@Override
|
||||||
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) {
|
public int checkAndUpdateMissionProcessor(User user, SAccomplishmentConfig sAccomplishmentConfig, int eventId, int time, MapMissionType mapMissionType, int missionValue) {
|
||||||
if(missionValue==-1){
|
if(missionValue==-1||missionValue==GlobalsDef.MAP_MISSION_FAILURE){
|
||||||
return GlobalsDef.MAP_MISSION_RETURN;
|
return GlobalsDef.MAP_MISSION_RETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,20 +31,19 @@ public class NotEventFinishEventDifficultMapProcessor implements BaseMissionProc
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if(eventId==skipEvent[i]){
|
if(eventId==skipEvent[i]){
|
||||||
missionValue = skipEvent[i];
|
missionValue = -10000;
|
||||||
|
return missionValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(flag){
|
if(flag){
|
||||||
for(int i = 0 ; i < finishEvent.length;i++){
|
for(int i = 0 ; i < finishEvent.length;i++){
|
||||||
if(eventId==finishEvent[i]){
|
if(eventId==finishEvent[i]){
|
||||||
if(missionValue<0){
|
if(missionValue<0){
|
||||||
if(missionValue==-1){
|
missionValue++;
|
||||||
break;
|
|
||||||
}
|
|
||||||
missionValue = missionValue/2;
|
|
||||||
}else{
|
}else{
|
||||||
missionValue =0-1<<(configValues[1][1]-1);
|
missionValue =0-configValues[2][1];
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -753,7 +753,7 @@ public class CombatLogic {
|
||||||
}
|
}
|
||||||
RedisUtil.getInstence().putMapEntry(RedisKey.ADVENTRUEN_BOSS_INFO,"",bossId,adventureBoss);
|
RedisUtil.getInstence().putMapEntry(RedisKey.ADVENTRUEN_BOSS_INFO,"",bossId,adventureBoss);
|
||||||
}
|
}
|
||||||
costs[0] =new int[]{SGameSetting.getGameSetting().getInvasionBossItem(),i};
|
costs[0] =new int[]{Global.INVASIONBOSS_TICKET,i};
|
||||||
ItemUtil.itemCost(user, costs, BIReason.CHALLENGE_INVASIONBOSS_CONSUME, i);
|
ItemUtil.itemCost(user, costs, BIReason.CHALLENGE_INVASIONBOSS_CONSUME, i);
|
||||||
RedisUtil.getInstence().incrementZsetScore(RedisKey.ADVENTRUEN_BOSS_RANK,"",Integer.toString(uid),totalHurt);
|
RedisUtil.getInstence().incrementZsetScore(RedisKey.ADVENTRUEN_BOSS_RANK,"",Integer.toString(uid),totalHurt);
|
||||||
FightInfoProto.AdventurenBossChallengeResponse build = builder.setHurtNums(totalHurt)
|
FightInfoProto.AdventurenBossChallengeResponse build = builder.setHurtNums(totalHurt)
|
||||||
|
|
Loading…
Reference in New Issue