back_recharge
zhangshanxue 2020-05-07 19:47:58 +08:00
parent 964729e36e
commit 4cbb76e4f7
3 changed files with 12 additions and 4 deletions

View File

@ -13,6 +13,7 @@ import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.GuildCache;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.Family;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.util.ItemUtil;
@ -59,9 +60,10 @@ public class FamilyFeteRequestHandler extends BaseHandler<Family.FamilyFeteReque
//up value
user.getGuildMyInfo().setFetetype(type);
user.getGuildMyInfo().setFeteguild(guildId);
//drop item
ItemUtil.drop(user, sGuildSacrificeConfig.getReward(), BIReason.FETE_REWARD);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildSacrificeConfig.getReward(), BIReason.FETE_REWARD);
//drop exp
//TODO lock 操作公会
@ -82,6 +84,6 @@ public class FamilyFeteRequestHandler extends BaseHandler<Family.FamilyFeteReque
guildInfo.updateExp(guildInfo.getExp() + addexp);
}
int exp = guildInfo.getExp();
return Family.FamilyFeteResponse.newBuilder().setCurExp(exp).build();
return Family.FamilyFeteResponse.newBuilder().setCurExp(exp).setDrop(drop).build();
}
}

View File

@ -9,6 +9,7 @@ import com.ljsd.jieling.logic.dao.GuilidManager;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.Family;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.util.ItemUtil;
@ -39,6 +40,10 @@ public class FamilyGetFeteRewardRequestHandler extends BaseHandler<Family.Family
if(sGuildSacrificeRewardConfig==null){
throw new ErrorCodeException(ErrorCode.CFG_NULL);
}
//check take
if(user.getGuildMyInfo().getHadTakeReward().contains(id)){
throw new ErrorCodeException("该进度已领取");
}
//check guild
int guildId = user.getPlayerInfoManager().getGuildId();
@ -63,8 +68,8 @@ public class FamilyGetFeteRewardRequestHandler extends BaseHandler<Family.Family
user.getGuildMyInfo().addHadTakeReward(id);
//drop
//drop item
ItemUtil.drop(user, sGuildSacrificeRewardConfig.getReward(), BIReason.FETE_REWARD);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sGuildSacrificeRewardConfig.getReward(), BIReason.FETE_REWARD);
return Family.FamilyFeteResponse.newBuilder().build();
return Family.FamilyGetFeteRewardResponse.newBuilder().setDrop(drop).build();
}
}

View File

@ -422,6 +422,7 @@ public class CBean2Proto {
.setIcon(guildInfo.getIcon())
.setFightResult(familyContribute)
.setPlayerIntoLevel(guildInfo.getIntoLevel())
.setFete(guildInfo.getFete())
.build();
}