Task【新战斗版本】公会援助
parent
783120f7eb
commit
903d5d2944
|
@ -50,7 +50,7 @@ public class GuildSendHelpMessageRequestHandler extends BaseHandler<Family.Guild
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(isfinish){
|
if(!isfinish){
|
||||||
throw new ErrorCodeException("求援已完成");
|
throw new ErrorCodeException("求援已完成");
|
||||||
}
|
}
|
||||||
//send time out
|
//send time out
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class GuildLogic {
|
||||||
public void flushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder)throws Exception {
|
public void flushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder)throws Exception {
|
||||||
takeAllReward(user);
|
takeAllReward(user);
|
||||||
// 发送公会援助奖励
|
// 发送公会援助奖励
|
||||||
sendGuildHelpRewardEmail(user);
|
// sendGuildHelpRewardEmail(user);
|
||||||
|
|
||||||
user.getGuildMyInfo().setFetetype(0);
|
user.getGuildMyInfo().setFetetype(0);
|
||||||
user.getGuildMyInfo().clearHadTakeReward();
|
user.getGuildMyInfo().clearHadTakeReward();
|
||||||
|
|
|
@ -27,9 +27,11 @@ import com.ljsd.jieling.logic.dao.GuildMyInfo;
|
||||||
import com.ljsd.jieling.logic.dao.GuilidManager;
|
import com.ljsd.jieling.logic.dao.GuilidManager;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.GuildLog;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.family.DeathPathLogic;
|
import com.ljsd.jieling.logic.family.DeathPathLogic;
|
||||||
import com.ljsd.jieling.logic.family.GuildFightLogic;
|
import com.ljsd.jieling.logic.family.GuildFightLogic;
|
||||||
|
import com.ljsd.jieling.logic.family.GuildLogic;
|
||||||
import com.ljsd.jieling.logic.fight.CombatLogic;
|
import com.ljsd.jieling.logic.fight.CombatLogic;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
import com.ljsd.jieling.logic.question.QuestionLogic;
|
import com.ljsd.jieling.logic.question.QuestionLogic;
|
||||||
|
@ -156,8 +158,10 @@ public class MinuteTask extends Thread {
|
||||||
Lockeys.getLockeys().lock("guild",sendUids);
|
Lockeys.getLockeys().lock("guild",sendUids);
|
||||||
guildInfo.clearGuildHelpLog();
|
guildInfo.clearGuildHelpLog();
|
||||||
|
|
||||||
|
//统一清除
|
||||||
for (Integer sendUid : sendUids) {
|
for (Integer sendUid : sendUids) {
|
||||||
User target = UserManager.getUser(sendUid);
|
User target = UserManager.getUser(sendUid);
|
||||||
|
GuildLogic.sendGuildHelpRewardEmail(target);
|
||||||
GuildMyInfo guildMyInfo = target.getGuildMyInfo();
|
GuildMyInfo guildMyInfo = target.getGuildMyInfo();
|
||||||
guildMyInfo.setGuidHelpInfo(new HashMap<>());
|
guildMyInfo.setGuidHelpInfo(new HashMap<>());
|
||||||
guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>());
|
guildMyInfo.setGuidHelpHadTakeInfo(new HashMap<>());
|
||||||
|
|
Loading…
Reference in New Issue