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

Merge branch 'master' of http://60.1.1.230/backend/jieling_server 

# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
back_recharge
jiahuiwen 2019-06-25 15:29:36 +08:00
parent 505547fa66 24e9d35228
commit ee1234ad2c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
View File

@ -151,9 +151,9 @@ public class MapLogic {
}
}
}
} else if (type == 2) {
boolean enough = ItemUtil.itemCost(user, new int[][]{{Global.HEROSTORY_TICKET, 1}}, BIReason.MAP_ENTER_CONSUME, mapId);
if (!enough) {
}else if(type == 3){
boolean enough = ItemUtil.itemCost(user, new int[][]{{Global.HEROSTORY_TICKET, 1}},BIReason.MAP_ENTER_CONSUME,mapId);
if(!enough){
MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "no ticket");
return;
}

4
serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java
View File

@ -53,11 +53,11 @@ public class MapMissionManager {
if(mapId==0){
return 0;
}
MapMission mapMission = mapManager.getCopyMissionProgresById(mapId);
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapId);
mapId=sChallengeConfig.getMapId();
MapMission mapMission = mapManager.getCopyMissionProgresById(mapId);
boolean copyMissionUpdate = false;
if(sChallengeConfig.getType()==2){
if(sChallengeConfig.getType()==3){
copyMissionUpdate= true;
}
if(mapMission == null ){