Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
jiahuiwen 2022-02-15 11:34:35 +08:00
commit e1a5cd8db8
2 changed files with 4 additions and 6 deletions

View File

@ -75,12 +75,12 @@ public class ArchitectureUnLockHandler implements IEventHandler {
// 浮生殿等级解锁
ArchitectureInfo beforeInfo = infoMap.get(5);
if (beforeInfo == null){
LOGGER.error("建筑解锁前置条件浮生殿未解锁poolId:{}",land.getId());
LOGGER.info("建筑解锁前置条件浮生殿未解锁poolId:{}",land.getId());
continue;
}
Integer level = Optional.ofNullable(levelMap.get(beforeInfo.getId())).map(SHomeLandLevel::getlevel).orElse(0);
if (level < land.getUnlockLevel()[1]){
LOGGER.error("建筑解锁前置条件浮生殿等级不足poolId:{}",land.getId());
LOGGER.info("建筑解锁前置条件浮生殿等级不足poolId:{}",land.getId());
continue;
}
ArchitectureInfo architectureInfo = new ArchitectureInfo(id, nowInt, 0);

View File

@ -370,7 +370,6 @@ public class PlayerLogic {
public void vipflushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
PlayerManager playerInfoManager = user.getPlayerInfoManager();
int uid = user.getId();
Set<Integer> removePrivileges = new HashSet<>(2);
int vipLevel = user.getPlayerInfoManager().getVipLevel();
sendVipDailyOrLevlUpReward(user, vipLevel,BIReason.VIP_DAY_REWARD);
@ -385,11 +384,12 @@ public class PlayerLogic {
fixVipId.add(vipInfoItem.getKey());
}
}
if(vipInfoItem.getValue().getEffectTime()!=0 && vipInfoItem.getValue().getEffectTime()<=(TimeUtils.now()/1000)){
if(vipInfoItem.getValue().getEffectTime()!=0 && vipInfoItem.getValue().getEffectTime()<=TimeUtils.nowInt()){
if(SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey()).getPrivilegeType()==VipPrivilegeType.ADVENTURE_BASE_REWARD){
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
}
removePrivileges.add(vipInfoItem.getKey());
LOGGER.info("特权刷新删除日志:{}-{}",vipInfoItem.getKey(),vipInfoItem.getValue().getEffectTime());
}
}
if(!fixVipId.isEmpty()){
@ -1193,7 +1193,6 @@ public class PlayerLogic {
/**
*
* @param user
* @return
*/
public static List<CommonProto.UserMountInfo> getUserMountList(List<com.ljsd.jieling.thrift.idl.UserMountInfo> userMountInfo) {
@ -1207,7 +1206,6 @@ public class PlayerLogic {
}
/**
*
* @param heroManager
* @return
*/
public static List<CommonProto.LifeGridInfo>RpcData2LifeGridInfos( CrossArenaManager crossArenaManager ){