Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
2dbe80f3a5
|
@ -20,6 +20,7 @@ import com.ljsd.jieling.util.MessageUtil;
|
||||||
import config.SExpeditionNodeConfig;
|
import config.SExpeditionNodeConfig;
|
||||||
import config.SExpeditionSetting;
|
import config.SExpeditionSetting;
|
||||||
import manager.STableManager;
|
import manager.STableManager;
|
||||||
|
import util.TimeUtils;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
@ -118,9 +119,15 @@ public class TakeLayRewardHandler extends BaseHandler<Expedition.TakeExpeditionB
|
||||||
if(expeditionManager.getExpeditionLeve()==3){
|
if(expeditionManager.getExpeditionLeve()==3){
|
||||||
expeditionManager.setPassTimes(expeditionManager.getPassTimes()+1);
|
expeditionManager.setPassTimes(expeditionManager.getPassTimes()+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
user.getExpeditionManager().addRewardBox(laycfg);
|
user.getExpeditionManager().addRewardBox(laycfg);
|
||||||
|
|
||||||
user.getExpeditionManager().addScore(score);
|
// 天宫密保时间开启
|
||||||
|
int firstStartTime = user.getExpeditionManager().getWorldTreasureReward().getFirstStartTime();
|
||||||
|
if (TimeUtils.nowInt() >= firstStartTime){
|
||||||
|
user.getExpeditionManager().addScore(score);
|
||||||
|
}
|
||||||
|
|
||||||
Map<Integer, Integer> rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap();
|
Map<Integer, Integer> rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap();
|
||||||
ExpeditionLogic.sendTreasureRewardUpdate(iSession,user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),expeditionManager.getWorldTreasureReward().getIsBuy());
|
ExpeditionLogic.sendTreasureRewardUpdate(iSession,user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),expeditionManager.getWorldTreasureReward().getIsBuy());
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
|
||||||
import util.StringUtil;
|
import util.StringUtil;
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
|
|
||||||
|
import javax.swing.plaf.nimbus.State;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
|
@ -249,18 +250,20 @@ public class MailLogic {
|
||||||
int[][] itemArr = StringUtil.parseFiledInt2(mailItem.toString());
|
int[][] itemArr = StringUtil.parseFiledInt2(mailItem.toString());
|
||||||
// 检测卡牌和装备背包
|
// 检测卡牌和装备背包
|
||||||
int limit = ItemUtil.checkCardAndEquipLimit(user,itemArr);
|
int limit = ItemUtil.checkCardAndEquipLimit(user,itemArr);
|
||||||
|
int state = 1;
|
||||||
if (limit == 0){
|
if (limit == 0){
|
||||||
// 领取道具
|
// 领取道具
|
||||||
result = ItemUtil.dropByMail(user, itemArr, dropBuilder, BIReason.TAKE_MAIL_REWARD);
|
state = ItemUtil.dropByMail(user, itemArr, dropBuilder, BIReason.TAKE_MAIL_REWARD);
|
||||||
|
|
||||||
if (result == 1){
|
if (state == 1){
|
||||||
// 改变邮件状态
|
// 改变邮件状态
|
||||||
mail.setState(Global.MAIL_DRAW_ST_GOT);
|
mail.setState(Global.MAIL_DRAW_ST_GOT);
|
||||||
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
|
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
|
||||||
mailManager.addMail(mail);
|
mailManager.addMail(mail);
|
||||||
}
|
}
|
||||||
}else {
|
}
|
||||||
result =2;
|
if (state != 1) {
|
||||||
|
result = 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -424,7 +424,7 @@ public class BuyGoodsLogic {
|
||||||
|
|
||||||
}
|
}
|
||||||
if(type==GiftGoodsType.SKY_TREASURE){
|
if(type==GiftGoodsType.SKY_TREASURE){
|
||||||
user.getExpeditionManager().getWorldTreasureReward().setScore(user.getExpeditionManager().getWorldTreasureReward().getScore()+SSpecialConfig.getIntegerValue(SSpecialConfig.SKY_TREASURE_SCORE_INGIFT));
|
user.getExpeditionManager().addScore(SSpecialConfig.getIntegerValue(SSpecialConfig.SKY_TREASURE_SCORE_INGIFT));
|
||||||
user.getExpeditionManager().getWorldTreasureReward().setIsBuy(1);
|
user.getExpeditionManager().getWorldTreasureReward().setIsBuy(1);
|
||||||
Map<Integer, Integer> rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap();
|
Map<Integer, Integer> rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap();
|
||||||
ExpeditionLogic.sendTreasureRewardUpdate(OnlineUserManager.getSessionByUid(user.getId()),user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1);
|
ExpeditionLogic.sendTreasureRewardUpdate(OnlineUserManager.getSessionByUid(user.getId()),user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1);
|
||||||
|
|
Loading…
Reference in New Issue