fix usermission & guild
parent
b564b7ae7d
commit
af304a8d85
|
@ -170,8 +170,11 @@ public class UserMissionManager extends MongoBase {
|
||||||
break;
|
break;
|
||||||
case DAILY_MISSION_REWARD:{
|
case DAILY_MISSION_REWARD:{
|
||||||
dailyMissionIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION));
|
dailyMissionIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION));
|
||||||
calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]);
|
if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){
|
||||||
updateString("dailyMissionIdsType",dailyMissionIdsType);
|
calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]);
|
||||||
|
updateString("dailyMissionIdsType",dailyMissionIdsType);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case TREASURE_MISSION_REWARD:{
|
case TREASURE_MISSION_REWARD:{
|
||||||
|
|
|
@ -153,12 +153,15 @@ public class GuildLogic {
|
||||||
Map<Integer, GuildApply> applyGuildInfos = GuilidManager.getApplyGuildInfos(uid, 1);
|
Map<Integer, GuildApply> applyGuildInfos = GuilidManager.getApplyGuildInfos(uid, 1);
|
||||||
int now =(int)(System.currentTimeMillis()/1000);
|
int now =(int)(System.currentTimeMillis()/1000);
|
||||||
if(applyGuildInfos.size()>0){
|
if(applyGuildInfos.size()>0){
|
||||||
for(Map.Entry<Integer, GuildApply> applyEntry:applyGuildInfos.entrySet()){
|
Iterator<Map.Entry<Integer, GuildApply>> iterator = applyGuildInfos.entrySet().iterator();
|
||||||
GuildApply guildApply = applyEntry.getValue();
|
while (iterator.hasNext()){
|
||||||
|
Map.Entry<Integer, GuildApply> next = iterator.next();
|
||||||
|
GuildApply guildApply = next.getValue();
|
||||||
if(now - guildApply.getCreateTime() > SGuildSetting.sGuildSetting.getApplyReserve()){
|
if(now - guildApply.getCreateTime() > SGuildSetting.sGuildSetting.getApplyReserve()){
|
||||||
GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId());
|
GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId());
|
||||||
continue;
|
iterator.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(GuildInfo guildInfo : guildInfos){
|
for(GuildInfo guildInfo : guildInfos){
|
||||||
|
|
Loading…
Reference in New Issue