日常修复、森罗幻境修复
parent
f7c5cfb7c4
commit
e8616191b6
|
@ -184,6 +184,8 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
.build();
|
.build();
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType());
|
ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType());
|
||||||
try {
|
try {
|
||||||
|
//hotfix
|
||||||
|
user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_TASK_TYPE,0,user);
|
||||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true);
|
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true);
|
||||||
|
|
||||||
// DoFix.getInstance().loginFix(user);
|
// DoFix.getInstance().loginFix(user);
|
||||||
|
|
|
@ -133,6 +133,17 @@ public class TowerMap extends AbstractMap {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mapManager.setCurMapType(type);
|
mapManager.setCurMapType(type);
|
||||||
|
if(mapManager.getCurMapId()==0){
|
||||||
|
int floor = mapManager.getTrialInfo().getFloor();
|
||||||
|
STrialConfig sTrialConfig;
|
||||||
|
if(floor>10000){
|
||||||
|
TreeMap<Integer,STrialConfig> sTrialConfigMap = (TreeMap<Integer,STrialConfig>) STrialConfig.sTrialConfigMap;
|
||||||
|
sTrialConfig = sTrialConfigMap.ceilingEntry(floor).getValue();
|
||||||
|
}else{
|
||||||
|
sTrialConfig = STrialConfig.sTrialConfigMap.get(floor);
|
||||||
|
}
|
||||||
|
mapManager.setCurMapId(sTrialConfig.getMapId());
|
||||||
|
}
|
||||||
mapEnterResponse.setMapId(mapManager.getCurMapId());
|
mapEnterResponse.setMapId(mapManager.getCurMapId());
|
||||||
mapEnterResponse.setCurXY(mapManager.getCurXY());
|
mapEnterResponse.setCurXY(mapManager.getCurXY());
|
||||||
// MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder()
|
// MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder()
|
||||||
|
|
|
@ -30,20 +30,20 @@ public class DailyTaskManager extends AbstractDataManager{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isFinish(User user,CumulationData data, int[][] cfgValue, Object... parm) {
|
public boolean isFinish(User user,CumulationData data, int[][] cfgValue, Object... parm) {
|
||||||
// ItemManager itemManager = user.getItemManager();
|
ItemManager itemManager = user.getItemManager();
|
||||||
// Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM);
|
Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM);
|
||||||
// return item!=null&&item.getItemNum()>=cfgValue[1][0];
|
// 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
|
@Override
|
||||||
public int getProcess(User user, CumulationData data, int[] missionSubType) {
|
public int getProcess(User user, CumulationData data, int[] missionSubType) {
|
||||||
// ItemManager itemManager = user.getItemManager();
|
ItemManager itemManager = user.getItemManager();
|
||||||
// Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM);
|
Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM);
|
||||||
// return item==null?0:item.getItemNum();
|
// 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());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue