Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
e1a5cd8db8
|
@ -75,12 +75,12 @@ public class ArchitectureUnLockHandler implements IEventHandler {
|
||||||
// 浮生殿等级解锁
|
// 浮生殿等级解锁
|
||||||
ArchitectureInfo beforeInfo = infoMap.get(5);
|
ArchitectureInfo beforeInfo = infoMap.get(5);
|
||||||
if (beforeInfo == null){
|
if (beforeInfo == null){
|
||||||
LOGGER.error("建筑解锁,前置条件浮生殿未解锁,poolId:{}",land.getId());
|
LOGGER.info("建筑解锁,前置条件浮生殿未解锁,poolId:{}",land.getId());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Integer level = Optional.ofNullable(levelMap.get(beforeInfo.getId())).map(SHomeLandLevel::getlevel).orElse(0);
|
Integer level = Optional.ofNullable(levelMap.get(beforeInfo.getId())).map(SHomeLandLevel::getlevel).orElse(0);
|
||||||
if (level < land.getUnlockLevel()[1]){
|
if (level < land.getUnlockLevel()[1]){
|
||||||
LOGGER.error("建筑解锁,前置条件浮生殿等级不足,poolId:{}",land.getId());
|
LOGGER.info("建筑解锁,前置条件浮生殿等级不足,poolId:{}",land.getId());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ArchitectureInfo architectureInfo = new ArchitectureInfo(id, nowInt, 0);
|
ArchitectureInfo architectureInfo = new ArchitectureInfo(id, nowInt, 0);
|
||||||
|
|
|
@ -370,7 +370,6 @@ public class PlayerLogic {
|
||||||
|
|
||||||
public void vipflushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
|
public void vipflushEveryDay(User user, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception {
|
||||||
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
||||||
int uid = user.getId();
|
|
||||||
Set<Integer> removePrivileges = new HashSet<>(2);
|
Set<Integer> removePrivileges = new HashSet<>(2);
|
||||||
int vipLevel = user.getPlayerInfoManager().getVipLevel();
|
int vipLevel = user.getPlayerInfoManager().getVipLevel();
|
||||||
sendVipDailyOrLevlUpReward(user, vipLevel,BIReason.VIP_DAY_REWARD);
|
sendVipDailyOrLevlUpReward(user, vipLevel,BIReason.VIP_DAY_REWARD);
|
||||||
|
@ -385,11 +384,12 @@ public class PlayerLogic {
|
||||||
fixVipId.add(vipInfoItem.getKey());
|
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){
|
if(SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(vipInfoItem.getKey()).getPrivilegeType()==VipPrivilegeType.ADVENTURE_BASE_REWARD){
|
||||||
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
|
CombatLogic.getInstance().getNewAdventureReward(user,true,vipInfoItem.getValue().getEffectTime());
|
||||||
}
|
}
|
||||||
removePrivileges.add(vipInfoItem.getKey());
|
removePrivileges.add(vipInfoItem.getKey());
|
||||||
|
LOGGER.info("特权刷新删除日志:{}-{}",vipInfoItem.getKey(),vipInfoItem.getValue().getEffectTime());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!fixVipId.isEmpty()){
|
if(!fixVipId.isEmpty()){
|
||||||
|
@ -1193,7 +1193,6 @@ public class PlayerLogic {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取玩家皮肤列表
|
* 获取玩家皮肤列表
|
||||||
* @param user
|
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static List<CommonProto.UserMountInfo> getUserMountList(List<com.ljsd.jieling.thrift.idl.UserMountInfo> userMountInfo) {
|
public static List<CommonProto.UserMountInfo> getUserMountList(List<com.ljsd.jieling.thrift.idl.UserMountInfo> userMountInfo) {
|
||||||
|
@ -1207,7 +1206,6 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 初始化获取命格数据
|
* 初始化获取命格数据
|
||||||
* @param heroManager
|
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static List<CommonProto.LifeGridInfo>RpcData2LifeGridInfos( CrossArenaManager crossArenaManager ){
|
public static List<CommonProto.LifeGridInfo>RpcData2LifeGridInfos( CrossArenaManager crossArenaManager ){
|
||||||
|
|
Loading…
Reference in New Issue