diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 47a53a47f..79247e9ed 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -184,6 +184,8 @@ public class GetPlayerInfoHandler extends BaseHandler{ .build(); ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType()); try { + //hotfix + user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_TASK_TYPE,0,user); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true); // DoFix.getInstance().loginFix(user); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java index a70c9620a..0569795c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java @@ -133,6 +133,17 @@ public class TowerMap extends AbstractMap { } } mapManager.setCurMapType(type); + if(mapManager.getCurMapId()==0){ + int floor = mapManager.getTrialInfo().getFloor(); + STrialConfig sTrialConfig; + if(floor>10000){ + TreeMap sTrialConfigMap = (TreeMap) STrialConfig.sTrialConfigMap; + sTrialConfig = sTrialConfigMap.ceilingEntry(floor).getValue(); + }else{ + sTrialConfig = STrialConfig.sTrialConfigMap.get(floor); + } + mapManager.setCurMapId(sTrialConfig.getMapId()); + } mapEnterResponse.setMapId(mapManager.getCurMapId()); mapEnterResponse.setCurXY(mapManager.getCurXY()); // MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder() diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java index 8e868fc20..6067f2c03 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java @@ -30,20 +30,20 @@ public class DailyTaskManager extends AbstractDataManager{ @Override public boolean isFinish(User user,CumulationData data, int[][] cfgValue, Object... parm) { -// ItemManager itemManager = user.getItemManager(); -// Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM); + ItemManager itemManager = user.getItemManager(); + Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM); // return item!=null&&item.getItemNum()>=cfgValue[1][0]; - return data.getDaily_task_remove_item()>=cfgValue[1][0]; + return Math.max(data.getDaily_task_remove_item(),item==null?0:item.getItemNum())>=cfgValue[1][0]; } @Override public int getProcess(User user, CumulationData data, int[] missionSubType) { -// ItemManager itemManager = user.getItemManager(); -// Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM); + ItemManager itemManager = user.getItemManager(); + Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM); // return item==null?0:item.getItemNum(); - return data.getDaily_task_remove_item(); + return Math.max(data.getDaily_task_remove_item(),item==null?0:item.getItemNum()); } }